Temporarily pick NVIDIA over AMD if both are present in the same system

Author: cmdr2

tests/test_platform_detection.py

@@ -140,13 +140,23 @@ def test_intel_gpu_mac(monkeypatch):
         get_torch_platform(gpu_infos)
 
 
-def test_multiple_gpu_vendors(monkeypatch):
+def test_multiple_gpu_vendors_with_NVIDIA(monkeypatch):
     monkeypatch.setattr("torchruntime.platform_detection.os_name", "Windows")
     monkeypatch.setattr("torchruntime.platform_detection.arch", "amd64")
     gpu_infos = [
         GPU(AMD, "AMD", 0x1234, "Radeon", True),
         GPU(NVIDIA, "NVIDIA", 0x5678, "GeForce", True),
     ]
+    assert get_torch_platform(gpu_infos) == "cu124"
+
+
+def test_multiple_gpu_vendors_without_NVIDIA(monkeypatch):
+    monkeypatch.setattr("torchruntime.platform_detection.os_name", "Windows")
+    monkeypatch.setattr("torchruntime.platform_detection.arch", "amd64")
+    gpu_infos = [
+        GPU(AMD, "AMD", 0x1234, "Radeon", True),
+        GPU(INTEL, "Intel", 0x5678, "Iris", True),
+    ]
     with pytest.raises(NotImplementedError):
         get_torch_platform(gpu_infos)
 
@@ -376,6 +386,4 @@ def test_mixed_multiple_discrete_and_integrated(monkeypatch):
         GPU(NVIDIA, "NVIDIA", "2504", "RTX 3060", True),  # discrete NVIDIA
         GPU(AMD, "AMD", "73f0", "Navi 33", True),  # discrete AMD
     ]
-    # Should raise NotImplementedError due to multiple discrete GPU vendors
-    with pytest.raises(NotImplementedError):
-        get_torch_platform(gpu_infos)
+    assert get_torch_platform(gpu_infos) == "cu124"

torchruntime/platform_detection.py

@@ -61,10 +61,14 @@ def _get_platform_for_discrete(gpu_infos):
     vendor_ids = set(gpu.vendor_id for gpu in gpu_infos)
 
     if len(vendor_ids) > 1:
-        device_names = list(gpu.vendor_name + " " + gpu.device_name for gpu in gpu_infos)
-        raise NotImplementedError(
-            f"torchruntime does not currently support multiple graphics card manufacturers on the same computer: {device_names}! Please contact torchruntime at {CONTACT_LINK} with details about your hardware."
-        )
+        if NVIDIA in vendor_ids:  # temp hack to pick NVIDIA over everything else, pending a better fix
+            gpu_infos = [gpu for gpu in gpu_infos if gpu.vendor_id == NVIDIA]
+            vendor_ids = set(gpu.vendor_id for gpu in gpu_infos)
+        else:
+            device_names = list(gpu.vendor_name + " " + gpu.device_name for gpu in gpu_infos)
+            raise NotImplementedError(
+                f"torchruntime does not currently support multiple graphics card manufacturers on the same computer: {device_names}! Please contact torchruntime at {CONTACT_LINK} with details about your hardware."
+            )
 
     vendor_id = vendor_ids.pop()
     if vendor_id == AMD: