Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

submodule update : windows MSVC fix #1

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions include/ggml/ggml.h
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
#define GGML_QNT_VERSION_FACTOR 1000 // do not change this

#define GGML_MAX_DIMS 4
#define GGML_MAX_NODES 16384
#define GGML_MAX_NODES 100000
#define GGML_MAX_PARAMS 1024
#define GGML_MAX_CONTEXTS 64
#define GGML_MAX_SRC 6
Expand Down Expand Up @@ -409,6 +409,7 @@ extern "C" {
GGML_OP_CONV_TRANSPOSE_2D,
GGML_OP_POOL_1D,
GGML_OP_POOL_2D,
GGML_OP_PAD_REFLEC_1D,

GGML_OP_UPSCALE, // nearest interpolate

Expand Down Expand Up @@ -543,7 +544,7 @@ extern "C" {
// next prime after GGML_MAX_NODES * 2 (nodes + leafs)
// #define GGML_GRAPH_HASHTABLE_SIZE 8273
// #define GGML_GRAPH_HASHTABLE_SIZE 16411
#define GGML_GRAPH_HASHTABLE_SIZE 32771
#define GGML_GRAPH_HASHTABLE_SIZE 200003

enum ggml_cgraph_eval_order {
GGML_CGRAPH_EVAL_ORDER_LEFT_TO_RIGHT = 0,
Expand Down Expand Up @@ -1401,6 +1402,12 @@ extern "C" {
int p0,
int d0);

GGML_API struct ggml_tensor * ggml_pad_reflec_1d(
struct ggml_context * ctx,
struct ggml_tensor * a,
int p0,
int p1);

GGML_API struct ggml_tensor * ggml_conv_2d(
struct ggml_context * ctx,
struct ggml_tensor * a,
Expand All @@ -1412,7 +1419,6 @@ extern "C" {
int d0,
int d1);


// kernel size is a->ne[0] x a->ne[1]
// stride is equal to kernel size
// padding is zero
Expand Down
Loading
Loading