Преглед на файлове

llm: statically link pthread and stdc++ dependencies in windows build

jmorganca преди 10 месеца
родител
ревизия
f1a379aa56
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 0 1
      llm/generate/gen_windows.ps1
  2. 2 1
      llm/llm.go

+ 0 - 1
llm/generate/gen_windows.ps1

@@ -204,7 +204,6 @@ function build_static() {
             "-DCMAKE_C_COMPILER=gcc.exe",
             "-DCMAKE_C_COMPILER=gcc.exe",
             "-DCMAKE_CXX_COMPILER=g++.exe",
             "-DCMAKE_CXX_COMPILER=g++.exe",
             "-DBUILD_SHARED_LIBS=off",
             "-DBUILD_SHARED_LIBS=off",
-            "-DGGML_STATIC=on",
             "-DGGML_NATIVE=off",
             "-DGGML_NATIVE=off",
             "-DGGML_AVX=off",
             "-DGGML_AVX=off",
             "-DGGML_AVX2=off",
             "-DGGML_AVX2=off",

+ 2 - 1
llm/llm.go

@@ -1,7 +1,8 @@
 package llm
 package llm
 
 
 // #cgo CFLAGS: -Illama.cpp -Illama.cpp/include -Illama.cpp/ggml/include
 // #cgo CFLAGS: -Illama.cpp -Illama.cpp/include -Illama.cpp/ggml/include
-// #cgo LDFLAGS: -lllama -lggml -lstdc++
+// #cgo LDFLAGS: -lllama -lggml -lstdc++ -lpthread
+// #cgo windows LDFLAGS: -static-libstdc++ -static-libgcc -static
 // #cgo darwin,arm64 LDFLAGS: -L${SRCDIR}/build/darwin/arm64_static -L${SRCDIR}/build/darwin/arm64_static/src -L${SRCDIR}/build/darwin/arm64_static/ggml/src -framework Accelerate -framework Metal
 // #cgo darwin,arm64 LDFLAGS: -L${SRCDIR}/build/darwin/arm64_static -L${SRCDIR}/build/darwin/arm64_static/src -L${SRCDIR}/build/darwin/arm64_static/ggml/src -framework Accelerate -framework Metal
 // #cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/build/darwin/x86_64_static -L${SRCDIR}/build/darwin/x86_64_static/src -L${SRCDIR}/build/darwin/x86_64_static/ggml/src
 // #cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/build/darwin/x86_64_static -L${SRCDIR}/build/darwin/x86_64_static/src -L${SRCDIR}/build/darwin/x86_64_static/ggml/src
 // #cgo windows,amd64 LDFLAGS: -L${SRCDIR}/build/windows/amd64_static -L${SRCDIR}/build/windows/amd64_static/src -L${SRCDIR}/build/windows/amd64_static/ggml/src
 // #cgo windows,amd64 LDFLAGS: -L${SRCDIR}/build/windows/amd64_static -L${SRCDIR}/build/windows/amd64_static/src -L${SRCDIR}/build/windows/amd64_static/ggml/src