gpustack-runtime 0.1.42__py3-none-any.whl → 0.1.42.post1__py3-none-any.whl

gpustack_runtime/_version.py

@@ -27,8 +27,8 @@ version_tuple: VERSION_TUPLE
 __commit_id__: COMMIT_ID
 commit_id: COMMIT_ID
 
-__version__ = version = '0.1.42'
-__version_tuple__ = version_tuple = (0, 1, 42)
+__version__ = version = '0.1.42.post1'
+__version_tuple__ = version_tuple = (0, 1, 42, 'post1')
 try:
     from ._version_appendix import git_commit
     __commit_id__ = commit_id = git_commit

gpustack_runtime/_version_appendix.py

@@ -1 +1 @@
-git_commit = "a9222e0"
+git_commit = "ff610ac"

gpustack_runtime/cmds/detector.py

@@ -123,7 +123,7 @@ class GetDevicesTopologySubCommand(SubCommand):
                     "",
                     "Legend (from nearest to farthest):",
                     "  X    = Self",
-                    "  LINK = Connection traversing with High-Speed Link (e.g., AMD XGMI, Ascend HCCS, NVIDIA NVLink)",
+                    "  LINK = Connection traversing with High-Speed Link (e.g., AMD XGMI, Ascend HCCS, MThreads MTLink, NVIDIA NVLink, T-Head ICNLink)",
                     "  PIX  = Connection traversing at most a single PCIe bridge",
                     "  PXB  = Connection traversing multiple PCIe bridges (without traversing the PCIe Host Bridge)",
                     "  PHB  = Connection traversing PCIe as well as a PCIe Host Bridge (typically the CPU)",

gpustack_runtime/deployer/cdi/__init__.py

@@ -82,7 +82,7 @@ def dump_config(
     if cdi_path.exists():
         actual = cdi_path.read_text(encoding="utf-8")
         if actual == expected:
-            return expected, str(cdi_path)
+            return expected, None
 
     cdi_path.write_text(expected, encoding="utf-8")
     return expected, str(cdi_path)

gpustack_runtime/deployer/cdi/__types__.py

@@ -527,7 +527,7 @@ class Config(dict):
         self,
         kind: str,
         devices: list[ConfigDevice],
-        container_edits: list[ConfigContainerEdits] | None = None,
+        container_edits: ConfigContainerEdits | None = None,
         cdi_version: str = _DEFAULT_CDI_VERSION,
         annotations: dict[str, str] | None = None,
     ):
@@ -581,7 +581,7 @@ class Config(dict):
         return self["kind"]
 
     @property
