From: Georgi Gerganov Date: Fri, 20 Sep 2024 18:50:16 +0000 (+0300) Subject: examples : adapt to ggml.h changes (ggml/0) X-Git-Tag: upstream/0.0.4488~668 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=c038931615d2525d732943fa8661e29aa361b192;p=pkg%2Fggml%2Fsources%2Fllama.cpp examples : adapt to ggml.h changes (ggml/0) ggml-ci --- diff --git a/ggml/include/ggml.h b/ggml/include/ggml.h index d6c45c94..e24b8a31 100644 --- a/ggml/include/ggml.h +++ b/ggml/include/ggml.h @@ -1980,6 +1980,9 @@ extern "C" { typedef void (*ggml_custom2_op_t)(struct ggml_tensor * dst , const struct ggml_tensor * a, const struct ggml_tensor * b, int ith, int nth, void * userdata); typedef void (*ggml_custom3_op_t)(struct ggml_tensor * dst , const struct ggml_tensor * a, const struct ggml_tensor * b, const struct ggml_tensor * c, int ith, int nth, void * userdata); +#define GGML_N_TASKS_MAX (-1) + // n_tasks == GGML_N_TASKS_MAX means to use max number of tasks + GGML_API struct ggml_tensor * ggml_map_custom1( struct ggml_context * ctx, struct ggml_tensor * a, diff --git a/ggml/src/ggml.c b/ggml/src/ggml.c index d4aa0a81..4b782b0c 100644 --- a/ggml/src/ggml.c +++ b/ggml/src/ggml.c @@ -313,7 +313,6 @@ void ggml_abort(const char * file, int line, const char * fmt, ...) { #define GGML_DEBUG 0 #define GGML_GELU_FP16 #define GGML_GELU_QUICK_FP16 -#define GGML_N_TASKS_MAX (-1) #define GGML_SOFT_MAX_UNROLL 4 #define GGML_VEC_DOT_UNROLL 2