]> git.djapps.eu Git - pkg/ggml/sources/llama.cpp/commitdiff
Makefile: use variables for cublas (#5689)
authorle.chang <redacted>
Tue, 27 Feb 2024 02:03:06 +0000 (10:03 +0800)
committerGitHub <redacted>
Tue, 27 Feb 2024 02:03:06 +0000 (03:03 +0100)
* make: use arch variable for cublas

* fix UNAME_M

* check opt first

---------

Co-authored-by: lindeer <redacted>
Makefile

index 068f6ed028460bdf9da90ac54dadf5eb48a055e2..4f26c0463fcd8b3fe5fbc7384e640d3500a25d9c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -381,8 +381,13 @@ ifdef LLAMA_BLIS
 endif # LLAMA_BLIS
 
 ifdef LLAMA_CUBLAS
-       MK_CPPFLAGS  += -DGGML_USE_CUBLAS -I/usr/local/cuda/include -I/opt/cuda/include -I$(CUDA_PATH)/targets/x86_64-linux/include -I/usr/local/cuda/targets/aarch64-linux/include
-       MK_LDFLAGS   += -lcuda -lcublas -lculibos -lcudart -lcublasLt -lpthread -ldl -lrt -L/usr/local/cuda/lib64 -L/opt/cuda/lib64 -L$(CUDA_PATH)/targets/x86_64-linux/lib -L/usr/local/cuda/targets/aarch64-linux/lib -L/usr/lib/wsl/lib
+       ifneq ('', '$(wildcard /opt/cuda)')
+               CUDA_PATH ?= /opt/cuda
+       else
+               CUDA_PATH ?= /usr/local/cuda
+       endif
+       MK_CPPFLAGS  += -DGGML_USE_CUBLAS -I$(CUDA_PATH)/include -I$(CUDA_PATH)/targets/$(UNAME_M)-linux/include
+       MK_LDFLAGS   += -lcuda -lcublas -lculibos -lcudart -lcublasLt -lpthread -ldl -lrt -L$(CUDA_PATH)/lib64 -L/usr/lib64 -L$(CUDA_PATH)/targets/$(UNAME_M)-linux/lib -L/usr/lib/wsl/lib
        OBJS         += ggml-cuda.o
        MK_NVCCFLAGS += -use_fast_math
 ifdef LLAMA_FATAL_WARNINGS