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

Harden intel boostrap for nil pointers

Browse source
This commit is contained in:
Daniel Hiltgen 2024-08-09 11:31:38 -07:00
parent e9aa5117c4
commit 5bca2e60a7
1 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
gpu/gpu.go
View file

@ -305,38 +305,41 @@ func GetGPUInfo() GpuInfoList {
// Intel // Intel
if envconfig.IntelGPU() { if envconfig.IntelGPU() {
oHandles = initOneAPIHandles() oHandles = initOneAPIHandles()
// On windows we bundle the oneapi library one level above the runner dir if oHandles != nil && oHandles.oneapi != nil {
depPath = ""
if runtime.GOOS == "windows" && envconfig.RunnersDir() != "" {
depPath = filepath.Join(filepath.Dir(envconfig.RunnersDir()), "oneapi")
}
for d := range oHandles.oneapi.num_drivers { // On windows we bundle the oneapi library one level above the runner dir
if oHandles.oneapi == nil { depPath = ""
// shouldn't happen if runtime.GOOS == "windows" && envconfig.RunnersDir() != "" {
slog.Warn("nil oneapi handle with driver count", "count", int(oHandles.oneapi.num_drivers)) depPath = filepath.Join(filepath.Dir(envconfig.RunnersDir()), "oneapi")
continue
} }
devCount := C.oneapi_get_device_count(*oHandles.oneapi, C.int(d))
for i := range devCount { for d := range oHandles.oneapi.num_drivers {
gpuInfo := OneapiGPUInfo{ if oHandles.oneapi == nil {
GpuInfo: GpuInfo{ // shouldn't happen
Library: "oneapi", slog.Warn("nil oneapi handle with driver count", "count", int(oHandles.oneapi.num_drivers))
}, continue
driverIndex: int(d), }
gpuIndex: int(i), devCount := C.oneapi_get_device_count(*oHandles.oneapi, C.int(d))
for i := range devCount {
gpuInfo := OneapiGPUInfo{
GpuInfo: GpuInfo{
Library: "oneapi",
},
driverIndex: int(d),
gpuIndex: int(i),
}
// TODO - split bootstrapping from updating free memory
C.oneapi_check_vram(*oHandles.oneapi, C.int(d), i, &memInfo)
// TODO - convert this to MinimumMemory based on testing...
var totalFreeMem float64 = float64(memInfo.free) * 0.95 // work-around: leave some reserve vram for mkl lib used in ggml-sycl backend.
memInfo.free = C.uint64_t(totalFreeMem)
gpuInfo.TotalMemory = uint64(memInfo.total)
gpuInfo.FreeMemory = uint64(memInfo.free)
gpuInfo.ID = C.GoString(&memInfo.gpu_id[0])
gpuInfo.Name = C.GoString(&memInfo.gpu_name[0])
gpuInfo.DependencyPath = depPath
oneapiGPUs = append(oneapiGPUs, gpuInfo)
} }
// TODO - split bootstrapping from updating free memory
C.oneapi_check_vram(*oHandles.oneapi, C.int(d), i, &memInfo)
// TODO - convert this to MinimumMemory based on testing...
var totalFreeMem float64 = float64(memInfo.free) * 0.95 // work-around: leave some reserve vram for mkl lib used in ggml-sycl backend.
memInfo.free = C.uint64_t(totalFreeMem)
gpuInfo.TotalMemory = uint64(memInfo.total)
gpuInfo.FreeMemory = uint64(memInfo.free)
gpuInfo.ID = C.GoString(&memInfo.gpu_id[0])
gpuInfo.Name = C.GoString(&memInfo.gpu_name[0])
gpuInfo.DependencyPath = depPath
oneapiGPUs = append(oneapiGPUs, gpuInfo)
} }
} }
} }