sync : llama.cpp (skip)

ggml-ci
ggerganov · Apr 6, 2024 · 765d08f · 765d08f
1 parent a09f675
commit 765d08f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/scripts/sync-llama-am.sh b/scripts/sync-llama-am.sh
@@ -59,6 +59,7 @@ while read c; do
  ggml*.m \
  ggml*.metal \
  ggml*.cu \
+ ggml-cuda/* \
  tests/test-opt.cpp \
  tests/test-grad0.cpp \
  tests/test-quantize-fns.cpp \

diff --git a/scripts/sync-llama.last b/scripts/sync-llama.last
@@ -1 +1 @@
-e82f9e2b833d88cd2b30123ef57346c2cb8abd99
+4d17d0e240a87661f0873facec7d60df46130589
diff --git a/src/ggml-cuda/common.cuh b/src/ggml-cuda/common.cuh
@@ -231,12 +231,6 @@ typedef float dfloat; // dequantize float
 typedef float2 dfloat2;
 #endif //GGML_CUDA_F16
 
-// dmmv = dequantize_mul_mat_vec
-// TODO: remove this?
-#ifndef GGML_CUDA_DMMV_X
-#define GGML_CUDA_DMMV_X 32
-#endif
-
 [[noreturn]]
 static __device__ void no_device_code(
  const char * file_name, const int line, const char * function_name, const int arch, const char * arch_list) {

diff --git a/src/ggml-cuda/dmmv.cu b/src/ggml-cuda/dmmv.cu
@@ -2,10 +2,6 @@
 #include "dequantize.cuh"
 #include "convert.cuh"
 
-#ifndef GGML_CUDA_MMV_Y
-#define GGML_CUDA_MMV_Y 1
-#endif
-
 #ifndef K_QUANTS_PER_ITERATION
 #define K_QUANTS_PER_ITERATION 2
 #else

diff --git a/src/ggml-cuda/dmmv.cuh b/src/ggml-cuda/dmmv.cuh
@@ -1,5 +1,16 @@
 #include "common.cuh"
 
+// dmmv = dequantize_mul_mat_vec
+
+// TODO: remove this?
+#ifndef GGML_CUDA_DMMV_X
+#define GGML_CUDA_DMMV_X 32
+#endif
+
+#ifndef GGML_CUDA_MMV_Y
+#define GGML_CUDA_MMV_Y 1
+#endif
+
 void ggml_cuda_op_dequantize_mul_mat_vec(
  ggml_backend_cuda_context & ctx,
  const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst, const char * src0_dd_i, const float * src1_ddf_i,