Merge branch 'upstream' into concedo_experimental

# Conflicts: # README.md
LostRuins · Nov 30, 2024 · 153da19 · 153da19
2 parents 0028e71 + 3e0ba0e
commit 153da19
Show file tree

Hide file tree

Showing 4 changed files with 181,124 additions and 181,087 deletions.
diff --git a/ggml/src/ggml-vulkan-shaders.cpp b/ggml/src/ggml-vulkan-shaders.cpp
diff --git a/ggml/src/ggml-vulkan-shaders.hpp b/ggml/src/ggml-vulkan-shaders.hpp
diff --git a/ggml/src/ggml-vulkan/ggml-vulkan.cpp b/ggml/src/ggml-vulkan/ggml-vulkan.cpp
diff --git a/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_q6_k.comp b/ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_q6_k.comp