summaryrefslogtreecommitdiff
path: root/ggml.h
diff options
context:
space:
mode:
authorGeorgi Gerganov <ggerganov@gmail.com>2023-10-04 15:29:58 +0300
committerGitHub <noreply@github.com>2023-10-04 15:29:58 +0300
commitf93af02488179b9c52d0d391b08ae4c4d891b8d3 (patch)
treef5dec5ce7e832e4c5a6d40bb76ef9865e27488ac /ggml.h
parentf72f8f22c9cb60465b2e79df2767e4ba9604e576 (diff)
sync : ggml (conv 1d + 2d updates, UB fixes) (#3468)
* sync : ggml (conv 1d + 2d updates) ggml-ci * ggml : fix UB in q5_0 and q5_1 quantize code ggml.c:1033:39: runtime error: left shift of 1 by 31 places cannot be represented in type 'int' SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior ggml.c:1081:39: runtime error: left shift of 1 by 31 places cannot be represented in type 'int' SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior ggml-ci * tests : fix UB in test-quantize-perf
Diffstat (limited to 'ggml.h')
-rw-r--r--ggml.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/ggml.h b/ggml.h
index 460857fa..a9d4e33d 100644
--- a/ggml.h
+++ b/ggml.h
@@ -401,10 +401,14 @@ extern "C" {
GGML_OP_CLAMP,
GGML_OP_CONV_1D,
GGML_OP_CONV_2D,
+ GGML_OP_CONV_TRANSPOSE_1D,
GGML_OP_CONV_TRANSPOSE_2D,
GGML_OP_POOL_1D,
GGML_OP_POOL_2D,
+ GGML_OP_CONV_1D_STAGE_0, // internal
+ GGML_OP_CONV_1D_STAGE_1, // internal
+
GGML_OP_UPSCALE, // nearest interpolate
GGML_OP_FLASH_ATTN,
@@ -1386,6 +1390,14 @@ extern "C" {
int s,
int d);
+ GGML_API struct ggml_tensor * ggml_conv_transpose_1d(
+ struct ggml_context * ctx,
+ struct ggml_tensor * a,
+ struct ggml_tensor * b,
+ int s0,
+ int p0,
+ int d0);
+
GGML_API struct ggml_tensor * ggml_conv_2d(
struct ggml_context * ctx,
struct ggml_tensor * a,
@@ -1759,6 +1771,7 @@ extern "C" {
GGML_OPT_NO_CONTEXT,
GGML_OPT_INVALID_WOLFE,
GGML_OPT_FAIL,
+ GGML_OPT_CANCEL,
GGML_LINESEARCH_FAIL = -128,
GGML_LINESEARCH_MINIMUM_STEP,