update llama.cpp submodule to 66c1968f7 (#2618)

2025-12-22 14:53:56 +00:00 · 2024-02-20 17:42:31 -05:00
parent ace2cdf1c6
commit 4613a080e7
6 changed files with 39 additions and 130 deletions
--- a/llm/patches/02-cudaleaks.diff
+++ b/llm/patches/02-cudaleaks.diff
@@ -0,0 +1,115 @@
+diff --git a/examples/server/server.cpp b/examples/server/server.cpp
+index 7800c6e7..be30db23 100644
+--- a/examples/server/server.cpp
+++ b/examples/server/server.cpp
+@@ -30,6 +30,10 @@
+ #include <atomic>
+ #include <signal.h>
+ 
+#ifdef GGML_USE_CUBLAS
+extern "C" GGML_CALL void ggml_free_cublas(void);
+#endif
+
+ using json = nlohmann::json;
+ 
+ struct server_params
+@@ -353,6 +357,9 @@ struct llama_server_context
+             llama_free_model(model);
+             model = nullptr;
+         }
+#ifdef GGML_USE_CUBLAS
+        ggml_free_cublas();
+#endif
+     }
+ 
+     bool load_model(const gpt_params &params_)
+@@ -3143,6 +3150,7 @@ int main(int argc, char **argv)
+     sigemptyset (&sigint_action.sa_mask);
+     sigint_action.sa_flags = 0;
+     sigaction(SIGINT, &sigint_action, NULL);
+    sigaction(SIGUSR1, &sigint_action, NULL);
+ #elif defined (_WIN32)
+     auto console_ctrl_handler = +[](DWORD ctrl_type) -> BOOL {
+         return (ctrl_type == CTRL_C_EVENT) ? (signal_handler(SIGINT), true) : false;
+diff --git a/ggml-cuda.cu b/ggml-cuda.cu
+index 933ebbc4..88a4f664 100644
+--- a/ggml-cuda.cu
+++ b/ggml-cuda.cu
+@@ -39,6 +39,7 @@
+ #define __shfl_xor_sync(mask, var, laneMask, width) __shfl_xor(var, laneMask, width)
+ #define cublasComputeType_t hipblasDatatype_t //deprecated, new hipblasComputeType_t not in 5.6
+ #define cublasCreate hipblasCreate
+#define cublasDestroy hipblasDestroy
+ #define cublasGemmEx hipblasGemmEx
+ #define cublasGemmBatchedEx hipblasGemmBatchedEx
+ #define cublasGemmStridedBatchedEx hipblasGemmStridedBatchedEx
+@@ -7991,10 +7992,10 @@ GGML_CALL bool ggml_cublas_loaded(void) {
+     return g_cublas_loaded;
+ }
+ 
+-GGML_CALL void ggml_init_cublas() {
+-    static bool initialized = false;
+static bool g_cublas_initialized = false;
+ 
+-    if (!initialized) {
+GGML_CALL void ggml_init_cublas() {
+    if (!g_cublas_initialized) {
+ 
+ #ifdef __HIP_PLATFORM_AMD__
+         // Workaround for a rocBLAS bug when using multiple graphics cards:
+@@ -8004,7 +8005,7 @@ GGML_CALL void ggml_init_cublas() {
+ #endif
+ 
+         if (cudaGetDeviceCount(&g_device_count) != cudaSuccess) {
+-            initialized = true;
+            g_cublas_initialized = true;
+             g_cublas_loaded = false;
+             fprintf(stderr, "%s: no " GGML_CUDA_NAME " devices found, " GGML_CUDA_NAME " will be disabled\n", __func__);
+             return;
+@@ -8075,7 +8076,7 @@ GGML_CALL void ggml_init_cublas() {
+         // configure logging to stdout
+         // CUBLAS_CHECK(cublasLoggerConfigure(1, 1, 0, nullptr));
+ 
+-        initialized = true;
+        g_cublas_initialized = true;
+         g_cublas_loaded = true;
+     }
+ }
+@@ -11604,3 +11605,23 @@ GGML_CALL int ggml_backend_cuda_reg_devices() {
+     }
+     return device_count;
+ }
+
+
+extern "C" GGML_CALL void ggml_free_cublas(void);
+GGML_CALL void ggml_free_cublas(void) {
+    for (int id = 0; id < g_device_count; ++id) {
+#if !(defined(GGML_USE_HIPBLAS) && defined(__HIP_PLATFORM_AMD__))
+        if (g_device_caps[id].vmm) {
+            CU_CHECK(cuMemUnmap(g_cuda_pool_addr[id], g_cuda_pool_size[id]));
+            g_cuda_pool_size[id] = 0;
+            g_cuda_pool_addr[id] = 0;
+        }
+#endif
+        // TODO: free legacy non-vmm memory
+        // destroy cublas handle
+        CUBLAS_CHECK(cublasDestroy(g_cublas_handles[id]));
+        g_cublas_handles[id] = nullptr;
+    }
+
+    g_cublas_initialized = false;
+}
+diff --git a/ggml-cuda.h b/ggml-cuda.h
+index b1ebd61d..b4c80c2c 100644
+--- a/ggml-cuda.h
+++ b/ggml-cuda.h
+@@ -20,6 +20,9 @@ extern "C" {
+ // Always success. To check if CUDA is actually loaded, use `ggml_cublas_loaded`.
+ GGML_API GGML_CALL void   ggml_init_cublas(void);
+ 
+// Release CUDA resources
+GGML_API GGML_CALL void   ggml_free_cublas(void);
+
+ // Returns `true` if there are available CUDA devices and cublas loads successfully; otherwise, it returns `false`.
+ GGML_API GGML_CALL bool   ggml_cublas_loaded(void);
+