Skip to content

Commit ea9fa9c

Browse files
committed
refactor: adjust memory calculation
Signed-off-by: thxCode <thxcode0824@gmail.com>
1 parent fbd8aa4 commit ea9fa9c

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

gpustack_runtime/detector/cambricon.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ def detect(self) -> Devices | None:
9696
dev_cores_util = safe_float(dev_util_info.get("MLUAverage", 0))
9797

9898
dev_mem_usage_info = dev_info.get("PhysicalMemUsage", {})
99-
dev_mem = safe_int(dev_mem_usage_info.get("Total", 0)) * 1024 * 1024
100-
dev_mem_used = safe_int(dev_mem_usage_info.get("Used", 0)) * 1024 * 1024
99+
dev_mem = safe_int(dev_mem_usage_info.get("Total", 0)) << 20
100+
dev_mem_used = safe_int(dev_mem_usage_info.get("Used", 0)) << 20
101101

102102
dev_temp_info = dev_info.get("Temperature", {})
103103
dev_temp = safe_float(dev_temp_info.get("Chip", 0))

gpustack_runtime/detector/iluvatar.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ def detect(self) -> Devices | None:
9999

100100
dev_cores_util = safe_float(row[2].split()[0])
101101

102-
dev_mem = safe_int(row[3].split()[0]) * 1024 * 1024
103-
dev_mem_used = safe_int(row[4].split()[0]) * 1024 * 1024
102+
dev_mem = safe_int(row[3].split()[0]) << 20
103+
dev_mem_used = safe_int(row[4].split()[0]) << 20
104104

105105
dev_temp = safe_float(row[5].split()[0])
106106

gpustack_runtime/detector/metax.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ def detect(self) -> Devices | None:
140140
runtime_version=sys_runtime_ver,
141141
runtime_version_tuple=sys_runtime_ver_t,
142142
cores_utilization=dev_core_util,
143-
memory=dev_mem,
144-
memory_used=dev_mem_used,
143+
memory=dev_mem >> 10,
144+
memory_used=dev_mem_used >> 10,
145145
memory_utilization=(
146146
(dev_mem_used * 100 // dev_mem) if dev_mem > 0 else 0
147147
),

pack/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,9 @@ ENV ILUVATAR_VISIBLE_DEVICES="0"
321321
## See https://developer.metax-tech.com/api/client/document/preview/626/k8s/03_component.html#container-runtime.
322322
## Options:
323323
## - Mount /sys from the host to detect the correct devices' PCI info.
324-
## E.g. docker run --rm -it --privileged gpustack/runtime:main gpustack-runtime detect --format json
324+
## - Mount /opt/maca from the host to support device detecting.
325+
## - Mount /opt/mxdriver/ from the host to support device detecting.
326+
## E.g. docker run --rm -it --privileged -v /opt/mxdriver:/opt/mxdriver -v /opt/maca:/opt/maca gpustack/runtime:main gpustack-runtime detect --format json
325327
ENV METAX_VISIBLE_DEVICES="0" \
326328
LD_LIBRARY_PATH="/opt/maca/lib:/opt/maca/ompi/lib:/opt/maca/ucx/lib:/opt/mxdriver/lib:${LD_LIBRARY_PATH}"
327329

0 commit comments

Comments
 (0)