-    def container_edits(self) -> list[ConfigContainerEdits] | None:
+    def container_edits(self) -> ConfigContainerEdits | None:
         """
         Return the list of container edits in the CDI configuration.
 

gpustack_runtime/deployer/cdi/amd.py

@@ -135,12 +135,10 @@ class AMDGenerator(Generator):
         return Config(
             kind=kind,
             devices=cdi_devices,
-            container_edits=[
-                ConfigContainerEdits(
-                    env=[
-                        f"{runtime_env}=void",
-                    ],
-                    device_nodes=common_device_nodes,
-                ),
-            ],
+            container_edits=ConfigContainerEdits(
+                env=[
+                    f"{runtime_env}=void",
+                ],
+                device_nodes=common_device_nodes,
+            ),
         )

gpustack_runtime/deployer/cdi/ascend.py

@@ -152,13 +152,11 @@ class AscendGenerator(Generator):
         return Config(
             kind=kind,
             devices=cdi_devices,
-            container_edits=[
-                ConfigContainerEdits(
-                    env=[
-                        f"{runtime_env}=void",
-                    ],
-                    device_nodes=common_device_nodes,
-                    mounts=common_mounts,
-                ),
-            ],
+            container_edits=ConfigContainerEdits(
+                env=[
+                    f"{runtime_env}=void",
+                ],
+                device_nodes=common_device_nodes,
+                mounts=common_mounts,
+            ),
         )

gpustack_runtime/deployer/cdi/hygon.py

@@ -136,12 +136,10 @@ class HygonGenerator(Generator):
         return Config(
             kind=kind,
             devices=cdi_devices,
-            container_edits=[
-                ConfigContainerEdits(
-                    env=[
-                        f"{runtime_env}=void",
-                    ],
-                    device_nodes=common_device_nodes,
-                ),
-            ],
+            container_edits=ConfigContainerEdits(
+                env=[
+                    f"{runtime_env}=void",
+                ],
+                device_nodes=common_device_nodes,
+            ),
         )

gpustack_runtime/deployer/cdi/iluvatar.py

@@ -125,12 +125,10 @@ class IluvatarGenerator(Generator):
         return Config(
             kind=kind,
             devices=cdi_devices,
-            container_edits=[
-                ConfigContainerEdits(
-                    env=[
-                        f"{runtime_env}=void",
-                    ],
-                    device_nodes=common_device_nodes,
-                ),
-            ],
+            container_edits=ConfigContainerEdits(
+                env=[
+                    f"{runtime_env}=void",
+                ],
+                device_nodes=common_device_nodes,
+            ),
         )

gpustack_runtime/deployer/cdi/metax.py

@@ -137,12 +137,10 @@ class MetaXGenerator(Generator):
         return Config(
             kind=kind,
             devices=cdi_devices,
-            container_edits=[
-                ConfigContainerEdits(
-                    env=[
-                        f"{runtime_env}=void",
-                    ],
-                    device_nodes=common_device_nodes,
-                ),
-            ],
+            container_edits=ConfigContainerEdits(
+                env=[
+                    f"{runtime_env}=void",
+                ],
+                device_nodes=common_device_nodes,
+            ),
         )

gpustack_runtime/deployer/cdi/thead.py

@@ -126,12 +126,10 @@ class THeadGenerator(Generator):
         return Config(
             kind=kind,
             devices=cdi_devices,
-            container_edits=[
-                ConfigContainerEdits(
-                    env=[
-                        f"{runtime_env}=void",
-                    ],
-                    device_nodes=common_device_nodes,
-                ),
-            ],
+            container_edits=ConfigContainerEdits(
+                env=[
+                    f"{runtime_env}=void",
+                ],
+                device_nodes=common_device_nodes,
+            ),
         )

gpustack_runtime/deployer/docker.py

@@ -985,11 +985,37 @@ class DockerDeployer(EndoscopicDeployer):
                     # Generate CDI config if not yet.
                     if cdi and envs.GPUSTACK_RUNTIME_DOCKER_CDI_SPECS_GENERATE:
                         for ren in runtime_envs:
-                            r_m = self.get_manufacturer(ren)
-                            cdi_dump_config(
-                                manufacturer=r_m,
+                            manu = self.get_manufacturer(ren)
+                            cdi_config, cdi_config_path = cdi_dump_config(
+                                manufacturer=manu,
                                 output=envs.GPUSTACK_RUNTIME_DEPLOY_CDI_SPECS_DIRECTORY,
                             )
+                            if cdi_config and cdi_config_path:
+                                if logger.isEnabledFor(logging.DEBUG):
+                                    logger.debug(
+                                        "Generated CDI configuration for '%s' at '%s':\n%s",
+                                        manu,
+                                        cdi_config_path,
+                                        cdi_config,
+                                    )
+                                else:
+                                    logger.info(
+                                        "Generated CDI configuration for '%s' at '%s'",
+                                        manu,
+                                        cdi_config_path,
+                                    )
+                            elif cdi_config:
+                                logger.info(
+                                    "Reuse generated CDI configuration for '%s'",
+                                    manu,
+                                )
+                            else:
+                                logger.warning(
+                                    "Delegated CDI configuration by other tools for '%s', "
+                                    "e.g. for NVIDIA devices, please follow NVIDIA Container Toolkit Manual CDI Specification Generation to generate the CDI configuration, "
+                                    "see https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/cdi-support.html#manual-cdi-specification-generation",
+                                    manu,
+                                )
 
                     # Request devices.
                     if r_v == "all":

gpustack_runtime/deployer/k8s/deviceplugin/__init__.py

@@ -78,28 +78,33 @@ async def serve_async(
             allocation_policy == "cdi"
             and envs.GPUSTACK_RUNTIME_KUBERNETES_KDP_CDI_SPECS_GENERATE
         ):
-            generated_content, generated_path = cdi_dump_config(
+            cdi_config, cdi_config_path = cdi_dump_config(
                 manufacturer=manu,
                 output=cdi_generation_output,
             )
-            if generated_content:
+            if cdi_config and cdi_config_path:
                 if logger.isEnabledFor(logging.DEBUG):
                     logger.debug(
                         "Generated CDI configuration for '%s' at '%s':\n%s",
                         manu,
-                        generated_path,
-                        generated_content,
+                        cdi_config_path,
+                        cdi_config,
                     )
                 else:
                     logger.info(
                         "Generated CDI configuration for '%s' at '%s'",
                         manu,
-                        generated_path,
+                        cdi_config_path,
                     )
+            elif cdi_config:
+                logger.info(
+                    "Reuse generated CDI configuration for '%s'",
+                    manu,
+                )
             else:
                 logger.warning(
-                    "Delegated CDI configuration by other tools for manufacturer '%s', "
-                    "e.g. NVIDIA Container Toolkit Manual CDI Specification Generation, "
+                    "Delegated CDI configuration by other tools for '%s', "
+                    "e.g. for NVIDIA devices, please follow NVIDIA Container Toolkit Manual CDI Specification Generation to generate the CDI configuration, "
                     "see https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/cdi-support.html#manual-cdi-specification-generation",
                     manu,
                 )

gpustack_runtime/deployer/k8s/deviceplugin/plugin.py

@@ -12,6 +12,7 @@ from grpc_interceptor import AsyncServerInterceptor
 from grpc_interceptor.exceptions import GrpcException
 
 from ....detector import Device, DeviceMemoryStatusEnum, str_range_to_list
+from ....detector.__utils__ import get_numa_node_size
 from ...cdi import (
     generate_config,
     manufacturer_to_cdi_kind,
@@ -346,8 +347,11 @@ class SharableDevicePlugin(PluginServer, DevicePluginServicer):
                 NUMANode(
                     ID=node_id,
                 )
-                for node_id in str_range_to_list(
-                    self._device.appendix.get("numa", "0"),
+                for node_id in (
+                    str_range_to_list(
+                        self._device.appendix.get("numa", ""),
+                    )
+                    or list(range(get_numa_node_size()))
                 )
             ],
         )

gpustack_runtime/deployer/podman.py

@@ -982,11 +982,37 @@ class PodmanDeployer(EndoscopicDeployer):
                     # Generate CDI config if not yet.
                     if envs.GPUSTACK_RUNTIME_PODMAN_CDI_SPECS_GENERATE:
                         for ren in runtime_envs:
-                            r_m = self.get_manufacturer(ren)
-                            cdi_dump_config(
-                                manufacturer=r_m,
+                            manu = self.get_manufacturer(ren)
+                            cdi_config, cdi_config_path = cdi_dump_config(
+                                manufacturer=manu,
                                 output=envs.GPUSTACK_RUNTIME_DEPLOY_CDI_SPECS_DIRECTORY,
                             )
+                            if cdi_config and cdi_config_path:
+                                if logger.isEnabledFor(logging.DEBUG):
+                                    logger.debug(
+                                        "Generated CDI configuration for '%s' at '%s':\n%s",
+                                        manu,
+                                        cdi_config_path,
+                                        cdi_config,
+                                    )
+                                else:
+                                    logger.info(
+                                        "Generated CDI configuration for '%s' at '%s'",
+                                        manu,
+                                        cdi_config_path,
+                                    )
+                            elif cdi_config:
+                                logger.info(
+                                    "Reuse generated CDI configuration for '%s'",
+                                    manu,
+                                )
+                            else:
+                                logger.warning(
+                                    "Delegated CDI configuration by other tools for '%s', "
+                                    "e.g. for NVIDIA devices, please follow NVIDIA Container Toolkit Manual CDI Specification Generation to generate the CDI configuration, "
+                                    "see https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/cdi-support.html#manual-cdi-specification-generation",
+                                    manu,
+                                )
 
                     # Configure device access environment variable.
                     if r_v == "all":

gpustack_runtime/detector/__utils__.py

@@ -916,6 +916,9 @@ def str_range_to_list(str_range: str) -> list[int]:
         A list of indices.
 
     """
