diff --git a/llama/Makefile b/llama/Makefile index 029bb961..ee086a89 100644 --- a/llama/Makefile +++ b/llama/Makefile @@ -99,14 +99,14 @@ RUNNERS := ollama_runner ifeq ($(ARCH),amd64) RUNNERS += ollama_runner_avx ollama_runner_avx2 endif -ifeq ($(NVCC),) +ifneq ($(NVCC),) RUNNERS += ollama_runner_cuda endif -ifeq ($(HIPCC),) +ifneq ($(HIPCC),) RUNNERS += ollama_runner_rocm endif -all: ollama_runner $(RUNNERS) +runners: $(RUNNERS) %.cuda.$(OBJ_EXT): %.cu $(NVCC) -c $(CUDA_FLAGS) -o $@ $< diff --git a/llama/llama.go b/llama/llama.go index 3977215c..d840de9d 100644 --- a/llama/llama.go +++ b/llama/llama.go @@ -59,7 +59,6 @@ var ggmlMetal string func init() { metal := strings.ReplaceAll(ggmlMetal, `#include "ggml-common.h"`, ggmlCommon) - fmt.Println(metal) cMetal := C.CString(metal) C.ggml_metallib_start = cMetal C.ggml_metallib_end = (*C.char)(unsafe.Pointer(uintptr(unsafe.Pointer(cMetal)) + uintptr(len(metal)))) diff --git a/llama/metal-darwin-arm64.m b/llama/metal-darwin-arm64.m deleted file mode 100644 index c16b4ddc..00000000 --- a/llama/metal-darwin-arm64.m +++ /dev/null @@ -1,4 +0,0 @@ -#import - -const char* ggml_metallib_start = NULL; -const char* ggml_metallib_end = NULL; diff --git a/llama/metal.c b/llama/metal.c new file mode 100644 index 00000000..c466c342 --- /dev/null +++ b/llama/metal.c @@ -0,0 +1,2 @@ +const char* ggml_metallib_start = 0; +const char* ggml_metallib_end = 0;