From 94d5c8537123c51c4893c1a669d67c0603b7c7d8 Mon Sep 17 00:00:00 2001 From: "Oliveira, Daniel" Date: Wed, 28 Feb 2024 14:31:45 -0600 Subject: [PATCH 1/2] fix: [rocm/amd_smi_lib] Navi3X/Navi2X/MI100 amdsmitst 2 test cases fail when running Checks returned error by get_gpu_pci_bandwith() before assert Code changes related to the following: * Unit tests Change-Id: I950eee5d92607eea08722af7d7c84e8457cd4e60 Signed-off-by: Oliveira, Daniel [ROCm/amdsmi commit: c6208c0db05252460fe2173ce5ad1c288b7a12a1] --- .../tests/amd_smi_test/functional/frequencies_read.cc | 9 ++++++++- .../tests/amd_smi_test/functional/pci_read_write.cc | 10 ++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.cc index aba165cc50..c9a54c5426 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read.cc @@ -183,7 +183,14 @@ void TestFrequenciesRead::Run(void) { // Verify api support checking functionality is working // NOTE: We expect AMDSMI_STATUS_NOT_SUPPORTED, if rsmi_pcie_bandwidth_t* is NULL err = amdsmi_get_gpu_pci_bandwidth(processor_handles_[i], nullptr); - ASSERT_EQ(err, AMDSMI_STATUS_NOT_SUPPORTED); + if (err != amdsmi_status_t::AMDSMI_STATUS_NOT_SUPPORTED) { + ASSERT_EQ(err, AMDSMI_STATUS_INVAL); + } + else { + auto status_string(""); + amdsmi_status_code_to_string(err, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_pci_bandwidth(): " << status_string << "\n"; + } } } } diff --git a/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc index 0f658aec03..5d6d43d0f2 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc @@ -142,7 +142,6 @@ void TestPciReadWrite::Run(void) { } ret = amdsmi_get_gpu_pci_bandwidth(processor_handles_[dv_ind], &bw); - if (ret == AMDSMI_STATUS_NOT_SUPPORTED) { std::cout << "TEST FAILURE: Current PCIe bandwidth is not detected. " "This is likely because it is not indicated in the pp_dpm_pcie sysfs " @@ -165,7 +164,14 @@ void TestPciReadWrite::Run(void) { // Verify api support checking functionality is working // NOTE: We expect AMDSMI_STATUS_NOT_SUPPORTED, if rsmi_pcie_bandwidth_t* is NULL ret = amdsmi_get_gpu_pci_bandwidth(processor_handles_[dv_ind], nullptr); - ASSERT_EQ(ret, AMDSMI_STATUS_NOT_SUPPORTED); + if (ret != amdsmi_status_t::AMDSMI_STATUS_NOT_SUPPORTED) { + ASSERT_EQ(ret, AMDSMI_STATUS_INVAL); + } + else { + auto status_string(""); + amdsmi_status_code_to_string(ret, &status_string); + std::cout << "\t\t** amdsmi_get_gpu_pci_bandwidth(): " << status_string << "\n"; + } // First set the bitmask to all supported bandwidths freq_bitmask = ~(~0u << bw.transfer_rate.num_supported); From 3c0b4b46c0d2b8350f97d4b1484ab60d1713a607 Mon Sep 17 00:00:00 2001 From: Maisam Arif Date: Tue, 27 Feb 2024 17:49:02 -0600 Subject: [PATCH 2/2] Added __version__ attr to Python Library Signed-off-by: Maisam Arif Change-Id: Ibbd90eaa60cc8b9dd0387d7fac8aef06a3a43375 [ROCm/amdsmi commit: 55cfcf11d66755521b3ac617b3832f78c5a45be2] --- projects/amdsmi/py-interface/CMakeLists.txt | 3 +++ projects/amdsmi/py-interface/__init__.py | 3 +++ projects/amdsmi/py-interface/_version.py.in | 1 + 3 files changed, 7 insertions(+) create mode 100644 projects/amdsmi/py-interface/_version.py.in diff --git a/projects/amdsmi/py-interface/CMakeLists.txt b/projects/amdsmi/py-interface/CMakeLists.txt index d55e9b6fca..f584ef7c1a 100644 --- a/projects/amdsmi/py-interface/CMakeLists.txt +++ b/projects/amdsmi/py-interface/CMakeLists.txt @@ -69,6 +69,7 @@ endif() # populate version string configure_file(pyproject.toml.in ${PY_BUILD_DIR}/pyproject.toml @ONLY) configure_file(setup.cfg.in ${PY_BUILD_DIR}/setup.cfg @ONLY) +configure_file(_version.py.in ${PY_PACKAGE_DIR}/_version.py @ONLY) add_custom_target( python_wrapper @@ -102,6 +103,7 @@ add_custom_target( python_package ALL DEPENDS ${PY_BUILD_DIR}/pyproject.toml ${PY_BUILD_DIR}/setup.cfg + ${PY_PACKAGE_DIR}/_version.py ${PY_PACKAGE_DIR}/__init__.py ${PY_PACKAGE_DIR}/amdsmi_exception.py ${PY_PACKAGE_DIR}/amdsmi_interface.py @@ -114,6 +116,7 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${PY_BUILD_DIR}/pyproject.toml ${CMAKE_CURRENT_BINARY_DIR}/${PY_BUILD_DIR}/setup.cfg + ${CMAKE_CURRENT_BINARY_DIR}/${PY_PACKAGE_DIR}/_version.py DESTINATION ${PY_WRAPPER_INSTALL_DIR} COMPONENT dev) diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index da749f43f2..56304494fa 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -19,6 +19,9 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # +# Library Version is the tool/amdsmi_interface version +from ._version import __version__ + # Library Initialization from .amdsmi_interface import amdsmi_init from .amdsmi_interface import amdsmi_shut_down diff --git a/projects/amdsmi/py-interface/_version.py.in b/projects/amdsmi/py-interface/_version.py.in new file mode 100644 index 0000000000..9ad803c8e4 --- /dev/null +++ b/projects/amdsmi/py-interface/_version.py.in @@ -0,0 +1 @@ +__version__ = "@amd_smi_libraries_VERSION_STRING@" \ No newline at end of file