+    if not str_range:
+        return []
+
     str_range_parts = str_range.split(",")
 
     indices: set[int] = set()

gpustack_runtime/detector/amd.py

@@ -220,14 +220,16 @@ class AMDDetector(Detector):
 
                 dev_numa = get_numa_node_by_bdf(dev_bdf)
                 if not dev_numa:
-                    dev_numa = str(pyamdsmi.amdsmi_topo_get_numa_node_number(dev))
+                    with contextlib.suppress(pyamdsmi.AmdSmiException):
+                        dev_numa = str(pyamdsmi.amdsmi_topo_get_numa_node_number(dev))
 
                 dev_appendix = {
                     "arch_family": _get_arch_family(dev_asic_family_id),
                     "vgpu": dev_is_vgpu,
                     "bdf": dev_bdf,
-                    "numa": dev_numa,
                 }
+                if dev_numa:
+                    dev_appendix["numa"] = dev_numa
                 if dev_card_id is not None:
                     dev_appendix["card_id"] = dev_card_id
                 if dev_renderd_id is not None:

gpustack_runtime/detector/ascend.py

@@ -32,10 +32,12 @@ slogger = logger.getChild("internal")
 _TOPOLOGY_DISTANCE_MAPPING: dict[int, int] = {
     pydcmi.DCMI_TOPO_TYPE_SELF: TopologyDistanceEnum.SELF,
     pydcmi.DCMI_TOPO_TYPE_HCCS: TopologyDistanceEnum.LINK,  # Traversing via high-speed interconnect, RoCE, etc.
+    pydcmi.DCMI_TOPO_TYPE_HCCS_SW: TopologyDistanceEnum.LINK,  # Traversing via high-speed interconnect switch.
     pydcmi.DCMI_TOPO_TYPE_PIX: TopologyDistanceEnum.PIX,  # Traversing via a single PCIe bridge.
     pydcmi.DCMI_TOPO_TYPE_PXB: TopologyDistanceEnum.PXB,  # Traversing via multiple PCIe bridges without PCIe Host Bridge.
     pydcmi.DCMI_TOPO_TYPE_PHB: TopologyDistanceEnum.PHB,  # Traversing via a PCIe Host Bridge.
     pydcmi.DCMI_TOPO_TYPE_SYS: TopologyDistanceEnum.SYS,  # Traversing via SMP interconnect across other NUMA nodes.
+    pydcmi.DCMI_TOPO_TYPE_SIO: TopologyDistanceEnum.SYS,  # Traversing via Super I/O or other slower interconnects.
 }
 """
 Mapping of Ascend topology types to distance values.
@@ -109,7 +111,7 @@ class AscendDetector(Detector):
 
             sys_driver_ver = pydcmi.dcmi_get_driver_version()
 
-            sys_runtime_ver_original = pyacl.aclsysGetCANNVersion()
+            sys_runtime_ver_original = pyacl.aclsysGetVersion()
             sys_runtime_ver = get_brief_version(sys_runtime_ver_original)
 
             _, card_list = pydcmi.dcmi_get_card_list()
@@ -198,13 +200,14 @@ class AscendDetector(Detector):
 
                     dev_numa = get_numa_node_by_bdf(dev_bdf)
                     if not dev_numa:
-                        dev_cpu_affinity = (
-                            pydcmi.dcmi_get_affinity_cpu_info_by_device_id(
-                                dev_card_id,
-                                dev_device_id,
+                        with contextlib.suppress(pydcmi.DCMIError):
+                            dev_cpu_affinity = (
+                                pydcmi.dcmi_get_affinity_cpu_info_by_device_id(
+                                    dev_card_id,
+                                    dev_device_id,
+                                )
                             )
-                        )
-                        dev_numa = map_cpu_affinity_to_numa_node(dev_cpu_affinity)
+                            dev_numa = map_cpu_affinity_to_numa_node(dev_cpu_affinity)
 
                     dev_appendix = {
                         "arch_family": (
@@ -213,11 +216,12 @@ class AscendDetector(Detector):
                         ),
                         "vgpu": dev_is_vgpu,
                         "bdf": dev_bdf,
-                        "numa": dev_numa,
                         "card_id": dev_card_id,
                         "device_id": dev_device_id,
                         "device_id_max": device_num_in_card - 1,
                     }
+                    if dev_numa:
+                        dev_appendix["numa"] = dev_numa
 
                     dev_roce_ip, dev_roce_mask, dev_roce_gateway = (
                         _get_device_roce_network_info(
@@ -440,7 +444,7 @@ def _get_device_roce_network_info(
             pydcmi.DCMI_PORT_TYPE_ROCE_PORT,
         )
     except pydcmi.DCMIError:
-        debug_log_exception(logger, "Failed to get device roce network info")
+        debug_log_exception(logger, "Failed to get device RoCE network info")
 
     return ip, mask, gateway
 
@@ -501,12 +505,15 @@ _soc_name_version_mapping: dict[str, int] = {
     "Ascend310B3": 242,
     "Ascend310B4": 243,
     "Ascend910_9391": 250,
+    "Ascend910": 250,
     "Ascend910_9392": 251,
     "Ascend910_9381": 252,
     "Ascend910_9382": 253,
     "Ascend910_9372": 254,
     "Ascend910_9362": 255,
     "Ascend910_9579": 260,
+    "Ascend910_95": 260,
+    "Ascend950": 260,
 }
 
 
@@ -522,6 +529,8 @@ def _guess_soc_name_from_dev_name(dev_name: str) -> str | None:
         The guessed SoC name, or None if not found.
 
     """
