diff options
| author | Georgi Gerganov <ggerganov@gmail.com> | 2023-11-13 16:55:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-13 16:55:52 +0200 |
| commit | 3d68f364f15778dc326f5024f2e5af1ad6dfddef (patch) | |
| tree | c0c11d150ba56b4f646261790728622efa30d8a1 /ggml.h | |
| parent | c049b37d7baf558944501705b91ac89b26ee3e41 (diff) | |
ggml : sync (im2col, GPU conv, 32-bit arm compat) (#4060)
ggml-ci
Diffstat (limited to 'ggml.h')
| -rw-r--r-- | ggml.h | 19 |
1 files changed, 13 insertions, 6 deletions
@@ -403,13 +403,8 @@ extern "C" { GGML_OP_ROPE_BACK, GGML_OP_ALIBI, GGML_OP_CLAMP, - GGML_OP_CONV_1D, - GGML_OP_CONV_1D_STAGE_0, // internal - GGML_OP_CONV_1D_STAGE_1, // internal GGML_OP_CONV_TRANSPOSE_1D, - GGML_OP_CONV_2D, - GGML_OP_CONV_2D_STAGE_0, // internal - GGML_OP_CONV_2D_STAGE_1, // internal + GGML_OP_IM2COL, GGML_OP_CONV_TRANSPOSE_2D, GGML_OP_POOL_1D, GGML_OP_POOL_2D, @@ -1403,6 +1398,18 @@ extern "C" { float min, float max); + GGML_API struct ggml_tensor * ggml_im2col( + struct ggml_context * ctx, + struct ggml_tensor * a, + struct ggml_tensor * b, + int s0, + int s1, + int p0, + int p1, + int d0, + int d1, + bool is_2D); + GGML_API struct ggml_tensor * ggml_conv_1d( struct ggml_context * ctx, struct ggml_tensor * a, |