Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
ollama
Commits
34344d80
Commit
34344d80
authored
Jan 09, 2024
by
Jeffrey Morgan
Browse files
clean up cmake `build` directory when cross compiling macOS builds
parent
e868c8a5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
llm/generate/gen_darwin.sh
llm/generate/gen_darwin.sh
+3
-3
scripts/build_darwin.sh
scripts/build_darwin.sh
+1
-1
No files found.
llm/generate/gen_darwin.sh
View file @
34344d80
...
...
@@ -9,14 +9,14 @@ set -o pipefail
echo
"Starting darwin generate script"
source
$(
dirname
$0
)
/gen_common.sh
init_vars
CMAKE_DEFS
=
"-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 -DLLAMA_ACCELERATE=on
${
CMAKE_DEFS
}
"
CMAKE_DEFS
=
"-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0
-DCMAKE_SYSTEM_NAME=Darwin
-DLLAMA_ACCELERATE=on
${
CMAKE_DEFS
}
"
BUILD_DIR
=
"
${
LLAMACPP_DIR
}
/build/darwin/metal"
case
"
${
GOARCH
}
"
in
"amd64"
)
CMAKE_DEFS
=
"
-DCMAKE_SYSTEM_NAME=Darwin -DLLAMA_METAL=off
-DCMAKE_SYSTEM_PROCESSOR=x86_64 -DCMAKE_OSX_ARCHITECTURES=x86_64 -DLLAMA_NATIVE=off -DLLAMA_AVX=on -DLLAMA_AVX2=off -DLLAMA_AVX512=off -DLLAMA_FMA=off -DLLAMA_F16C=off
${
CMAKE_DEFS
}
"
CMAKE_DEFS
=
"-DCMAKE_SYSTEM_PROCESSOR=x86_64 -DCMAKE_OSX_ARCHITECTURES=x86_64
-DLLAMA_METAL=off
-DLLAMA_NATIVE=off -DLLAMA_AVX=on -DLLAMA_AVX2=off -DLLAMA_AVX512=off -DLLAMA_FMA=off -DLLAMA_F16C=off
${
CMAKE_DEFS
}
"
;;
"arm64"
)
CMAKE_DEFS
=
"-DCMAKE_SYSTEM_PROCESSOR=arm64
-DLLAMA_METAL=on
-DCMAKE_OSX_ARCHITECTURES=arm64
${
CMAKE_DEFS
}
"
CMAKE_DEFS
=
"-DCMAKE_SYSTEM_PROCESSOR=arm64 -DCMAKE_OSX_ARCHITECTURES=arm64
-DLLAMA_METAL=on
${
CMAKE_DEFS
}
"
;;
*
)
echo
"GOARCH must be set"
...
...
scripts/build_darwin.sh
View file @
34344d80
...
...
@@ -8,9 +8,9 @@ export GOFLAGS="'-ldflags=-w -s \"-X=github.com/jmorganca/ollama/version.Version
mkdir
-p
dist
for
TARGETARCH
in
arm64 amd64
;
do
rm
-rf
llm/llama.cpp/build
GOOS
=
darwin
GOARCH
=
$TARGETARCH
go generate ./...
CGO_ENABLED
=
1
GOOS
=
darwin
GOARCH
=
$TARGETARCH
go build
-o
dist/ollama-darwin-
$TARGETARCH
rm
-rf
llm/llama.cpp/
*
/build
done
lipo
-create
-output
dist/ollama dist/ollama-darwin-
*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment