Browse Source

only build metal for `darwin,arm` target

Jeffrey Morgan 1 năm trước cách đây
mục cha
commit
7da249fcc1
2 tập tin đã thay đổi với 6 bổ sung5 xóa
  1. 2 1
      llama/llama.go
  2. 4 4
      scripts/build_darwin.sh

+ 2 - 1
llama/llama.go

@@ -3,7 +3,8 @@ package llama
 /*
 /*
 #cgo CPPFLAGS: -O3 -Wall -Wextra -Werror -Wno-unused-function -Wno-unused-variable -DNDEBUG -DGGML_USE_K_QUANTS
 #cgo CPPFLAGS: -O3 -Wall -Wextra -Werror -Wno-unused-function -Wno-unused-variable -DNDEBUG -DGGML_USE_K_QUANTS
 #cgo CXXFLAGS: -std=gnu++11
 #cgo CXXFLAGS: -std=gnu++11
-#cgo darwin CPPFLAGS: -DGGML_USE_ACCELERATE -DGGML_USE_METAL -DGGML_METAL_NDEBUG
+#cgo darwin CPPFLAGS:  -DGGML_USE_ACCELERATE
+#cgo darwin,arm64 CPPFLAGS: -DGGML_USE_METAL -DGGML_METAL_NDEBUG
 #cgo darwin LDFLAGS: -framework Accelerate -framework Foundation -framework Metal -framework MetalKit -framework MetalPerformanceShaders
 #cgo darwin LDFLAGS: -framework Accelerate -framework Foundation -framework Metal -framework MetalKit -framework MetalPerformanceShaders
 #include <stdlib.h>
 #include <stdlib.h>
 #include "llama.h"
 #include "llama.h"

+ 4 - 4
scripts/build_darwin.sh

@@ -3,10 +3,10 @@
 mkdir -p dist
 mkdir -p dist
 
 
 # build universal binary
 # build universal binary
-CGO_ENABLED=1 GOARCH=arm64 go build -o dist/ollama_arm64
-CGO_ENABLED=1 GOARCH=amd64 go build -o dist/ollama_amd64
-lipo -create -output dist/ollama dist/ollama_arm64 dist/ollama_amd64
-rm dist/ollama_amd64 dist/ollama_arm64
+CGO_ENABLED=1 GOARCH=arm64 go build -o dist/ollama-darwin-arm64
+CGO_ENABLED=1 GOARCH=amd64 go build -o dist/ollama-darwin-amd64
+lipo -create -output dist/ollama dist/ollama-darwin-arm64 dist/ollama-darwin-amd64
+rm dist/ollama-darwin-amd64 dist/ollama-darwin-arm64
 codesign --deep --force --options=runtime --sign "$APPLE_IDENTITY" --timestamp dist/ollama
 codesign --deep --force --options=runtime --sign "$APPLE_IDENTITY" --timestamp dist/ollama
 
 
 # build and sign the mac app
 # build and sign the mac app