vendor/ollama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

discover: allow Radeon 8060S iGPU by default (#16429)

Browse Source 
Default integrated GPU filtering dropped the supported ROCm gfx1151 Radeon 8060S unless OLLAMA_IGPU_ENABLE was set, so add a ROCm gfx-target allowlist with gfx1151 as the first admitted target.  This iGPU is a known-good iGPU.

Fixes #16423
This commit is contained in:
Daniel Hiltgen
2026-06-02 11:15:01 -07:00
committed by GitHub
parent 6780f0416a
commit 4c076813be
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
discover/runner.go
View File

@@ -28,6 +28,11 @@ var (
bootstrapped bool
)
var defaultIntegratedROCmGFXTargets = map[string]struct{}{
// AMD Radeon 8060S / Ryzen AI Max+ 395.
"gfx1151": {},
}
func GPUDevices(ctx context.Context, runners []ml.FilteredRunnerDiscovery) []ml.DeviceInfo {
deviceMu.Lock()
defer deviceMu.Unlock()
@@ -410,7 +415,15 @@ func integratedGPUAdmission() (allow, explicit bool) {
}
func integratedGPUAllowedByDefault(device ml.DeviceInfo) bool {
return device.Library == "CUDA"
switch device.Library {
case "CUDA":
return true
case "ROCm":
_, ok := defaultIntegratedROCmGFXTargets[device.GFXTarget]
return ok
default:
return false
}
}
func filterOverlapByLibrary(supported map[string]map[string]map[string]int, needsDelete []bool) {

6
discover/runner_test.go
View File

@@ -137,7 +137,8 @@ func TestFilterIntegratedGPUs(t *testing.T) {
{DeviceID: ml.DeviceID{Library: "CUDA", ID: "0"}, Description: "NVIDIA integrated", Integrated: true},
{DeviceID: ml.DeviceID{Library: "Metal", ID: "0"}, Description: "Apple GPU", Integrated: true},
{DeviceID: ml.DeviceID{Library: "Vulkan", ID: "0"}, Description: "AMD Radeon(TM) Graphics", Integrated: true},
{DeviceID: ml.DeviceID{Library: "ROCm", ID: "0"}, Description: "AMD Radeon(TM) Graphics", Integrated: true},
{DeviceID: ml.DeviceID{Library: "ROCm", ID: "0"}, Description: "AMD Radeon 780M", Integrated: true, GFXTarget: "gfx1103"},
{DeviceID: ml.DeviceID{Library: "ROCm", ID: "1"}, Description: "AMD Radeon 8060S Graphics", Integrated: true, GFXTarget: "gfx1151"},
{DeviceID: ml.DeviceID{Library: "Vulkan", ID: "1"}, Description: "AMD Radeon RX 6800"},
}
@@ -149,6 +150,7 @@ func TestFilterIntegratedGPUs(t *testing.T) {
{Library: "Metal", ID: "0"},
{Library: "Vulkan", ID: "0"},
{Library: "ROCm", ID: "0"},
{Library: "ROCm", ID: "1"},
{Library: "Vulkan", ID: "1"},
}
assertDeviceIDs(t, got, want)
@@ -159,6 +161,7 @@ func TestFilterIntegratedGPUs(t *testing.T) {
got := filterIntegratedGPUs(append([]ml.DeviceInfo{}, devices...))
want := []ml.DeviceID{
{Library: "CUDA", ID: "0"},
{Library: "ROCm", ID: "1"},
{Library: "Vulkan", ID: "1"},
}
assertDeviceIDs(t, got, want)
@@ -172,6 +175,7 @@ func TestFilterIntegratedGPUs(t *testing.T) {
{Library: "Metal", ID: "0"},
{Library: "Vulkan", ID: "0"},
{Library: "ROCm", ID: "0"},
{Library: "ROCm", ID: "1"},
{Library: "Vulkan", ID: "1"},
}
assertDeviceIDs(t, got, want)