Harden parsing device info (#64)

Author: ggeorgakoudis

src/numba/openmp/__init__.py

@@ -115,13 +115,17 @@ def _init_offloading_info():
 
     num_devices = omp_get_num_devices()
 
+    if num_devices == 0:
+        if DEBUG_OPENMP >= 1:
+            print("No OpenMP offloading devices found")
+        return
+
     try:
         addr = ll.address_of_symbol("__tgt_get_device_info")
         if not addr:
-            if DEBUG_OPENMP >= 1:
-                print(
-                    "Symbol __tgt_get_device_info not found in OpenMP runtime, skipping device info initialization"
-                )
+            raise RuntimeError(
+                "Symbol __tgt_get_device_info not found in OpenMP runtime"
+            )
         from ctypes import (
             CFUNCTYPE,
             c_void_p,
@@ -147,8 +151,7 @@ def _copy_cb(ptr, size):
             add_device_info(i, info_str)
 
     except Exception as e:
-        if DEBUG_OPENMP >= 1:
-            print(f"Warning: Failed to initialize offloading info: {e}")
+        raise e
 
 
 def _init():

src/numba/openmp/offloading.py

@@ -21,9 +21,7 @@ def add_device_info(device_id, info_text):
     try:
         _device_info_map[device_id] = _parse_device_info(info_text)
     except Exception as e:
-        raise RuntimeError(
-            f"Warning: Failed to parse device info for device {device_id}: {e}"
-        )
+        raise RuntimeError(f"Failed to parse device info for device {device_id}: {e}")
 
 
 def _parse_device_info(output: str):
@@ -52,11 +50,17 @@ def _parse_device_info(output: str):
 
         device_info_all[key] = val
 
-    if "amd" in device_info_all.get("vendor name", ""):
+    if (
+        "hsa openmp device number" in device_info_all.keys()
+        or "amd" in device_info_all.get("vendor name", "")
+    ):
         vendor = "amd"
         devtype = "gpu"
         arch = device_info_all.get("device name", "")
-    elif "nvidia" in device_info_all.get("device name", ""):
+    elif (
+        "cuda openmp device number" in device_info_all.keys()
+        or "nvidia" in device_info_all.get("device name", "")
+    ):
         vendor = "nvidia"
         devtype = "gpu"
         arch = device_info_all.get("compute capabilities", "")