Merge branch 'master' into concedo

# Conflicts:
#	.github/workflows/build.yml
#	README.md
This commit is contained in:
Concedo
2023-04-25 20:44:22 +08:00
11 changed files with 821 additions and 656 deletions
+2 -2
View File
@@ -128,9 +128,9 @@ ifdef LLAMA_CUBLAS
LDFLAGS += -lcublas -lculibos -lcudart -lcublasLt -lpthread -ldl -lrt -L/usr/local/cuda/lib64
OBJS += ggml-cuda.o
NVCC = nvcc
NVCCFLAGS = --forward-unknown-to-host-linker -arch=native
NVCCFLAGS = --forward-unknown-to-host-compiler -arch=native
ggml-cuda.o: ggml-cuda.cu ggml-cuda.h
$(NVCC) $(NVCCFLAGS) $(CXXFLAGS) -c $< -o $@
$(NVCC) $(NVCCFLAGS) $(CXXFLAGS) -Wno-pedantic -c $< -o $@
endif
ifdef LLAMA_GPROF
CFLAGS += -pg