gered/ollama
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1781 from dhiltgen/cpu_only_build

Browse source 
Fix CPU only builds
This commit is contained in:
Daniel Hiltgen 2024-01-03 16:18:25 -08:00 committed by GitHub
parent 1184686649 ddbfa6fe31
commit c1a10a6e9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
llm/llama.cpp/gen_linux.sh
View file

@ -35,6 +35,9 @@ BUILD_DIR="gguf/build/linux/cpu"
build build
install install
# Placeholder to keep go embed happy until we start building dynamic CPU lib variants
touch ${BUILD_DIR}/lib/dummy.so
if [ -d /usr/local/cuda/lib64/ ]; then if [ -d /usr/local/cuda/lib64/ ]; then
echo "CUDA libraries detected - building dynamic CUDA library" echo "CUDA libraries detected - building dynamic CUDA library"
init_vars init_vars

6
llm/shim_ext_server.go
View file

@ -147,9 +147,9 @@ func extractDynamicLibs(workDir, glob string) ([]string, error) {
if err != nil || len(files) == 0 { if err != nil || len(files) == 0 {
return nil, payloadMissing return nil, payloadMissing
} }
libs := make([]string, len(files)) libs := []string{}
for i, file := range files { for _, file := range files {
pathComps := strings.Split(file, "/") pathComps := strings.Split(file, "/")
if len(pathComps) != 7 { if len(pathComps) != 7 {
log.Printf("unexpected payload components: %v", pathComps) log.Printf("unexpected payload components: %v", pathComps)
@ -169,7 +169,7 @@ func extractDynamicLibs(workDir, glob string) ([]string, error) {
destFile := filepath.Join(targetDir, filepath.Base(file)) destFile := filepath.Join(targetDir, filepath.Base(file))
if strings.Contains(destFile, "server") { if strings.Contains(destFile, "server") {
libs[i] = destFile libs = append(libs, destFile)
} }
_, err = os.Stat(destFile) _, err = os.Stat(destFile)