From 51d91b90711203eb2ec885ac98016681cc2d9cce Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Mon, 27 Feb 2023 01:14:03 -0500 Subject: [PATCH] Renamed API amdsmi_get_ras_block_features_enabled to amdsmi_get_gpu_ras_block_features_enabled grep -rli 'amdsmi_get_ras_block_features_enabled' * | xargs -i@ sed -i 's/amdsmi_get_ras_block_features_enabled/amdsmi_get_gpu_ras_block_features_enabled/g' @ Change-Id: I23d6c6145465f6a3f28a48717b2343a816ff5c9b --- example/amd_smi_drm_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 | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/example/amd_smi_drm_example.cc b/example/amd_smi_drm_example.cc index 999d4b32b8..8f52d7d832 100644 --- a/example/amd_smi_drm_example.cc +++ b/example/amd_smi_drm_example.cc @@ -442,11 +442,11 @@ int main() { "ENABLED"}; amdsmi_ras_err_state_t state = {}; int index = 0; - printf(" Output of amdsmi_get_ras_block_features_enabled:\n"); + printf(" Output of amdsmi_get_gpu_ras_block_features_enabled:\n"); for (auto block = AMDSMI_GPU_BLOCK_FIRST; block <= AMDSMI_GPU_BLOCK_LAST; block = (amdsmi_gpu_block_t)(block * 2)) { - ret = amdsmi_get_ras_block_features_enabled(processor_handles[j], block, + ret = amdsmi_get_gpu_ras_block_features_enabled(processor_handles[j], block, &state); CHK_AMDSMI_RET(ret) printf("\tBlock: %s\n", block_names[index]); diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 6ac7f42b91..522d5c196a 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -1823,7 +1823,7 @@ amdsmi_get_bad_page_info(amdsmi_processor_handle processor_handle, uint32_t *num * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_ras_block_features_enabled(amdsmi_processor_handle processor_handle, amdsmi_gpu_block_t block, +amdsmi_get_gpu_ras_block_features_enabled(amdsmi_processor_handle processor_handle, amdsmi_gpu_block_t block, amdsmi_ras_err_state_t *state); /** diff --git a/py-interface/README.md b/py-interface/README.md index a0b3b13439..a5e0767564 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -941,7 +941,7 @@ except AmdSmiException as e: print(e) ``` -## amdsmi_get_ras_block_features_enabled +## amdsmi_get_gpu_ras_block_features_enabled Description: Returns status of each RAS block for the given GPU Input parameters: @@ -955,7 +955,7 @@ Field | Description `block` | RAS block `status` | RAS block status -Exceptions that can be thrown by `amdsmi_get_ras_block_features_enabled` function: +Exceptions that can be thrown by `amdsmi_get_gpu_ras_block_features_enabled` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -968,7 +968,7 @@ try: print("No GPUs on machine") else: for device in devices: - ras_block_features = amdsmi_get_ras_block_features_enabled(device) + ras_block_features = amdsmi_get_gpu_ras_block_features_enabled(device) print(ras_block_features) except AmdSmiException as e: print(e) diff --git a/py-interface/__init__.py b/py-interface/__init__.py index c7e05b2797..5f8862d19e 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -69,7 +69,7 @@ from .amdsmi_interface import amdsmi_get_ecc_error_count from .amdsmi_interface import amdsmi_get_gpu_board_info # # Ras Information -from .amdsmi_interface import amdsmi_get_ras_block_features_enabled +from .amdsmi_interface import amdsmi_get_gpu_ras_block_features_enabled # # Supported Function Checks from .amdsmi_interface import amdsmi_dev_open_supported_func_iterator diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 7d20b44153..69d4f8153b 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -821,7 +821,7 @@ def amdsmi_get_gpu_board_info( } -def amdsmi_get_ras_block_features_enabled( +def amdsmi_get_gpu_ras_block_features_enabled( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -837,7 +837,7 @@ def amdsmi_get_ras_block_features_enabled( if gpu_block.name == "LAST": gpu_block.name = "FUSE" _check_res( - amdsmi_wrapper.amdsmi_get_ras_block_features_enabled( + amdsmi_wrapper.amdsmi_get_gpu_ras_block_features_enabled( processor_handle, amdsmi_wrapper.amdsmi_gpu_block_t(gpu_block.value), ctypes.byref(ras_state), diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index e63c793c19..6d7efbea17 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1478,9 +1478,9 @@ amdsmi_get_gpu_memory_usage.argtypes = [amdsmi_processor_handle, amdsmi_memory_t amdsmi_get_bad_page_info = _libraries['libamd_smi.so'].amdsmi_get_bad_page_info amdsmi_get_bad_page_info.restype = amdsmi_status_t amdsmi_get_bad_page_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_retired_page_record_t)] -amdsmi_get_ras_block_features_enabled = _libraries['libamd_smi.so'].amdsmi_get_ras_block_features_enabled -amdsmi_get_ras_block_features_enabled.restype = amdsmi_status_t -amdsmi_get_ras_block_features_enabled.argtypes = [amdsmi_processor_handle, amdsmi_gpu_block_t, ctypes.POINTER(c__EA_amdsmi_ras_err_state_t)] +amdsmi_get_gpu_ras_block_features_enabled = _libraries['libamd_smi.so'].amdsmi_get_gpu_ras_block_features_enabled +amdsmi_get_gpu_ras_block_features_enabled.restype = amdsmi_status_t +amdsmi_get_gpu_ras_block_features_enabled.argtypes = [amdsmi_processor_handle, amdsmi_gpu_block_t, ctypes.POINTER(c__EA_amdsmi_ras_err_state_t)] amdsmi_get_gpu_memory_busy_percent = _libraries['libamd_smi.so'].amdsmi_get_gpu_memory_busy_percent amdsmi_get_gpu_memory_busy_percent.restype = amdsmi_status_t amdsmi_get_gpu_memory_busy_percent.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] @@ -1908,7 +1908,7 @@ __all__ = \ 'amdsmi_get_pcie_link_status', 'amdsmi_get_power_cap_info', 'amdsmi_get_power_measure', 'amdsmi_get_process_info', 'amdsmi_get_process_list', - 'amdsmi_get_ras_block_features_enabled', + 'amdsmi_get_gpu_ras_block_features_enabled', 'amdsmi_get_socket_handles', 'amdsmi_get_socket_info', 'amdsmi_get_gpu_target_frequency_range', 'amdsmi_get_utilization_count', 'amdsmi_get_gpu_vbios_info', diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index 02041b516e..56e4e90eb2 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -1547,7 +1547,7 @@ amdsmi_get_clock_measure(amdsmi_processor_handle processor_handle, amdsmi_clk_ty } amdsmi_status_t -amdsmi_get_ras_block_features_enabled(amdsmi_processor_handle processor_handle, amdsmi_gpu_block_t block, amdsmi_ras_err_state_t *state) { +amdsmi_get_gpu_ras_block_features_enabled(amdsmi_processor_handle processor_handle, amdsmi_gpu_block_t block, amdsmi_ras_err_state_t *state) { AMDSMI_CHECK_INIT(); if (state == nullptr || block > AMDSMI_GPU_BLOCK_LAST) {