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

Fix CPU-only build under Android Termux enviornment.

Browse source 
Update gpu.go initGPUHandles() to declare gpuHandles variable before
reading it. This resolves an "invalid memory address or nil pointer
dereference" error.

Update dyn_ext_server.c to avoid setting the RTLD_DEEPBIND flag under
__TERMUX__ (Android).
This commit is contained in:
Self Denial 2024-01-15 02:37:44 -07:00
parent d017e3d0a6
commit eb76f3e379
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gpu/gpu.go
View file

@ -63,6 +63,7 @@ func initGPUHandles() {
// TODO - if the ollama build is CPU only, don't do these checks as they're irrelevant and confusing // TODO - if the ollama build is CPU only, don't do these checks as they're irrelevant and confusing
gpuHandles = &handles{nil, nil}
var cudaMgmtName string var cudaMgmtName string
var cudaMgmtPatterns []string var cudaMgmtPatterns []string
var rocmMgmtName string var rocmMgmtName string
@ -87,7 +88,6 @@ func initGPUHandles() {
} }
slog.Info("Detecting GPU type") slog.Info("Detecting GPU type")
gpuHandles = &handles{nil, nil}
cudaLibPaths := FindGPULibs(cudaMgmtName, cudaMgmtPatterns) cudaLibPaths := FindGPULibs(cudaMgmtName, cudaMgmtPatterns)
if len(cudaLibPaths) > 0 { if len(cudaLibPaths) > 0 {
cuda := LoadCUDAMgmt(cudaLibPaths) cuda := LoadCUDAMgmt(cudaLibPaths)

2
llm/dyn_ext_server.c
View file

@ -3,7 +3,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#ifdef __linux__ #if defined(__linux__) && !defined(__TERMUX__)
#include <dlfcn.h> #include <dlfcn.h>
#define LOAD_LIBRARY(lib, flags) dlopen(lib, flags) #define LOAD_LIBRARY(lib, flags) dlopen(lib, flags)
#define LOAD_SYMBOL(handle, sym) dlsym(handle, sym) #define LOAD_SYMBOL(handle, sym) dlsym(handle, sym)