arch: Additional tweaks

Author: JDBetteridge

devito/arch/archinfo.py

@@ -19,7 +19,9 @@
 from devito.tools import all_equal, as_tuple, memoized_func
 from devito.warnings import warn
 
-from .commands import lscpu, lshw, lspci, nvidia_smi, proc_cpuinfo, rocm_smi, sycl_ls
+from .commands import (
+    lscpu, lshw, lspci_gpu, nvidia_smi, proc_cpuinfo, rocm_smi, sycl_ls
+)
 
 
 __all__ = [  # noqa: RUF022
@@ -193,7 +195,7 @@ def get_cpu_info():
     try:
         cpu_info = cpuinfo.get_cpu_info()
     except Exception as e:
-        warn(f'Calling `cpuinfo.get_cpu_info()` faised an exception\n {e !s}')
+        warn(f'Calling `cpuinfo.get_cpu_info()` raised an exception\n {e !s}')
         cpu_info = {}
 
     cpu_info['logical'] = psutil.cpu_count(logical=True)
@@ -620,11 +622,11 @@ def get_gpu_info():
     - architecture: str, fallback 'unspecified'
     """
 
-    for call in [nvidia_smi, rocm_smi, sycl_ls, lshw, lspci]:
+    for call in [nvidia_smi, rocm_smi, sycl_ls, lshw, lspci_gpu]:
         try:
             gpu_info = homogenise_gpus(call())
             break
-        except (OSError):
+        except (OSError, FileNotFoundError, CalledProcessError):
             gpu_info = {}
 
     # Attach callbacks to retrieve instantaneous memory info

devito/arch/commands.py

@@ -12,6 +12,7 @@
     'lscpu',
     'lshw',
     'lspci',
+    'lspci_gpu',
     'nvidia_smi',
     'nvidia_smi_memory',
     'proc_cpuinfo',
@@ -171,7 +172,7 @@ def nvidia_smi_memory():
             # the output format (though we still have tests in place that
             # will catch this)
             vals = []
-            for value in line.split(', ')
+            for value in line.split(', '):
                 _, v, unit = re.split(r'([0-9]+)\s', line)
                 assert unit == 'MiB'
                 vals.append(int(v)*10**6)
@@ -331,7 +332,7 @@ def lshw():
     return filter_real_gpus(gpu_infos)
 
 
-def lspci():
+def old_lspci():
     ret = run(['lspci'], capture_output=True, text=True)
     lines = ret.stdout.splitlines()
 
@@ -363,3 +364,38 @@ def lspci():
             gpu_infos.append(gpu_info)
 
     return filter_real_gpus(gpu_infos)
+
+
+def lspci():
+    ret = run(['lspci', '-mm', '-v'], capture_output=True, text=True)
+    blocks = ret.stdout.strip().split('\n\n')
+
+    pci_info = {}
+    for device in blocks:
+        line = device.splitlines()
+        slot = line[0].split(':', 1)[1].strip()
+        info = {
+            (part:=l.split(':', 1))[0]: part[1].strip()
+            for l in line[1:]
+        }
+        pci_info[slot] = info
+    return pci_info
+
+
+def lspci_gpu():
+    devices = lspci()
+
+    gpu_info = []
+    for dev in devices.values():
+        # Graphics cards are listed as VGA, 3D controllers or Displays in lspci
+        if any(sub in dev['Class'] for sub in ('VGA', '3D', 'Display')):
+            info = {}
+            info['class'] = dev['Class']
+            info['vendor'] = dev['Vendor']
+            info['device'] = dev['Device']
+            info['product'] = dev['Device']
+            info['architecture'] = 'unspecified'
+            info['physicalid'] = 'unknown'
+            gpu_info.append(info)
+
+    return filter_real_gpus(gpu_info)