From c2f1ed6556df76ffa02d17e5bffd436c52340ad4 Mon Sep 17 00:00:00 2001 From: Concedo <39025047+LostRuins@users.noreply.github.com> Date: Thu, 29 Jun 2023 17:54:12 +0800 Subject: [PATCH] fix compile errors --- CMakeLists.txt | 4 ++-- otherarch/ggml_v2-cuda-legacy.cu | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 653e2613c..f9f5f3ad5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,9 +74,9 @@ if (LLAMA_CUBLAS) add_compile_definitions(GGML_USE_CUBLAS) if (LLAMA_STATIC) - set(LLAMA_EXTRA_LIBS ${LLAMA_EXTRA_LIBS} CUDA::cudart_static CUDA::cublas_static CUDA::cublasLt_static) + set(LLAMA_EXTRA_LIBS ${LLAMA_EXTRA_LIBS} CUDA::cudart_static CUDA::cublas_static) else() - set(LLAMA_EXTRA_LIBS ${LLAMA_EXTRA_LIBS} CUDA::cudart CUDA::cublas CUDA::cublasLt) + set(LLAMA_EXTRA_LIBS ${LLAMA_EXTRA_LIBS} CUDA::cudart CUDA::cublas) endif() else() diff --git a/otherarch/ggml_v2-cuda-legacy.cu b/otherarch/ggml_v2-cuda-legacy.cu index fe032e721..d3220a786 100644 --- a/otherarch/ggml_v2-cuda-legacy.cu +++ b/otherarch/ggml_v2-cuda-legacy.cu @@ -9,6 +9,7 @@ #include #include "ggml_v2-cuda-legacy.h" +#include "ggml_v2-cuda.h" #include "ggml_v2.h" static_assert(sizeof(half) == sizeof(ggml_v2_fp16_t), "wrong fp16 size"); @@ -62,7 +63,7 @@ typedef struct { __half m; // min uint8_t qs[QK4_3 / 2]; // nibbles / quants } block_q4_3; -static_assert(sizeof(block_q4_3) == 2 * sizeof(ggml_fp16_t) + QK4_3 / 2, "wrong q4_3 block size/padding"); +static_assert(sizeof(block_q4_3) == 2 * sizeof(ggml_v2_fp16_t) + QK4_3 / 2, "wrong q4_3 block size/padding"); #define QK5_0 32 typedef struct { @@ -672,7 +673,7 @@ static void ggml_v2_cuda_mul_mat_q_f32(const ggml_v2_tensor * src0, const ggml_v ggml_v2_cuda_pool_free(d_Q, q_size); } -bool ggml_v2_cuda_mul_mat_use_f16(const struct ggml_v2_tensor * src0, const struct ggml_v2_tensor * src1, struct ggml_v2_tensor * /* dst */) { +static bool ggml_v2_cuda_mul_mat_use_f16(const struct ggml_v2_tensor * src0, const struct ggml_v2_tensor * src1, struct ggml_v2_tensor * /* dst */) { size_t src0_sz = ggml_v2_nbytes(src0); size_t src1_sz = ggml_v2_nbytes(src1);