From 4643a17f83900dd84676fc61ebf03be0d9584d68 Mon Sep 17 00:00:00 2001 From: Wenkai Du <43822138+wenkaidu@users.noreply.github.com> Date: Thu, 28 Oct 2021 07:26:28 -0700 Subject: [PATCH] Check rocm_smi64Config.h on older ROCm build (#452) --- CMakeLists.txt | 5 +++++ src/include/rocm_smi_wrap.h | 2 ++ src/misc/rocm_smi_wrap.cc | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9718d218b7..98bbb85645 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,6 +213,11 @@ if (BUILD_ALLREDUCE_ONLY) add_definitions(-DBUILD_ALLREDUCE_ONLY) endif() +CHECK_INCLUDE_FILE_CXX("${ROCM_PATH}/rocm_smi/include/rocm_smi/rocm_smi64Config.h" HAVE_ROCM_SMI64CONFIG) +IF(HAVE_ROCM_SMI64CONFIG) + add_definitions(-DUSE_ROCM_SMI64CONFIG) +ENDIF() + foreach(target ${AMDGPU_TARGETS}) target_link_libraries(rccl PRIVATE --amdgpu-target=${target}) endforeach() diff --git a/src/include/rocm_smi_wrap.h b/src/include/rocm_smi_wrap.h index ea33404222..a118d56a26 100644 --- a/src/include/rocm_smi_wrap.h +++ b/src/include/rocm_smi_wrap.h @@ -24,7 +24,9 @@ THE SOFTWARE. #define ROCM_SMI_WRAP_H_ #include "rocm_smi/rocm_smi.h" +#ifdef USE_ROCM_SMI64CONFIG #include "rocm_smi/rocm_smi64Config.h" +#endif #include "nccl.h" ncclResult_t rocm_smi_init(); diff --git a/src/misc/rocm_smi_wrap.cc b/src/misc/rocm_smi_wrap.cc index 9c1936f291..3e38e7d51c 100644 --- a/src/misc/rocm_smi_wrap.cc +++ b/src/misc/rocm_smi_wrap.cc @@ -90,7 +90,7 @@ ncclResult_t rocm_smi_getLinkInfo(int srcDev, int dstDev, RSMI_IO_LINK_TYPE* rsm *count = 1; if (*rsmi_type == RSMI_IOLINK_TYPE_XGMI && rsmi_weight == 15) { *hops = 1; -#if rocm_smi_VERSION_MAJOR >= 5 +#if defined USE_ROCM_SMI64CONFIG && rocm_smi_VERSION_MAJOR >= 5 uint64_t min_bw = 0, max_bw = 0; rsmi_version_t version; ROCMSMICHECK(rsmi_version_get(&version));