From ff295e46481c0c0faccc043ae9403591dbc37629 Mon Sep 17 00:00:00 2001 From: "Galantsev, Dmitrii" Date: Thu, 2 Nov 2023 18:26:00 -0500 Subject: [PATCH 1/2] CMake - Bump version Change-Id: Ibe62c0059262bcb9937ae856b796392b1fe362a0 Signed-off-by: Galantsev, Dmitrii [ROCm/amdsmi commit: 7d629c5959429e967977209c640118bcd8c132dc] --- projects/amdsmi/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/amdsmi/CMakeLists.txt b/projects/amdsmi/CMakeLists.txt index 3ff760b83c..07562c4a8a 100755 --- a/projects/amdsmi/CMakeLists.txt +++ b/projects/amdsmi/CMakeLists.txt @@ -35,7 +35,7 @@ find_program (GIT NAMES git) ## Setup the package version based on git tags. set(PKG_VERSION_GIT_TAG_PREFIX "rsmi_pkg_ver") -get_package_version_number("6.0.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT) +get_package_version_number("6.1.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT) message("Package version: ${PKG_VERSION_STR}") set(${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR "${VERSION_MAJOR}") set(${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR "${VERSION_MINOR}") From f66e4585c7fe18d3840175064b03235214290fe6 Mon Sep 17 00:00:00 2001 From: "Galantsev, Dmitrii" Date: Fri, 3 Nov 2023 17:47:54 -0500 Subject: [PATCH 2/2] Fix issues introduced in 41f5a26408cb8f32dcc1da9bc1e6e9ec17d58ad7 - std=c++.. is not required because CMAKE_CXX_STANDARD is set - nullptr check breaks the test because we rely on nullptr as an api for checking feature availability. - enum number setting is unnecessary Change-Id: I393e6dd3f292b7fa4198302f140c0443ba5e50f5 Signed-off-by: Galantsev, Dmitrii [ROCm/amdsmi commit: a099f0682a023803b4a44499171e4c26cc8ec9aa] --- projects/amdsmi/CMakeLists.txt | 2 +- projects/amdsmi/include/rocm_smi/rocm_smi.h | 24 ++++++++++----------- projects/amdsmi/src/rocm_smi.cc | 3 --- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/projects/amdsmi/CMakeLists.txt b/projects/amdsmi/CMakeLists.txt index 07562c4a8a..d56e4d177b 100755 --- a/projects/amdsmi/CMakeLists.txt +++ b/projects/amdsmi/CMakeLists.txt @@ -72,7 +72,7 @@ endif() ## Compiler flags set(CMAKE_CXX_FLAGS - "${CMAKE_CXX_FLAGS} -Wall -Wextra -fno-rtti -std=c++17") + "${CMAKE_CXX_FLAGS} -Wall -Wextra -fno-rtti") if (${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -msse -msse2") diff --git a/projects/amdsmi/include/rocm_smi/rocm_smi.h b/projects/amdsmi/include/rocm_smi/rocm_smi.h index ea945c91a0..3dc2fbf5b3 100755 --- a/projects/amdsmi/include/rocm_smi/rocm_smi.h +++ b/projects/amdsmi/include/rocm_smi/rocm_smi.h @@ -363,16 +363,16 @@ typedef rsmi_clk_type_t rsmi_clk_type; */ typedef enum { RSMI_COMPUTE_PARTITION_INVALID = 0, - RSMI_COMPUTE_PARTITION_CPX = 1, //!< Core mode (CPX)- Per-chip XCC with - //!< shared memory - RSMI_COMPUTE_PARTITION_SPX = 2, //!< Single GPU mode (SPX)- All XCCs work - //!< together with shared memory - RSMI_COMPUTE_PARTITION_DPX = 3, //!< Dual GPU mode (DPX)- Half XCCs work - //!< together with shared memory - RSMI_COMPUTE_PARTITION_TPX = 4, //!< Triple GPU mode (TPX)- One-third XCCs - //!< work together with shared memory - RSMI_COMPUTE_PARTITION_QPX = 5, //!< Quad GPU mode (QPX)- Quarter XCCs - //!< work together with shared memory + RSMI_COMPUTE_PARTITION_CPX, //!< Core mode (CPX)- Per-chip XCC with + //!< shared memory + RSMI_COMPUTE_PARTITION_SPX, //!< Single GPU mode (SPX)- All XCCs work + //!< together with shared memory + RSMI_COMPUTE_PARTITION_DPX, //!< Dual GPU mode (DPX)- Half XCCs work + //!< together with shared memory + RSMI_COMPUTE_PARTITION_TPX, //!< Triple GPU mode (TPX)- One-third XCCs + //!< work together with shared memory + RSMI_COMPUTE_PARTITION_QPX, //!< Quad GPU mode (QPX)- Quarter XCCs + //!< work together with shared memory } rsmi_compute_partition_type_t; /// \cond Ignore in docs. typedef rsmi_compute_partition_type_t rsmi_compute_partition_type; @@ -680,8 +680,8 @@ typedef enum { */ typedef enum _RSMI_IO_LINK_TYPE { RSMI_IOLINK_TYPE_UNDEFINED = 0, //!< unknown type. - RSMI_IOLINK_TYPE_PCIEXPRESS = 1, //!< PCI Express - RSMI_IOLINK_TYPE_XGMI = 2, //!< XGMI + RSMI_IOLINK_TYPE_PCIEXPRESS, //!< PCI Express + RSMI_IOLINK_TYPE_XGMI, //!< XGMI RSMI_IOLINK_TYPE_NUMIOLINKTYPES, //!< Number of IO Link types RSMI_IOLINK_TYPE_SIZE = 0xFFFFFFFF //!< Max of IO Link types } RSMI_IO_LINK_TYPE; diff --git a/projects/amdsmi/src/rocm_smi.cc b/projects/amdsmi/src/rocm_smi.cc index 8749b13213..566b087da3 100755 --- a/projects/amdsmi/src/rocm_smi.cc +++ b/projects/amdsmi/src/rocm_smi.cc @@ -2776,9 +2776,6 @@ rsmi_dev_od_volt_info_get(uint32_t dv_ind, rsmi_od_volt_freq_data_t *odv) { ss << __PRETTY_FUNCTION__ << "| ======= start ======="; LOG_TRACE(ss); DEVICE_MUTEX - if (odv == nullptr) { - return RSMI_STATUS_INVALID_ARGS; - } CHK_SUPPORT_NAME_ONLY(odv) rsmi_status_t ret = get_od_clk_volt_info(dv_ind, odv);