Merge branch 'alex_amdsmi' into alex_amdsmi_utests

Author: alexandraBara

nodescraper/plugins/inband/amdsmi/amdsmi_collector.py

@@ -291,15 +291,8 @@ def _to_int(x: Any, default: int = 0) -> int:
         for idx, h in enumerate(devices):
             bdf = self._smi_try(amdsmi.amdsmi_get_gpu_device_bdf, h, default="") or ""
             uuid = self._smi_try(amdsmi.amdsmi_get_gpu_device_uuid, h, default="") or ""
-            kfd = self._smi_try(amdsmi.amdsmi_get_gpu_kfd_info, h, default={}) or {}
-
             kfd = self._smi_try(amdsmi.amdsmi_get_gpu_kfd_info, h, default={}) or {}
             partition_id = 0
-            if isinstance(kfd, dict):
-                try:
-                    partition_id = int(kfd.get("current_partition_id", 0) or 0)
-                except Exception:
-                    partition_id = 0
 
             try:
                 out.append(
@@ -692,12 +685,9 @@ def get_static(self) -> Optional[list[AmdSmiStatic]]:
                     numa_node = int(kfd.get("node_id", 0) or 0)
                 except Exception:
                     numa_node = 0
-                try:
-                    affinity = int(kfd.get("cpu_affinity", 0) or 0)
-                except Exception:
-                    affinity = 0
             else:
-                numa_node, affinity = 0, 0
+                numa_node = 0
+            affinity = 0
             numa_model = StaticNuma(node=numa_node, affinity=affinity)
 
             # VRAM

test/unit/plugin/test_amdsmi_collector.py

@@ -1,7 +1,7 @@
 import importlib
 import sys
 import types
-from typing import Tuple
+from typing import Optional, Tuple
 
 import pytest
 
@@ -29,7 +29,7 @@ class AmdSmiTimeoutError(_BaseAmdSmiError): ...
 
 def make_fake_amdsmi(
     *,
-    handles: Tuple[object, ...] | None = None,
+    handles: Optional[Tuple[object, ...]] = None,
     lib_version="1.2.3",
     rocm_version="6.1.0",
     pcie_static=True,
@@ -81,8 +81,6 @@ def amdsmi_get_processor_handles():
     m.amdsmi_get_gpu_kfd_info = lambda h: {
         "kfd_id": 7,
         "node_id": 3,
-        "cpu_affinity": 0xFF,
-        "current_partition_id": 0,
     }
     m.amdsmi_get_gpu_board_info = lambda h: {
         "vbios_name": "vbiosA",