From 928b7e2a4d857c9dd67b70508f4c5357bffaa2ac Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Sat, 25 Feb 2023 07:26:18 -0500 Subject: [PATCH] Renamed API amdsmi_get_board_info to amdsmi_get_gpu_board_info grep -rli 'amdsmi_get_board_info' * | xargs -i@ sed -i 's/amdsmi_get_board_info/amdsmi_get_gpu_board_info/g' @ Change-Id: Ia3fb361aaf5832813e7ce41bfb88fbbf1432020b --- README.md | 2 +- example/amd_smi_drm_example.cc | 4 ++-- example/amd_smi_nodrm_example.cc | 4 ++-- include/amd_smi/amdsmi.h | 2 +- py-interface/README.md | 6 +++--- py-interface/__init__.py | 2 +- py-interface/amdsmi_interface.py | 4 ++-- py-interface/amdsmi_wrapper.py | 8 ++++---- src/amd_smi/amd_smi.cc | 8 ++++---- tests/amd_smi_test/functional/id_info_read.cc | 2 +- tests/amd_smi_test/functional/mutual_exclusion.cc | 2 +- tests/amd_smi_test/test_base.cc | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 82614e3851..5f5c014a12 100755 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ int main() { // Get device name amdsmi_board_info_t board_info; - ret = amdsmi_get_board_info(processor_handles[j], &board_info); + ret = amdsmi_get_gpu_board_info(processor_handles[j], &board_info); std::cout << "\tdevice " << j <<"\n\t\tName:" << board_info.product_name << std::endl; diff --git a/example/amd_smi_drm_example.cc b/example/amd_smi_drm_example.cc index 3c30e59d9a..26ec97b7c8 100644 --- a/example/amd_smi_drm_example.cc +++ b/example/amd_smi_drm_example.cc @@ -623,9 +623,9 @@ int main() { // Get device name amdsmi_board_info_t board_info = {}; - ret = amdsmi_get_board_info(processor_handles[j], &board_info); + ret = amdsmi_get_gpu_board_info(processor_handles[j], &board_info); CHK_AMDSMI_RET(ret) - printf(" Output of amdsmi_get_board_info:\n"); + printf(" Output of amdsmi_get_gpu_board_info:\n"); std::cout << "\tdevice [" << j << "]\n\t\tProduct name: " << board_info.product_name << "\n" diff --git a/example/amd_smi_nodrm_example.cc b/example/amd_smi_nodrm_example.cc index 6888ebaee9..146d3ca94e 100644 --- a/example/amd_smi_nodrm_example.cc +++ b/example/amd_smi_nodrm_example.cc @@ -287,9 +287,9 @@ int main() { // Get device name amdsmi_board_info_t board_info = {}; - ret = amdsmi_get_board_info(processor_handles[j], &board_info); + ret = amdsmi_get_gpu_board_info(processor_handles[j], &board_info); CHK_AMDSMI_RET(ret) - printf(" Output of amdsmi_get_board_info:\n"); + printf(" Output of amdsmi_get_gpu_board_info:\n"); std::cout << "\tdevice [" << j << "]\n\t\tProduct name: " << board_info.product_name << "\n" diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index d9b52fea68..1591f44999 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -3645,7 +3645,7 @@ amdsmi_get_gpu_asic_info(amdsmi_processor_handle processor_handle, amdsmi_asic_i * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_board_info(amdsmi_processor_handle processor_handle, amdsmi_board_info_t *info); +amdsmi_get_gpu_board_info(amdsmi_processor_handle processor_handle, amdsmi_board_info_t *info); /** * @brief Returns the power caps as currently configured in the diff --git a/py-interface/README.md b/py-interface/README.md index f239c8c32a..e09790751d 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -909,7 +909,7 @@ except AmdSmiException as e: print(e) ``` -## amdsmi_get_board_info +## amdsmi_get_gpu_board_info Description: Returns board info for the given GPU Input parameters: @@ -924,7 +924,7 @@ Field | Description `product_serial` | Product serial `product_name` | Product name -Exceptions that can be thrown by `amdsmi_get_board_info` function: +Exceptions that can be thrown by `amdsmi_get_gpu_board_info` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -933,7 +933,7 @@ Example: ```python try: device = amdsmi_get_processor_handle_from_bdf("0000:23.00.0") - board_info = amdsmi_get_board_info(device) + board_info = amdsmi_get_gpu_board_info(device) print(board_info["serial_number"]) print(board_info["product_serial"]) print(board_info["product_name"]) diff --git a/py-interface/__init__.py b/py-interface/__init__.py index 4fe89ab44d..e4473f8918 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -66,7 +66,7 @@ from .amdsmi_interface import amdsmi_get_process_info from .amdsmi_interface import amdsmi_get_ecc_error_count # # Board Information -from .amdsmi_interface import amdsmi_get_board_info +from .amdsmi_interface import amdsmi_get_gpu_board_info # # Ras Information from .amdsmi_interface import amdsmi_get_ras_block_features_enabled diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 379701da12..ef561df363 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -800,7 +800,7 @@ def amdsmi_get_ecc_error_count( } -def amdsmi_get_board_info( +def amdsmi_get_gpu_board_info( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -810,7 +810,7 @@ def amdsmi_get_board_info( board_info = amdsmi_wrapper.amdsmi_board_info_t() _check_res( - amdsmi_wrapper.amdsmi_get_board_info( + amdsmi_wrapper.amdsmi_get_gpu_board_info( processor_handle, ctypes.byref(board_info)) ) diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index 5df7aa4eb0..9e586b48cf 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1676,9 +1676,9 @@ amdsmi_get_gpu_driver_version.argtypes = [amdsmi_processor_handle, ctypes.POINTE amdsmi_get_gpu_asic_info = _libraries['libamd_smi.so'].amdsmi_get_gpu_asic_info amdsmi_get_gpu_asic_info.restype = amdsmi_status_t amdsmi_get_gpu_asic_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_asic_info_t)] -amdsmi_get_board_info = _libraries['libamd_smi.so'].amdsmi_get_board_info -amdsmi_get_board_info.restype = amdsmi_status_t -amdsmi_get_board_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_board_info_t)] +amdsmi_get_gpu_board_info = _libraries['libamd_smi.so'].amdsmi_get_gpu_board_info +amdsmi_get_gpu_board_info.restype = amdsmi_status_t +amdsmi_get_gpu_board_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_board_info_t)] amdsmi_get_power_cap_info = _libraries['libamd_smi.so'].amdsmi_get_power_cap_info amdsmi_get_power_cap_info.restype = amdsmi_status_t amdsmi_get_power_cap_info.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(struct_c__SA_amdsmi_power_cap_info_t)] @@ -1894,7 +1894,7 @@ __all__ = \ 'amdsmi_func_id_iter_handle_t', 'amdsmi_func_id_value_t', 'amdsmi_fw_block_t', 'amdsmi_fw_block_t__enumvalues', 'amdsmi_fw_info_t', 'amdsmi_get_gpu_asic_info', - 'amdsmi_get_bad_page_info', 'amdsmi_get_board_info', + 'amdsmi_get_bad_page_info', 'amdsmi_get_gpu_board_info', 'amdsmi_get_caps_info', 'amdsmi_get_clock_measure', 'amdsmi_get_compute_process_gpus', 'amdsmi_get_compute_process_info', diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index 473d9842b3..210af54902 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -286,7 +286,7 @@ amdsmi_get_gpu_device_bdf(amdsmi_processor_handle processor_handle, amdsmi_bdf_t return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_board_info(amdsmi_processor_handle processor_handle, amdsmi_board_info_t *board_info) { +amdsmi_status_t amdsmi_get_gpu_board_info(amdsmi_processor_handle processor_handle, amdsmi_board_info_t *board_info) { AMDSMI_CHECK_INIT(); @@ -891,8 +891,8 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_vram_vendor_get", "amdsmi_get_gpu_vram_vendor"}, {"rsmi_dev_id_get", "amdsmi_get_gpu_id"}, {"rsmi_dev_vendor_id_get", "amdsmi_get_gpu_asic_info"}, - {"rsmi_dev_name_get", "amdsmi_get_board_info"}, - {"rsmi_dev_sku_get", "amdsmi_get_board_info"}, + {"rsmi_dev_name_get", "amdsmi_get_gpu_board_info"}, + {"rsmi_dev_sku_get", "amdsmi_get_gpu_board_info"}, {"rsmi_dev_brand_get", "amdsmi_get_gpu_asic_info"}, {"rsmi_dev_vendor_name_get", "amdsmi_get_gpu_vendor_name"}, {"rsmi_dev_serial_number_get", "amdsmi_get_gpu_asic_info"}, @@ -900,7 +900,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_subsystem_name_get", "amdsmi_get_gpu_subsystem_name"}, {"rsmi_dev_drm_render_minor_get", "amdsmi_get_gpu_drm_render_minor"}, {"rsmi_dev_subsystem_vendor_id_get", "amdsmi_get_gpu_asic_info"}, - {"rsmi_dev_unique_id_get", "amdsmi_get_board_info"}, + {"rsmi_dev_unique_id_get", "amdsmi_get_gpu_board_info"}, {"rsmi_dev_pci_bandwidth_get", "amdsmi_get_gpu_pci_bandwidth"}, {"rsmi_dev_pci_id_get", "amdsmi_dev_get_pci_id"}, {"rsmi_dev_pci_throughput_get", "amdsmi_dev_get_pci_throughput"}, diff --git a/tests/amd_smi_test/functional/id_info_read.cc b/tests/amd_smi_test/functional/id_info_read.cc index e94f5fa898..4f5c849f36 100755 --- a/tests/amd_smi_test/functional/id_info_read.cc +++ b/tests/amd_smi_test/functional/id_info_read.cc @@ -129,7 +129,7 @@ void TestIdInfoRead::Run(void) { // device name, brand, serial_number amdsmi_board_info_t board_info; - err = amdsmi_get_board_info(processor_handles_[0], &board_info); + err = amdsmi_get_gpu_board_info(processor_handles_[0], &board_info); CHK_ERR_ASRT(err) err = amdsmi_get_gpu_vram_vendor(processor_handles_[i], buffer, kBufferLen); diff --git a/tests/amd_smi_test/functional/mutual_exclusion.cc b/tests/amd_smi_test/functional/mutual_exclusion.cc index 7a6c8c2bf4..417f5aa699 100755 --- a/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -206,7 +206,7 @@ void TestMutualExclusion::Run(void) { // device name, brand, serial_number amdsmi_board_info_t board_info; - ret = amdsmi_get_board_info(processor_handles_[0], &board_info); + ret = amdsmi_get_gpu_board_info(processor_handles_[0], &board_info); CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_get_gpu_vendor_name(processor_handles_[0], dmy_str, 10); diff --git a/tests/amd_smi_test/test_base.cc b/tests/amd_smi_test/test_base.cc index 106e68436a..b83f6a7a96 100644 --- a/tests/amd_smi_test/test_base.cc +++ b/tests/amd_smi_test/test_base.cc @@ -174,7 +174,7 @@ void TestBase::PrintDeviceHeader(amdsmi_processor_handle dv_ind) { } amdsmi_board_info_t board_info; - err = amdsmi_get_board_info(dv_ind, &board_info); + err = amdsmi_get_gpu_board_info(dv_ind, &board_info); CHK_ERR_ASRT(err) IF_VERB(STANDARD) { std::cout << "\t**Device name: " << board_info.product_name << std::endl;