Skip to content

Commit 94e6f6d

Browse files
Merge pull request #107 from menloresearch/update-dev-from-master-2025-05-28-00-08
Sync master with upstream release b5516
2 parents cebd471 + a3c3084 commit 94e6f6d

File tree

18 files changed

+1180
-24
lines changed

18 files changed

+1180
-24
lines changed

ggml/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ option(GGML_VULKAN_CHECK_RESULTS "ggml: run Vulkan op checks"
177177
option(GGML_VULKAN_DEBUG "ggml: enable Vulkan debug output" OFF)
178178
option(GGML_VULKAN_MEMORY_DEBUG "ggml: enable Vulkan memory debug output" OFF)
179179
option(GGML_VULKAN_SHADER_DEBUG_INFO "ggml: enable Vulkan shader debug info" OFF)
180-
option(GGML_VULKAN_PERF "ggml: enable Vulkan perf output" OFF)
181180
option(GGML_VULKAN_VALIDATE "ggml: enable Vulkan validation" OFF)
182181
option(GGML_VULKAN_RUN_TESTS "ggml: run Vulkan tests" OFF)
183182
option(GGML_KOMPUTE "ggml: use Kompute" OFF)

ggml/include/ggml.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -935,6 +935,15 @@ extern "C" {
935935
struct ggml_tensor * a,
936936
struct ggml_tensor * b);
937937

938+
// repeat a to the specified shape
939+
GGML_API struct ggml_tensor * ggml_repeat_4d(
940+
struct ggml_context * ctx,
941+
struct ggml_tensor * a,
942+
int64_t ne0,
943+
int64_t ne1,
944+
int64_t ne2,
945+
int64_t ne3);
946+
938947
// sums repetitions in a into shape of b
939948
GGML_API struct ggml_tensor * ggml_repeat_back(
940949
struct ggml_context * ctx,

ggml/src/ggml-opencl/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,17 @@ endfunction()
5555

5656
set(GGML_OPENCL_KERNELS
5757
add
58+
argsort
5859
clamp
5960
cpy
6061
cvt
6162
diag_mask_inf
63+
div
6264
gelu
6365
gemv_noshuffle_general
6466
gemv_noshuffle
6567
get_rows
68+
group_norm
6669
im2col_f32
6770
im2col_f16
6871
mul_mat_Ab_Bi_8x4
@@ -83,11 +86,14 @@ set(GGML_OPENCL_KERNELS
8386
rms_norm
8487
rope
8588
scale
89+
sigmoid
8690
silu
8791
softmax_4_f32
8892
softmax_4_f16
8993
softmax_f32
9094
softmax_f16
95+
sub
96+
sum_rows
9197
transpose
9298
)
9399

0 commit comments

Comments
 (0)