+    if dev_name.startswith("Ascend"):
+        dev_name = dev_name[6:].strip()
     soc_name = f"Ascend{dev_name}"
     if soc_name in _soc_name_version_mapping:
         return soc_name

gpustack_runtime/detector/hygon.py

@@ -171,13 +171,17 @@ class HygonDetector(Detector):
 
                 dev_numa = get_numa_node_by_bdf(dev_bdf)
                 if not dev_numa:
-                    dev_numa = str(pyrocmsmi.rsmi_topo_get_numa_node_number(dev_idx))
+                    with contextlib.suppress(pyrocmsmi.ROCMSMIError):
+                        dev_numa = str(
+                            pyrocmsmi.rsmi_topo_get_numa_node_number(dev_idx),
+                        )
 
                 dev_appendix = {
                     "vgpu": dev_is_vgpu,
                     "bdf": dev_bdf,
-                    "numa": dev_numa,
                 }
+                if dev_numa:
+                    dev_appendix["numa"] = dev_numa
                 if dev_card_id is not None:
                     dev_appendix["card_id"] = dev_card_id
                 if dev_renderd_id is not None:

gpustack_runtime/detector/iluvatar.py

@@ -190,18 +190,20 @@ class IluvatarDetector(Detector):
 
                 dev_numa = get_numa_node_by_bdf(dev_bdf)
                 if not dev_numa:
-                    dev_node_affinity = pyixml.nvmlDeviceGetMemoryAffinity(
-                        dev,
-                        get_numa_nodeset_size(),
-                        pyixml.NVML_AFFINITY_SCOPE_NODE,
-                    )
-                    dev_numa = bitmask_to_str(list(dev_node_affinity))
+                    with contextlib.suppress(pyixml.NVMLError):
+                        dev_node_affinity = pyixml.nvmlDeviceGetMemoryAffinity(
+                            dev,
+                            get_numa_nodeset_size(),
+                            pyixml.NVML_AFFINITY_SCOPE_NODE,
+                        )
+                        dev_numa = bitmask_to_str(list(dev_node_affinity))
 
                 dev_appendix = {
                     "vgpu": dev_is_vgpu,
                     "bdf": dev_bdf,
-                    "numa": dev_numa,
                 }
