Skip to content

GitLab

Unverified Commit cfa63379 authored by Daniel Hiltgen's avatar Daniel Hiltgen Committed by GitHub
Browse files

Merge pull request #1982 from dhiltgen/fix_intel_mac 

Fix intel mac build
parents 557110d0 2ecb2472
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
llm/dyn_ext_server.go
View file @ cfa63379
...@@ -75,7 +75,7 @@ func newDynExtServer(library, model string, adapters, projectors []string, opts ...@@ -75,7 +75,7 @@ func newDynExtServer(library, model string, adapters, projectors []string, opts
updatePath(filepath.Dir(library)) updatePath(filepath.Dir(library))
libPath := C.CString(library) libPath := C.CString(library)
defer C.free(unsafe.Pointer(libPath)) defer C.free(unsafe.Pointer(libPath))
resp := newExtServerResp(128) resp := newExtServerResp(512)
defer freeExtServerResp(resp) defer freeExtServerResp(resp)
var srv C.struct_dynamic_llama_server var srv C.struct_dynamic_llama_server
C.dyn_init(libPath, &srv, &resp) C.dyn_init(libPath, &srv, &resp)
......
llm/generate/gen_darwin.sh
View file @ cfa63379
...@@ -14,9 +14,11 @@ BUILD_DIR="${LLAMACPP_DIR}/build/darwin/metal" ...@@ -14,9 +14,11 @@ BUILD_DIR="${LLAMACPP_DIR}/build/darwin/metal"
case "${GOARCH}" in case "${GOARCH}" in
"amd64") "amd64")
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}" 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}"
ARCH="x86_64"
;; ;;
"arm64") "arm64")
CMAKE_DEFS="-DCMAKE_SYSTEM_PROCESSOR=arm64 -DCMAKE_OSX_ARCHITECTURES=arm64 -DLLAMA_METAL=on ${CMAKE_DEFS}" CMAKE_DEFS="-DCMAKE_SYSTEM_PROCESSOR=arm64 -DCMAKE_OSX_ARCHITECTURES=arm64 -DLLAMA_METAL=on ${CMAKE_DEFS}"
ARHC="arm64"
;; ;;
*) *)
echo "GOARCH must be set" echo "GOARCH must be set"
...@@ -30,6 +32,7 @@ apply_patches ...@@ -30,6 +32,7 @@ apply_patches
build build
install install
gcc -fPIC -g -shared -o ${BUILD_DIR}/lib/libext_server.so \ gcc -fPIC -g -shared -o ${BUILD_DIR}/lib/libext_server.so \
-arch ${ARCH} \
-Wl,-force_load ${BUILD_DIR}/lib/libext_server.a \ -Wl,-force_load ${BUILD_DIR}/lib/libext_server.a \
${BUILD_DIR}/lib/libcommon.a \ ${BUILD_DIR}/lib/libcommon.a \
${BUILD_DIR}/lib/libllama.a \ ${BUILD_DIR}/lib/libllama.a \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment