sync : ggml (ggerganov#6351)

* sync : ggml ggml-ci * cuda : move GGML_CUDA_DMMV constants to dmmv.cuh --------- Co-authored-by: slaren <[email protected]>
tybalex · Apr 17, 2024 · 1d1feab · 1d1feab
1 parent 6b026a9
commit 1d1feab
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/ggml-alloc.c b/ggml-alloc.c
@@ -705,8 +705,13 @@ bool ggml_gallocr_reserve_n(ggml_gallocr_t galloc, struct ggml_cgraph * graph, c
  struct ggml_tensor * leaf = graph->leafs[i];
  struct hash_node * hn = ggml_gallocr_hash_get(galloc, leaf);
  galloc->leaf_allocs[i].buffer_id = hn->buffer_id;
- galloc->leaf_allocs[i].leaf.offset = hn->offset;
- galloc->leaf_allocs[i].leaf.size_max = ggml_backend_buft_get_alloc_size(galloc->bufts[hn->buffer_id], leaf);
+ if (leaf->view_src || leaf->data) {
+ galloc->leaf_allocs[i].leaf.offset = SIZE_MAX;
+ galloc->leaf_allocs[i].leaf.size_max = 0;
+ } else {
+ galloc->leaf_allocs[i].leaf.offset = hn->offset;
+ galloc->leaf_allocs[i].leaf.size_max = ggml_backend_buft_get_alloc_size(galloc->bufts[hn->buffer_id], leaf);
+ }
  }
 
  // reallocate buffers if needed

diff --git a/ggml-cuda/common.cuh b/ggml-cuda/common.cuh
@@ -1,7 +1,8 @@
 #pragma once
 
-#include "../ggml.h"
-#include "../ggml-cuda.h"
+#include "ggml.h"
+#include "ggml-cuda.h"
+
 #include <memory>
 
 #if defined(GGML_USE_HIPBLAS)
@@ -11,7 +12,7 @@
 #define GGML_COMMON_DECL_CUDA
 #define GGML_COMMON_IMPL_CUDA
 #endif
-#include "../ggml-common.h"
+#include "ggml-common.h"
 
 #include <cstdio>
 #include <array>

diff --git a/ggml-cuda/dmmv.cu b/ggml-cuda/dmmv.cu
@@ -2,14 +2,6 @@
 #include "dequantize.cuh"
 #include "convert.cuh"
 
-// dmmv = dequantize_mul_mat_vec
-#ifndef GGML_CUDA_DMMV_X
-#define GGML_CUDA_DMMV_X 32
-#endif
-#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/ggml-cuda/dmmv.cuh b/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,

diff --git a/scripts/sync-ggml-am.sh b/scripts/sync-ggml-am.sh
@@ -95,6 +95,7 @@ if [ -f $SRC_LLAMA/ggml-src.patch ]; then
  # src/ggml-backend-impl.h -> ggml-backend-impl.h
  # src/ggml-backend.c -> ggml-backend.c
  # src/ggml-common.h -> ggml-common.h
+ # src/ggml-cuda/* -> ggml-cuda/
  # src/ggml-cuda.cu -> ggml-cuda.cu
  # src/ggml-cuda.h -> ggml-cuda.h
  # src/ggml-impl.h -> ggml-impl.h
@@ -128,6 +129,7 @@ if [ -f $SRC_LLAMA/ggml-src.patch ]; then
  -e 's/src\/ggml-backend-impl\.h/ggml-backend-impl.h/g' \
  -e 's/src\/ggml-backend\.c/ggml-backend.c/g' \
  -e 's/src\/ggml-common\.h/ggml-common.h/g' \
+ -e 's/src\/ggml-cuda\//ggml-cuda\//g' \
  -e 's/src\/ggml-cuda\.cu/ggml-cuda.cu/g' \
  -e 's/src\/ggml-cuda\.h/ggml-cuda.h/g' \
  -e 's/src\/ggml-impl\.h/ggml-impl.h/g' \

diff --git a/scripts/sync-ggml.sh b/scripts/sync-ggml.sh
@@ -5,6 +5,7 @@ cp -rpv ../ggml/src/ggml-alloc.c ./ggml-alloc.c
 cp -rpv ../ggml/src/ggml-backend-impl.h ./ggml-backend-impl.h
 cp -rpv ../ggml/src/ggml-backend.c ./ggml-backend.c
 cp -rpv ../ggml/src/ggml-common.h ./ggml-common.h
+cp -rpv ../ggml/src/ggml-cuda/* ./ggml-cuda/
 cp -rpv ../ggml/src/ggml-cuda.cu ./ggml-cuda.cu
 cp -rpv ../ggml/src/ggml-cuda.h ./ggml-cuda.h
 cp -rpv ../ggml/src/ggml-impl.h ./ggml-impl.h