+                if dev_numa:
+                    dev_appendix["numa"] = dev_numa
 
                 ret.append(
                     Device(

gpustack_runtime/detector/metax.py

@@ -179,17 +179,19 @@ class MetaXDetector(Detector):
 
                 dev_numa = get_numa_node_by_bdf(dev_bdf)
                 if not dev_numa:
-                    dev_node_affinity = pymxsml.mxSmlGetNodeAffinity(
-                        dev_idx,
-                        get_numa_nodeset_size(),
-                    )
-                    dev_numa = bitmask_to_str(list(dev_node_affinity))
+                    with contextlib.suppress(pymxsml.MXSMLError):
+                        dev_node_affinity = pymxsml.mxSmlGetNodeAffinity(
+                            dev_idx,
+                            get_numa_nodeset_size(),
+                        )
+                        dev_numa = bitmask_to_str(list(dev_node_affinity))
 
                 dev_appendix = {
                     "vgpu": dev_is_vgpu,
                     "bdf": dev_bdf,
-                    "numa": dev_numa,
                 }
+                if dev_numa:
+                    dev_appendix["numa"] = dev_numa
                 if dev_card_id is not None:
                     dev_appendix["card_id"] = dev_card_id
                 if dev_renderd_id is not None:

gpustack_runtime/detector/mthreads.py

@@ -1,5 +1,6 @@
 from __future__ import annotations as __future_annotations__
 
+import contextlib
 import logging
 from functools import lru_cache
 
@@ -176,19 +177,21 @@ class MThreadsDetector(Detector):
 
                 dev_numa = get_numa_node_by_bdf(dev_bdf)
                 if not dev_numa:
-                    dev_node_affinity = pymtml.mtmlDeviceGetMemoryAffinityWithinNode(
-                        dev,
-                        get_numa_nodeset_size(),
-                    )
-                    dev_numa = bitmask_to_str(
-                        list(dev_node_affinity),
-                    )
+                    with contextlib.suppress(pymtml.MTMLError):
+                        dev_node_affinity = (
+                            pymtml.mtmlDeviceGetMemoryAffinityWithinNode(
+                                dev,
+                                get_numa_nodeset_size(),
+                            )
+                        )
+                        dev_numa = bitmask_to_str(list(dev_node_affinity))
 
                 dev_appendix = {
                     "vgpu": dev_is_vgpu,
                     "bdf": dev_bdf,
-                    "numa": dev_numa,
                 }
+                if dev_numa:
+                    dev_appendix["numa"] = dev_numa
 
                 ret.append(
                     Device(

gpustack_runtime/detector/nvidia.py

@@ -134,12 +134,13 @@ class NVIDIADetector(Detector):
 
                 dev_numa = get_numa_node_by_bdf(dev_bdf)
                 if not dev_numa:
-                    dev_node_affinity = pynvml.nvmlDeviceGetMemoryAffinity(
-                        dev,
-                        get_numa_nodeset_size(),
-                        pynvml.NVML_AFFINITY_SCOPE_NODE,
-                    )
-                    dev_numa = bitmask_to_str(list(dev_node_affinity))
+                    with contextlib.suppress(pynvml.NVMLError):
+                        dev_node_affinity = pynvml.nvmlDeviceGetMemoryAffinity(
+                            dev,
+                            get_numa_nodeset_size(),
+                            pynvml.NVML_AFFINITY_SCOPE_NODE,
+                        )
+                        dev_numa = bitmask_to_str(list(dev_node_affinity))
 
                 dev_temp = None
                 with contextlib.suppress(pynvml.NVMLError):
@@ -224,8 +225,9 @@ class NVIDIADetector(Detector):
                         "arch_family": _get_arch_family(dev_cc_t),
                         "vgpu": dev_is_vgpu,
                         "bdf": dev_bdf,
-                        "numa": dev_numa,
                     }
+                    if dev_numa:
+                        dev_appendix["numa"] = dev_numa
 
                     if dev_fabric_info := _get_fabric_info(dev):
                         dev_appendix.update(dev_fabric_info)
@@ -297,8 +299,9 @@ class NVIDIADetector(Detector):
                         "arch_family": _get_arch_family(dev_cc_t),
                         "vgpu": True,
                         "bdf": dev_bdf,
-                        "numa": dev_numa,
                     }
+                    if dev_numa:
+                        mdev_appendix["numa"] = dev_numa
 
                     mdev_gi_id = pynvml.nvmlDeviceGetGpuInstanceId(mdev)
                     mdev_appendix["gpu_instance_id"] = mdev_gi_id

gpustack_runtime/detector/pyacl/__init__.py

@@ -403,20 +403,21 @@ def _LoadAclLibrary():
                 locs = [
                     "libascendcl.so",
                 ]
-                ascend_path = Path(
-                    os.getenv(
-                        "ASCEND_HOME_PATH",
-                        "/usr/local/Ascend/ascend-toolkit/latest",
-                    ),
-                )
-                if ascend_path.exists():
-                    locs.extend(
-                        [
-                            str(ascend_path / "runtime/lib64/libascendcl.so"),
-                            str(ascend_path / "aarch64-linux/lib64/libascendcl.so"),
-                            str(ascend_path / "x86_64-linux/lib64/libascendcl.so"),
-                        ]
+                for default_path in [
+                    "/usr/local/Ascend/ascend-toolkit/latest",
+                    "/usr/local/Ascend/cann",
+                ]:
+                    ascend_path = Path(
+                        os.getenv("ASCEND_HOME_PATH", default_path),
                     )
+                    if ascend_path.exists():
+                        locs.extend(
+                            [
+                                str(ascend_path / "runtime/lib64/libascendcl.so"),
+                                str(ascend_path / "aarch64-linux/lib64/libascendcl.so"),
+                                str(ascend_path / "x86_64-linux/lib64/libascendcl.so"),
+                            ]
+                        )
                 for loc in locs:
                     try:
                         aclLib = CDLL(loc)
@@ -439,7 +440,8 @@ def aclrtGetSocName():
         fn = _aclGetFunctionPointer("aclrtGetSocName")
         fn.restype = c_char_p
         c_version = fn()
-        return c_version.decode()
+        if c_version is not None:
+            return c_version.decode()
 
     return None
 
@@ -456,3 +458,21 @@ def aclsysGetCANNVersion(package_name=ACL_PKG_NAME_CANN):
         return f"{c_version.version}".lower()
 
     return None
+
+
+def aclsysGetVersion():
+    cann_version = aclsysGetCANNVersion()
+    if cann_version is not None:
+        return cann_version
+
+    with contextlib.suppress(ACLError):
+        _LoadAclLibrary()
+
+        c_version = create_string_buffer(ACL_PKG_VERSION_MAX_SIZE)
+        package_name = b"runtime"
+        fn = _aclGetFunctionPointer("aclsysGetVersionStr")
+        ret = fn(package_name, c_version)
+        _aclCheckReturn(ret)
+        return c_version.value.decode().lower()
+
+    return None

gpustack_runtime/detector/pydcmi/__init__.py

@@ -135,8 +135,10 @@ DCMI_TOPO_TYPE_PHB = 2
 DCMI_TOPO_TYPE_HCCS = 3
 DCMI_TOPO_TYPE_PXB = 4
 DCMI_TOPO_TYPE_PIX = 5
-DCMI_TOPO_TYPE_BUTT = 6  # Unknown
-DCMI_TOPO_TYOE_MAX = 7
+DCMI_TOPO_TYPE_SIO = 6
+DCMI_TOPO_TYPE_HCCS_SW = 7
+DCMI_TOPO_TYPE_BUTT = 8  # Unknown
+DCMI_TOPO_TYOE_MAX = 9
 
 
 ## Error Codes ##

gpustack_runtime/detector/thead.py

@@ -50,7 +50,7 @@ class THeadDetector(Detector):
 
         """
         supported = False
-        if envs.GPUSTACK_RUNTIME_DETECT.lower() not in ("auto", "iluvatar"):
+        if envs.GPUSTACK_RUNTIME_DETECT.lower() not in ("auto", "thead"):
             logger.debug("T-Head detection is disabled by environment variable")
             return supported
 
@@ -132,12 +132,13 @@ class THeadDetector(Detector):
 
                 dev_numa = get_numa_node_by_bdf(dev_bdf)
                 if not dev_numa:
-                    dev_node_affinity = pyhgml.hgmlDeviceGetMemoryAffinity(
-                        dev,
-                        get_numa_nodeset_size(),
-                        pyhgml.HGML_AFFINITY_SCOPE_NODE,
-                    )
-                    dev_numa = bitmask_to_str(list(dev_node_affinity))
+                    with contextlib.suppress(pyhgml.HGMLError):
+                        dev_node_affinity = pyhgml.hgmlDeviceGetMemoryAffinity(
+                            dev,
+                            get_numa_nodeset_size(),
+                            pyhgml.HGML_AFFINITY_SCOPE_NODE,
+                        )
+                        dev_numa = bitmask_to_str(list(dev_node_affinity))
 
                 dev_temp = None
                 with contextlib.suppress(pyhgml.HGMLError):
@@ -213,8 +214,9 @@ class THeadDetector(Detector):
                     dev_appendix = {
                         "vgpu": dev_is_vgpu,
                         "bdf": dev_bdf,
-                        "numa": dev_numa,
                     }
+                    if dev_numa:
+                        dev_appendix["numa"] = dev_numa
 
                     ret.append(
                         Device(
@@ -279,8 +281,9 @@ class THeadDetector(Detector):
                     mdev_appendix = {
                         "vgpu": True,
                         "bdf": dev_bdf,
-                        "numa": dev_numa,
                     }
+                    if dev_numa:
+                        mdev_appendix["numa"] = dev_numa
 
                     mdev_gi_id = pyhgml.hgmlDeviceGetGpuInstanceId(mdev)
                     mdev_appendix["gpu_instance_id"] = mdev_gi_id

{gpustack_runtime-0.1.42.dist-info → gpustack_runtime-0.1.42.post1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gpustack-runtime
-Version: 0.1.42
+Version: 0.1.42.post1
 Summary: GPUStack Runtime is library for detecting GPU resources and launching GPU workloads.
 Project-URL: Homepage, https://github.com/gpustack/runtime
 Project-URL: Bug Tracker, https://github.com/gpustack/gpustack/issues

{gpustack_runtime-0.1.42.dist-info → gpustack_runtime-0.1.42.post1.dist-info}/RECORD

@@ -1,33 +1,33 @@
 gpustack_runtime/__init__.py,sha256=Xw_PVWneitx-8QmW6sJQeymj6zVbEgEndGhIB_km6TI,186
 gpustack_runtime/__main__.py,sha256=O9yJKcN7vg0Ppgc13qesxHwST2wkH3ccOkTQXPWHnNA,3939
-gpustack_runtime/_version.py,sha256=Vvw3zQNp4FXvAmZn_g3ZyhEUudGslUaT_mMkqwv_Tdg,777
+gpustack_runtime/_version.py,sha256=-eNQZIno4AwtazIKHw4i1RxKHZxM9dKoQseocEVcMq0,792
 gpustack_runtime/_version.pyi,sha256=A42NoSgcqEXVy2OeNm4LXC9CbyonbooYrSUBlPm2lGY,156
 gpustack_runtime/envs.py,sha256=gkr30NnIq3USzSYvbW6ipf8tKdbXx-BrDcY3-4Oc-Hg,38894
 gpustack_runtime/logging.py,sha256=wMPriPpOuVsuClsjMh0qwEPQKyJiJa89ggdDjqkk7i0,6934
 gpustack_runtime/cmds/__init__.py,sha256=-_X2O2lBn6KcdLGUzhL3lEjQC4_cwA36fvWDnFAgtVM,1382
 gpustack_runtime/cmds/__types__.py,sha256=TBnUWUqzTkDtJnsMv363kdw-H8fOf-XQYbOvrmQif-M,815
 gpustack_runtime/cmds/deployer.py,sha256=KvhPhU6ZW-UV6vLykI5adKI1ThgVFFJqWaII3n4OhL8,32846
-gpustack_runtime/cmds/detector.py,sha256=2ORRF53q3goyYRB4T8gu3X8u0VZ4v0xeEndJqtuktyQ,8872
+gpustack_runtime/cmds/detector.py,sha256=dFIo1d8dBh8v7JhisXAx-EqqOSLobcuwsJcO-obUh9c,8905
 gpustack_runtime/cmds/images.py,sha256=7tb-D3G4yqLPkbS9aSuWI1bD3DYK8BLbPbgqac56blI,594
 gpustack_runtime/deployer/__init__.py,sha256=impMrmvkMjuCBthsn3QUz3LuwpmmNAymHJKJ2o6SZoc,16249
 gpustack_runtime/deployer/__patches__.py,sha256=cTBge8BT6IsY5MzETKY3kN28k3igYfNj7pcpgDzfDzw,17849
 gpustack_runtime/deployer/__types__.py,sha256=J2YX8X7EYY_56_L9WL5YMmdsyJ572uOIhMoHCVjPaog,72469
 gpustack_runtime/deployer/__utils__.py,sha256=paQu2M1UeoSfQPsiskmAqJSiln-8qwibTssEoWFMLec,21109
-gpustack_runtime/deployer/docker.py,sha256=e48conm3gfu8dlwcIhvTvM5NhlhdgKlvk6Ix8xGYVeI,81448
+gpustack_runtime/deployer/docker.py,sha256=o8Fyc25kLYBOOqN2rDctmxrkQ67oaA8J3lXSRuDAN08,83107
 gpustack_runtime/deployer/kuberentes.py,sha256=-G7eYuqTDDi3T9u2Jqr6j0Ut-8vkP5u2lxzSyDx0EWM,86776
-gpustack_runtime/deployer/podman.py,sha256=9lo4AvXzD3HUteY17-Fuz9A0ItScPb_D1tweDgm7PVo,79090
-gpustack_runtime/deployer/cdi/__init__.py,sha256=2wHrxkud3GJokE3ytNc3jvjddemXkNuuz_oIKzxD3-I,4000
-gpustack_runtime/deployer/cdi/__types__.py,sha256=04DKvcogk7OoHS7TU2Bmht3VVMu7iOEBWTEOvxpHt4w,18399
+gpustack_runtime/deployer/podman.py,sha256=Tvv6RbQ8aWY6Axz9iLvNwSiYxaxtd6q6g1TVl0e1VzY,80749
+gpustack_runtime/deployer/cdi/__init__.py,sha256=V8ycQ9PrUiaozZcoxYOiEEQkGOSvYCaCV8kkVlbEQ_w,3991
+gpustack_runtime/deployer/cdi/__types__.py,sha256=K5uDOmwYsLCz8j8diymN3loqYqPkbxN3F0SVP_iqahI,18387
 gpustack_runtime/deployer/cdi/__utils__.py,sha256=CAYUv76akZiHJYZO_VY0NXKhEI2jrP7G3OgvQa8Pg4U,4050
-gpustack_runtime/deployer/cdi/amd.py,sha256=-eq_SOlC56VX2QscZXvnoeffWSRindhr8zFZmaIcKrE,4082
-gpustack_runtime/deployer/cdi/ascend.py,sha256=lDs75a9--c0lM34xfJqu-_QbfWNFrf4zE-GXPKReBe4,4538
-gpustack_runtime/deployer/cdi/hygon.py,sha256=h6-vQfv03sgxYjMJAf_JOMq9cHFPaNjK1YbUYIiSXck,4117
-gpustack_runtime/deployer/cdi/iluvatar.py,sha256=6nNECZpU5IPP6-5l-O1rzU-ib-WcuwKvDg7ZV__1NE4,3650
-gpustack_runtime/deployer/cdi/metax.py,sha256=tmJBvr-n9pERAp-dXsa54qv6xmxt0rJoJwY36TFdoWk,4143
-gpustack_runtime/deployer/cdi/thead.py,sha256=SvIDKNYZx7FwMPTTxyJ2RRjlr9LXLN8BUYCUhidmiQk,3671
-gpustack_runtime/deployer/k8s/deviceplugin/__init__.py,sha256=kvjsDx_8kNt3h8a5MOx5A7qPvqRsk1amvFr_ZYDA1l0,10931
+gpustack_runtime/deployer/cdi/amd.py,sha256=6VgVlj-nA_124l1M8HHeXU3I6QU4BMhidLEuTrQ96o8,4029
+gpustack_runtime/deployer/cdi/ascend.py,sha256=wyL9KOCIxTqs9NjMTLJ8db8btYqtGC4WD1qUy_T_BEE,4481
+gpustack_runtime/deployer/cdi/hygon.py,sha256=E-jE3N_OMKWAWJxOIyqXCt-utGzVATytbCKPqCYtLiA,4064
+gpustack_runtime/deployer/cdi/iluvatar.py,sha256=-LZ7LiKs0AjCaOX_9FNFIYi2lUO_xVhxR7C4e5XYvow,3597
+gpustack_runtime/deployer/cdi/metax.py,sha256=tawLt1cWtsHLM5LXXtQEVBBWEyqBrnRvkPe54Usf1I0,4090
+gpustack_runtime/deployer/cdi/thead.py,sha256=bEIpMVwhwcL_AX6CRwyrsLnpKJT46v-gjocR8gKukh8,3618
+gpustack_runtime/deployer/k8s/deviceplugin/__init__.py,sha256=cZ8jbeaGZPmyNCzDlQauIRndvKuodDl3-oHEcn4IfWU,11156
 gpustack_runtime/deployer/k8s/deviceplugin/__types__.py,sha256=LCkgPDZ64Mra7bo5jmtsAO2Ypbc4qK99lMl6R_nQhnY,3043
-gpustack_runtime/deployer/k8s/deviceplugin/plugin.py,sha256=20eUDvM_SBFCi5WDR3AfyDJpnL7CJxxcPdW4p626I_M,17671
+gpustack_runtime/deployer/k8s/deviceplugin/plugin.py,sha256=E4gNvsi2aPAeVM5vWlXpvO4ecmQu951pPzzxPaIaAv8,17829
 gpustack_runtime/deployer/k8s/types/kubelet/deviceplugin/v1beta1/__init__.py,sha256=3rOYmgDIIJ4idEtwgnumGStH7PaK-J7EYrOnLa9A-8o,118
 gpustack_runtime/deployer/k8s/types/kubelet/deviceplugin/v1beta1/api.proto,sha256=rmB8RDe4LN5FCVkQ608uS-pl32mk5tt6iGe-g2lKtPs,7919
 gpustack_runtime/deployer/k8s/types/kubelet/deviceplugin/v1beta1/api_pb2.py,sha256=dNkzjTE-2y25q8NF0QRznNJ5r1-5ZxxJS598MHbjx98,45998
@@ -36,21 +36,21 @@ gpustack_runtime/deployer/k8s/types/kubelet/deviceplugin/v1beta1/api_pb2_grpc.py
 gpustack_runtime/deployer/k8s/types/kubelet/deviceplugin/v1beta1/constants.py,sha256=tpNk3e_cvY67C9RwVsdTNl75YuNXBgsn53fSJIzeTR4,828
 gpustack_runtime/detector/__init__.py,sha256=2GaczS5lWLuPsighvq7oPhlPFQSUJfBKLAliXPfl4i0,8162
 gpustack_runtime/detector/__types__.py,sha256=ZiKuYZb0jeXqzyTCUWTDppoHnRmkaZuljAWbnR_ohX8,13626
-gpustack_runtime/detector/__utils__.py,sha256=QdLWXwsU1_EMxXG5Y29psqnttWJyXWMphHDjiC_6Byc,25153
-gpustack_runtime/detector/amd.py,sha256=ywJMDKFnmF2REdJc1F8_zGYK6O4K0o5xh5eqWU-X2EE,18294
-gpustack_runtime/detector/ascend.py,sha256=a6QRnJfXdyU2tyGiiUKy0fgsp6NF652Zr2fFQgVg1Xw,19470
+gpustack_runtime/detector/__utils__.py,sha256=9ZkfDn1HHKao03xJHRD9TJ4JTkPhnLq7cFjbUk0UxMk,25194
+gpustack_runtime/detector/amd.py,sha256=1zeF0PeXzmDQJA6JYvT1hQcjMN1cs36w8haHpzpp4NM,18413
+gpustack_runtime/detector/ascend.py,sha256=4J7WvUX2cCPpGu0p9rRKEhV71zIMM7M3PPw2dgUauvE,19984
 gpustack_runtime/detector/cambricon.py,sha256=5AXILG9NAMYiWjaLRZ5h8lXtFk7FLC7LB_aFQz0ZtYU,4102
-gpustack_runtime/detector/hygon.py,sha256=3AcHBlPXTFiH0JQ0VS_xZcqjX-FXy-cdle6Nc-rNj5w,12795
-gpustack_runtime/detector/iluvatar.py,sha256=klFl5H607w8ksTvYSt21QkHMRzzeg-TkJKfoh9CMzqc,10551
-gpustack_runtime/detector/metax.py,sha256=P24WiqK2Ngjpu6AQt0Fp1wEVNra2Xgs-C8JAAwpYews,10801
-gpustack_runtime/detector/mthreads.py,sha256=mwNdsc42nebnSJMPFo6ue1tbiOwHmvPw6dF2CrLwdIQ,12714
-gpustack_runtime/detector/nvidia.py,sha256=oD3HUPfYWXRIRZ87iidNTW2Tg8CTVNIJh8qW1Z3HBO4,34535
-gpustack_runtime/detector/thead.py,sha256=hIRtlZNPa7xzAT0W_2XgFiDVH3YHSGi8NqCdaFaqQcA,26818
-gpustack_runtime/detector/pyacl/__init__.py,sha256=UQjaBxP7nJNyzr08N8_lH-5wPtnFmUY9pyQhs6vIChU,16232
+gpustack_runtime/detector/hygon.py,sha256=ck7EaSUj1-gTYx1ZgdwbtHsneoCakDhZbQhFYFWd2ik,12967
+gpustack_runtime/detector/iluvatar.py,sha256=YK-O53B_H16BLalbTwVqJWVi9WTCdCRM_GX7d7FmBO0,10682
+gpustack_runtime/detector/metax.py,sha256=JZ9Z9vZ_iFrFOtoM626G0iPviqaTDJzBkh353RJfTMM,10930
+gpustack_runtime/detector/mthreads.py,sha256=LL7iYbV5ov2edLmkZ5NvPt6rzHh7f3H6RWvjJgOXKZc,12880
+gpustack_runtime/detector/nvidia.py,sha256=Xhp13TmhUneBpRFDFnWY9OHva4xlfGAEOGSLlpc56VE,34718
+gpustack_runtime/detector/thead.py,sha256=NEifNMTnj37CB1bHviyE8F9ZGYKpfQtm7TsxnzlkLnU,26998
+gpustack_runtime/detector/pyacl/__init__.py,sha256=sJc6K1NObJKUPQrAYQtcVhEMsN2kskIyNH1CncooTNw,16873
 gpustack_runtime/detector/pyamdgpu/__init__.py,sha256=x-UO07EpKEgfTLmXQOD6j9f6kibuvDC7riQFof3YGdw,8617
 gpustack_runtime/detector/pyamdsmi/__init__.py,sha256=800-khq2w6HLgXM12RkhcdvXBGeAJ4s1_TWJyHebCMk,955
 gpustack_runtime/detector/pycuda/__init__.py,sha256=p-Na5eBjdsFGXPHCEEUfFj5TQFjPxPQGV0i4oU6ywBA,16922
-gpustack_runtime/detector/pydcmi/__init__.py,sha256=zCeImelWgbPDn51dJgp3LlCK-uGOuHmmPGiOsyYB3cI,37264
+gpustack_runtime/detector/pydcmi/__init__.py,sha256=63FoyTLAdJRUBUJ86CVONpO0Q15kvEhaEH_kN4qqrdo,37314
 gpustack_runtime/detector/pyhgml/__init__.py,sha256=Yp9s-QhHS4ck7Iq9kd4v6a4BruyJQcuOTYlyYSmnOgI,182896
 gpustack_runtime/detector/pyhgml/libhgml.so,sha256=BPzGVBpzrMX1tSvbXddq8Q0Qhi8w-No2JXX8sRxTioI,2101640
 gpustack_runtime/detector/pyhgml/libuki.so,sha256=EE6v1vIYYT4FSDMMm9rSfAqwrwIPFD-4_6KtP51lSps,702352
@@ -59,9 +59,9 @@ gpustack_runtime/detector/pyixml/__init__.py,sha256=2YmNoYhcIvc4CbRZgORM9o-GKdQ6
 gpustack_runtime/detector/pymxsml/__init__.py,sha256=YxfNHq7TWd7CpNroP45BGXhcWNpY_sXgVzNGtx68DII,45409
 gpustack_runtime/detector/pyrocmcore/__init__.py,sha256=rgwIdPS-7GG7_5luRMR1XG9QyNM3lJh5ryD7kfZqpWg,2523
 gpustack_runtime/detector/pyrocmsmi/__init__.py,sha256=Gk4pTadOMzLCZJvQJ2S1N_1ivogtYokfVPHj_9Y874Y,12286
-gpustack_runtime/_version_appendix.py,sha256=2B6zFAHFYbVzMJ1w6ZW4XpqNz2XaMa-cAueeeQ4OfJk,23
-gpustack_runtime-0.1.42.dist-info/METADATA,sha256=sUS5YnNvheiK-tDT-rGSzuOKrOIFIKKhUBH1Jxc7lPE,2358
-gpustack_runtime-0.1.42.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-gpustack_runtime-0.1.42.dist-info/entry_points.txt,sha256=bBO_61GxP6dIT74uZwbSDgW5Vt2pTePUS3CgjUJkUgg,68
-gpustack_runtime-0.1.42.dist-info/licenses/LICENSE,sha256=OiPibowBvB-NHV3TP_NOj18XNBlXcshXZFMpa3uvKVE,10362
-gpustack_runtime-0.1.42.dist-info/RECORD,,
+gpustack_runtime/_version_appendix.py,sha256=-PDS1ZkWXq1N9cDAPU9eY8t4sJ5GHs8YQgMCBrRBrX0,23
+gpustack_runtime-0.1.42.post1.dist-info/METADATA,sha256=2OqVrE1DJE5z3w_isNfXgoFioudBbs_EtlmV6LrHlBQ,2364
+gpustack_runtime-0.1.42.post1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+gpustack_runtime-0.1.42.post1.dist-info/entry_points.txt,sha256=bBO_61GxP6dIT74uZwbSDgW5Vt2pTePUS3CgjUJkUgg,68
+gpustack_runtime-0.1.42.post1.dist-info/licenses/LICENSE,sha256=OiPibowBvB-NHV3TP_NOj18XNBlXcshXZFMpa3uvKVE,10362
+gpustack_runtime-0.1.42.post1.dist-info/RECORD,,