[srinivamd]

TheRock#6852 (merged 2026-08-31) removed rocm_smi_lib from ROCm 10.1+. This breaks MORI's GPU topology build (rocm_smi/rocm_smi.h not found).

Keep both code paths, version-guarded via ROCM_VERSION from rocm_version.h:

• MORI_USE_AMDSMI=1 (ROCm >= 10.1): amd_smi API, socket/processor handles
• MORI_USE_AMDSMI=0 (ROCm <= 10.0): rocm_smi API, flat device indices

Key API migration:

• rsmi_init(0) → amdsmi_init(AMDSMI_INIT_AMD_GPUS)
• rsmi_num_monitor_devices → amdsmi_get_socket/processor_handles
• rsmi_dev_pci_id_get → amdsmi_get_gpu_device_bdf (BDF struct)
• rsmi_is_P2P_accessible → amdsmi_topo_get_p2p_status (4 args)
• RSMI_IO_LINK_TYPE → amdsmi_link_type_t
• rsmi_status_string → amdsmi_status_code_to_string

Uses __has_include for rocm_version.h path portability.

Fixes #638

Motivation

MORI build fails on ROCm 10.1+ with fatal error: 'rocm_smi/rocm_smi.h' file not found.

ROCm/TheRock#6852 (merged 2026-08-31) disabled
rocm_smi_lib from ROCm 10.1+ builds. MORI's GPU topology code (gpu.cpp, gpu.hpp, check.hpp)
includes rocm_smi/rocm_smi.h and uses the rsmi_* API, which no longer ships with ROCm 10.1+.

Fixes #638

Technical Details

Version-guarded dual code using ROCM_VERSION_MAJOR/ROCM_VERSION_MINOR from rocm_version.h. Both old
and new code paths live side-by-side:

• MORI_USE_AMDSMI=1 (ROCm >= 10.1): amdsmi_* API with socket/processor handle model
• MORI_USE_AMDSMI=0 (ROCm <= 10.0): rsmi_* API with flat device indices (unchanged)

Key API migration:

rocm_smi	amd_smi	Notes
rsmi_init(0)	amdsmi_init(AMDSMI_INIT_AMD_GPUS)
rsmi_num_monitor_devices(&n)	amdsmi_get_socket_handles + amdsmi_get_processor_handles
Socket/processor handle model
rsmi_dev_pci_id_get(i, &id)	amdsmi_get_gpu_device_bdf(handle, &bdf)	BDF struct instead of
packed uint64
rsmi_is_P2P_accessible(i, j, &ok)	amdsmi_topo_get_p2p_status(h_i, h_j, &type, &cap)	4 args;
returns link type + capability struct
RSMI_IO_LINK_TYPE	amdsmi_link_type_t	Enum type change
rsmi_status_string	amdsmi_status_code_to_string

Uses __has_include for rocm_version.h path portability (<rocm-core/rocm_version.h> on ROCm 7.2+,
<rocm_version.h> fallback for older).

Files changed:

• include/mori/application/topology/gpu.hpp — version guard, include switch, amdsmi_link_type_t type
  field
• include/mori/application/utils/check.hpp — version guard, dual ROCM_SMI_CHECK macro
• src/application/topology/gpu.cpp — dual Load() implementations with OpenAmdSmi/OpenRocmSmi

Test Plan

• Build MORI from source on ROCm 10.1.0 nightly (TheRock build) — verifies MORI_USE_AMDSMI=1 path
• Build MORI from source on ROCm 10.0.0 GA — verifies MORI_USE_AMDSMI=0 path (no regression)
• Both tested as part of vllmsrc docker build (MORI is a build dependency of vLLM)

Test Result

• ROCm 10.1.0 nightly (MORI_USE_AMDSMI=1): MORI build + import mori smoke test pass — CI run
  #34608518940
• ROCm 10.0.0 GA (MORI_USE_AMDSMI=0): MORI build passes (downstream torchaudio ABI issue unrelated
  to this change)

Submission Checklist

• Look over the contributing guidelines at https://github.com/ROCm/TheRock/blob/main/GOVERNANCE.md#pull-requests.

[QizhouZhang97]

Thanks for resolving this issue. Please address the following issue before merging it

[QizhouZhang97]

retain this comment

[srinivamd]

@QizhouZhang97 — All three review comments from your Sep 16 review have been addressed in the latest commits:

1. Loop all sockets (not just sockets[0]) — Fixed in 1a55e2d. amd_smi models one socket per GPU, so the code now iterates all sockets to collect processor handles from each.
2. Guard socketCount == 0 — Fixed in 1a55e2d. Added early-exit with error message before accessing the sockets array.
3. Restore "Bootstrap-only helper" comment on SYSCALL_RETURN_ZERO — Fixed in 1a55e2d.

CI status on latest commit (3017c3c):

Check	Result
pre-commit (clang-format)	passed
mori build (MI355X_AINIC)	passed
mori build (MI300X_MLX)	passed
mori intranode test (MI355X_AINIC)	passed
mori intranode test (MI300X_MLX)	passed
mori intranode test (ROCm 10, MI355X_AINIC)	passed
mori JAX intranode test (MI355X_AINIC)	passed
mori umbp unit test (MI355X_AINIC)	passed
mori internode test (MI300X_MLX)	passed
mori internode test (MI355X_AINIC)	failed — HIP error no ROCm-capable device (runner infra, not code)
CCO unit test (MI355X_AINIC)	failed — same MI355X_AINIC runner infra issue

The two failures are both on the MI355X_AINIC internode runner reporting "no ROCm-capable device is detected" — a GPU device-passthrough issue on that CI node, not related to this PR's code changes. All builds and all other test configurations passed.

Ready for re-review and approval when you get a chance. Thanks!

[QizhouZhang97]

Hi, @srinivamd, could you rebase the latest main to retrigger CI? because I have made some changes to MI355x runner, I will merge it once CI pass

[srinivamd]

@QizhouZhang97 — Friendly follow-up (10 days since fixes pushed). All three review items from your Sep 16
review are addressed:

1. Loop all sockets (not just sockets[0]) — done in 1a55e2d
2. Guard socketCount == 0 — done in 1a55e2d
3. Restore "Bootstrap-only helper" comment — done in 1a55e2d

Pre-commit passes. The two CI failures (MI355X_AINIC internode + CCO) are "HIP error no ROCm-capable device" —
runner infra, not code. All other 9 MoRI CI jobs pass including ROCm 10 build.

This unblocks MORI on ROCm 10.1+ (TheRock#6852 removed rocm_smi_lib). Could you re-review when you get a
chance? Thanks!