diff --git a/Makefile b/Makefile index 5b8f1cbe..1a008611 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ GOLLAMA_VERSION?=6a8041ef6b46d4712afc3ae791d1c2d73da0ad1c GOLLAMA_STABLE_VERSION?=50cee7712066d9e38306eccadcfbb44ea87df4b7 -CPPLLAMA_VERSION?=19885d205e768579ab090d1e99281cae58c21b54 +CPPLLAMA_VERSION?=4755afd1cbd40d93c017e5b98c39796f52345314 # gpt4all version GPT4ALL_REPO?=https://github.com/nomic-ai/gpt4all @@ -462,9 +462,6 @@ backend-assets/grpc/llama: backend-assets/grpc sources/go-llama/libbinding.a CGO_LDFLAGS="$(CGO_LDFLAGS)" C_INCLUDE_PATH=$(CURDIR)/sources/go-llama LIBRARY_PATH=$(CURDIR)/sources/go-llama \ $(GOCMD) build -ldflags "$(LD_FLAGS)" -tags "$(GO_TAGS)" -o backend-assets/grpc/llama ./backend/go/llm/llama/ # TODO: every binary should have its own folder instead, so can have different implementations -ifeq ($(BUILD_TYPE),metal) - cp backend/cpp/llama/llama.cpp/ggml-common.h backend-assets/grpc/ -endif ## BACKEND CPP LLAMA START # Sets the variables in case it has to build the gRPC locally. @@ -494,7 +491,7 @@ backend-assets/grpc/llama-cpp: backend-assets/grpc backend/cpp/llama/grpc-server cp -rfv backend/cpp/llama/grpc-server backend-assets/grpc/llama-cpp # TODO: every binary should have its own folder instead, so can have different metal implementations ifeq ($(BUILD_TYPE),metal) - cp backend/cpp/llama/llama.cpp/build/bin/ggml-common.h backend-assets/grpc/ + cp backend/cpp/llama/llama.cpp/build/bin/default.metallib backend-assets/grpc/ endif backend-assets/grpc/llama-ggml: backend-assets/grpc sources/go-llama-ggml/libbinding.a diff --git a/backend/cpp/llama/Makefile b/backend/cpp/llama/Makefile index 3fa84a4a..f2e17a9d 100644 --- a/backend/cpp/llama/Makefile +++ b/backend/cpp/llama/Makefile @@ -18,9 +18,7 @@ else ifeq ($(BUILD_TYPE),clblas) # If it's hipblas we do have also to set CC=/opt/rocm/llvm/bin/clang CXX=/opt/rocm/llvm/bin/clang++ else ifeq ($(BUILD_TYPE),hipblas) CMAKE_ARGS+=-DLLAMA_HIPBLAS=ON -# If it's OSX, embed the metal library for fewer moving parts. -else ifeq ($(BUILD_TYPE),metal) - CMAKE_ARGS+=-DLLAMA_METAL_EMBED_LIBRARY=ON +# If it's OSX, DO NOT embed the metal library - -DLLAMA_METAL_EMBED_LIBRARY=ON requires further investigation endif ifeq ($(BUILD_TYPE),sycl_f16)