Skip to content

Commit

Permalink
sync: update ggml
Browse files Browse the repository at this point in the history
  • Loading branch information
@SkutteOleg
SkutteOleg committed Aug 28, 2024
1 parent 58d5473 commit 19b40f3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ggml
Submodule ggml updated 86 files
+1 −0 .gitignore
+1 −1 CMakeLists.txt
+38 −37 ci/run.sh
+3 −0 examples/mnist/.gitignore
+11 −31 examples/mnist/CMakeLists.txt
+148 −80 examples/mnist/README.md
+0 −62 examples/mnist/convert-h5-to-ggml.py
+0 −169 examples/mnist/main-cnn.cpp
+0 −122 examples/mnist/main-cpu.cpp
+0 −125 examples/mnist/main-mtl.cpp
+0 −26 examples/mnist/main-mtl.h
+0 −499 examples/mnist/main-mtl.m
+0 −328 examples/mnist/main.cpp
+0 −116 examples/mnist/mnist-cnn.py
+591 −0 examples/mnist/mnist-common.cpp
+104 −0 examples/mnist/mnist-common.h
+78 −0 examples/mnist/mnist-eval.cpp
+93 −0 examples/mnist/mnist-train-cnn.py
+130 −0 examples/mnist/mnist-train-fc.py
+39 −0 examples/mnist/mnist-train.cpp
+0 −1 examples/mnist/models/mnist/.gitignore
+ − examples/mnist/models/mnist/mnist_model.state_dict
+ − examples/mnist/models/mnist/t10k-images.idx3-ubyte
+8 −1 examples/yolo/README.md
+144 −60 examples/yolo/yolov3-tiny.cpp
+1 −0 include/ggml-backend.h
+76 −47 include/ggml.h
+1 −1 scripts/sync-llama.last
+14 −0 src/CMakeLists.txt
+6 −21 src/ggml-aarch64.c
+5 −8 src/ggml-backend.c
+1 −1 src/ggml-cann/aclnn_ops.cpp
+14 −1 src/ggml-cuda.cu
+8 −0 src/ggml-cuda/binbcast.cu
+1 −0 src/ggml-cuda/binbcast.cuh
+106 −0 src/ggml-cuda/cross-entropy-loss.cu
+5 −0 src/ggml-cuda/cross-entropy-loss.cuh
+12 −5 src/ggml-cuda/fattn-common.cuh
+43 −9 src/ggml-cuda/fattn-tile-f16.cu
+40 −7 src/ggml-cuda/fattn-tile-f32.cu
+58 −13 src/ggml-cuda/fattn-vec-f16.cuh
+57 −11 src/ggml-cuda/fattn-vec-f32.cuh
+58 −5 src/ggml-cuda/fattn-wmma-f16.cuh
+2 −2 src/ggml-cuda/fattn.cu
+1 −1 src/ggml-cuda/rope.cu
+1 −2 src/ggml-cuda/sumrows.cu
+2 −0 src/ggml-cuda/sumrows.cuh
+180 −27 src/ggml-metal.m
+211 −19 src/ggml-metal.metal
+1 −1 src/ggml-quants.c
+49 −35 src/ggml-rpc.cpp
+17 −106 src/ggml-sycl.cpp
+1 −0 src/ggml-sycl/backend.hpp
+11 −0 src/ggml-sycl/common.cpp
+53 −0 src/ggml-sycl/common.hpp
+57 −57 src/ggml-sycl/convert.cpp
+1 −1 src/ggml-sycl/convert.hpp
+98 −98 src/ggml-sycl/dequantize.hpp
+2 −2 src/ggml-sycl/dmmv.cpp
+101 −0 src/ggml-sycl/gemm.hpp
+125 −0 src/ggml-sycl/im2col.cpp
+23 −0 src/ggml-sycl/im2col.hpp
+1 −1 src/ggml-sycl/rope.cpp
+716 −786 src/ggml-vulkan.cpp
+517 −253 src/ggml.c
+24 −0 src/vulkan-shaders/acc.comp
+5 −1 src/vulkan-shaders/concat.comp
+1 −2 src/vulkan-shaders/mul_mat_vec.comp
+1 −1 src/vulkan-shaders/mul_mat_vec_nc.comp
+1 −1 src/vulkan-shaders/mul_mat_vec_p021.comp
+18 −17 src/vulkan-shaders/mul_mat_vec_q2_k.comp
+10 −9 src/vulkan-shaders/mul_mat_vec_q3_k.comp
+24 −21 src/vulkan-shaders/mul_mat_vec_q4_k.comp
+27 −29 src/vulkan-shaders/mul_mat_vec_q5_k.comp
+13 −13 src/vulkan-shaders/mul_mat_vec_q6_k.comp
+8 −7 src/vulkan-shaders/mul_mm.comp
+24 −0 src/vulkan-shaders/repeat.comp
+8 −0 src/vulkan-shaders/vulkan-shaders-gen.cpp
+10 −0 tests/CMakeLists.txt
+116 −10 tests/test-backend-ops.cpp
+169 −0 tests/test-cont.c
+16 −16 tests/test-conv-transpose-1d.cpp
+9 −9 tests/test-conv1d.cpp
+9 −9 tests/test-conv2d.cpp
+179 −66 tests/test-grad0.cpp
+4 −4 tests/test-mul-mat.cpp
2 changes: 1 addition & 1 deletion ggml_extend.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ __STATIC_INLINE__ struct ggml_tensor* ggml_nn_attention_ext(struct ggml_context*
v = ggml_cont(ctx, ggml_permute(ctx, v, 0, 2, 1, 3)); // [N, n_head, L_k, d_head]
v = ggml_reshape_3d(ctx, v, d_head, L_k, n_head * N); // [N * n_head, L_k, d_head]
LOG_DEBUG("k->ne[1] == %d", k->ne[1]);
kqv = ggml_flash_attn_ext(ctx, q, k, v, mask, scale, 0);
kqv = ggml_flash_attn_ext(ctx, q, k, v, mask, scale, 0, 0);
} else {
v = ggml_cont(ctx, ggml_permute(ctx, v, 1, 2, 0, 3)); // [N, n_head, d_head, L_k]
v = ggml_reshape_3d(ctx, v, L_k, d_head, n_head * N); // [N * n_head, d_head, L_k]
Expand Down

0 comments on commit 19b40f3

Please sign in to comment.