Merge pull request #5146 from dhiltgen/backout

Put back temporary intel GPU env var

envconfig/config.go

@@ -57,6 +57,8 @@ var (
 	SchedSpread bool
 	// Set via OLLAMA_TMPDIR in the environment
 	TmpDir string
+	// Set via OLLAMA_INTEL_GPU in the environment
+	IntelGpu bool
 
 	// Set via CUDA_VISIBLE_DEVICES in the environment
 	CudaVisibleDevices string
@@ -101,6 +103,7 @@ func AsMap() map[string]EnvVar {
 		ret["ROCR_VISIBLE_DEVICES"] = EnvVar{"ROCR_VISIBLE_DEVICES", RocrVisibleDevices, "Set which AMD devices are visible"}
 		ret["GPU_DEVICE_ORDINAL"] = EnvVar{"GPU_DEVICE_ORDINAL", GpuDeviceOrdinal, "Set which AMD devices are visible"}
 		ret["HSA_OVERRIDE_GFX_VERSION"] = EnvVar{"HSA_OVERRIDE_GFX_VERSION", HsaOverrideGfxVersion, "Override the gfx used for all detected AMD GPUs"}
+		ret["OLLAMA_INTEL_GPU"] = EnvVar{"OLLAMA_INTEL_GPU", IntelGpu, "Enable experimental Intel GPU detection"}
 	}
 	return ret
 }
@@ -276,6 +279,10 @@ func LoadConfig() {
 		slog.Error("invalid setting", "OLLAMA_HOST", Host, "error", err, "using default port", Host.Port)
 	}
 
+	if set, err := strconv.ParseBool(clean("OLLAMA_INTEL_GPU")); err == nil {
+		IntelGpu = set
+	}
+
 	CudaVisibleDevices = clean("CUDA_VISIBLE_DEVICES")
 	HipVisibleDevices = clean("HIP_VISIBLE_DEVICES")
 	RocrVisibleDevices = clean("ROCR_VISIBLE_DEVICES")

gpu/gpu.go

@@ -280,8 +280,9 @@ func GetGPUInfo() GpuInfoList {
 		}
 
 		// Intel
+		if envconfig.IntelGpu {
 			oHandles = initOneAPIHandles()
-		for d := 0; oHandles.oneapi != nil && d < int(oHandles.oneapi.num_drivers); d++ {
+			for d := range oHandles.oneapi.num_drivers {
 				if oHandles.oneapi == nil {
 					// shouldn't happen
 					slog.Warn("nil oneapi handle with driver count", "count", int(oHandles.oneapi.num_drivers))
@@ -293,7 +294,7 @@ func GetGPUInfo() GpuInfoList {
 						GpuInfo: GpuInfo{
 							Library: "oneapi",
 						},
-					driverIndex: d,
+						driverIndex: int(d),
 						gpuIndex:    int(i),
 					}
 					// TODO - split bootstrapping from updating free memory
@@ -309,6 +310,7 @@ func GetGPUInfo() GpuInfoList {
 					oneapiGPUs = append(oneapiGPUs, gpuInfo)
 				}
 			}
+		}
 
 		rocmGPUs = AMDGetGPUInfo()
 		bootstrapped = true