From 9807a774bbaac255035be93aa9845684d6db68a2 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Sat, 25 Feb 2023 07:47:11 -0500 Subject: [PATCH] Renamed API amdsmi_get_vram_usage to amdsmi_get_gpu_vram_usage grep -rli 'amdsmi_get_vram_usage' * | xargs -i@ sed -i 's/amdsmi_get_vram_usage/amdsmi_get_gpu_vram_usage/g' @ Change-Id: Ieac19b7783e5ea0bc2654bd8398d64d4a937be42 [ROCm/amdsmi commit: cc1a9d45220781b54df05b60c809843ccaf08241] --- projects/amdsmi/example/amd_smi_drm_example.cc | 4 ++-- projects/amdsmi/example/amd_smi_nodrm_example.cc | 4 ++-- projects/amdsmi/include/amd_smi/amdsmi.h | 2 +- projects/amdsmi/py-interface/README.md | 6 +++--- projects/amdsmi/py-interface/__init__.py | 2 +- projects/amdsmi/py-interface/amdsmi_interface.py | 4 ++-- projects/amdsmi/py-interface/amdsmi_wrapper.py | 8 ++++---- projects/amdsmi/src/amd_smi/amd_smi.cc | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/projects/amdsmi/example/amd_smi_drm_example.cc b/projects/amdsmi/example/amd_smi_drm_example.cc index 469f5f5a1f..41a50bbe89 100644 --- a/projects/amdsmi/example/amd_smi_drm_example.cc +++ b/projects/amdsmi/example/amd_smi_drm_example.cc @@ -645,9 +645,9 @@ int main() { // Get frame buffer amdsmi_vram_info_t vram_usage = {}; - ret = amdsmi_get_vram_usage(processor_handles[j], &vram_usage); + ret = amdsmi_get_gpu_vram_usage(processor_handles[j], &vram_usage); CHK_AMDSMI_RET(ret) - printf(" Output of amdsmi_get_vram_usage:\n"); + printf(" Output of amdsmi_get_gpu_vram_usage:\n"); std::cout << "\t\tFrame buffer usage (MB): " << vram_usage.vram_used << "/" << vram_usage.vram_total << "\n\n"; diff --git a/projects/amdsmi/example/amd_smi_nodrm_example.cc b/projects/amdsmi/example/amd_smi_nodrm_example.cc index cdd3db9c54..596539a383 100644 --- a/projects/amdsmi/example/amd_smi_nodrm_example.cc +++ b/projects/amdsmi/example/amd_smi_nodrm_example.cc @@ -309,9 +309,9 @@ int main() { // Get frame buffer amdsmi_vram_info_t vram_usage = {}; - ret = amdsmi_get_vram_usage(processor_handles[j], &vram_usage); + ret = amdsmi_get_gpu_vram_usage(processor_handles[j], &vram_usage); CHK_AMDSMI_RET(ret) - printf(" Output of amdsmi_get_vram_usage:\n"); + printf(" Output of amdsmi_get_gpu_vram_usage:\n"); std::cout << "\t\tFrame buffer usage (MB): " << vram_usage.vram_used << "/" << vram_usage.vram_total << "\n\n"; diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index bdf8c89d4e..e42aeda8ef 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -3786,7 +3786,7 @@ amdsmi_get_clock_measure(amdsmi_processor_handle processor_handle, amdsmi_clk_ty * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_vram_usage(amdsmi_processor_handle processor_handle, amdsmi_vram_info_t *info); +amdsmi_get_gpu_vram_usage(amdsmi_processor_handle processor_handle, amdsmi_vram_info_t *info); /** @} End gpumon */ diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index d293bd3bec..d11dfbb0a3 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -547,7 +547,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_get_vram_usage +## amdsmi_get_gpu_vram_usage Description: Returns total VRAM and VRAM in use Input parameters: @@ -560,7 +560,7 @@ Field | Description `vram_total` | VRAM total `vram_used`| VRAM currently in use -Exceptions that can be thrown by `amdsmi_get_vram_usage` function: +Exceptions that can be thrown by `amdsmi_get_gpu_vram_usage` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -573,7 +573,7 @@ try: print("No GPUs on machine") else: for device in devices: - vram_usage = amdsmi_get_vram_usage(device) + vram_usage = amdsmi_get_gpu_vram_usage(device) print(vram_usage['vram_used']) print(vram_usage['vram_total']) except AmdSmiException as e: diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index 499ecf0d22..73ae3b2075 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -47,7 +47,7 @@ from .amdsmi_interface import amdsmi_get_fw_info # # GPU Monitoring from .amdsmi_interface import amdsmi_get_gpu_activity -from .amdsmi_interface import amdsmi_get_vram_usage +from .amdsmi_interface import amdsmi_get_gpu_vram_usage from .amdsmi_interface import amdsmi_get_power_measure from .amdsmi_interface import amdsmi_get_clock_measure diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index 0eab315797..393c552a8d 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -1005,7 +1005,7 @@ def amdsmi_get_fw_info( } -def amdsmi_get_vram_usage( +def amdsmi_get_gpu_vram_usage( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -1015,7 +1015,7 @@ def amdsmi_get_vram_usage( vram_info = amdsmi_wrapper.amdsmi_vram_info_t() _check_res( - amdsmi_wrapper.amdsmi_get_vram_usage( + amdsmi_wrapper.amdsmi_get_gpu_vram_usage( processor_handle, ctypes.byref(vram_info)) ) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index 9504053978..6727177884 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1703,9 +1703,9 @@ amdsmi_get_power_measure.argtypes = [amdsmi_processor_handle, ctypes.POINTER(str amdsmi_get_clock_measure = _libraries['libamd_smi.so'].amdsmi_get_clock_measure amdsmi_get_clock_measure.restype = amdsmi_status_t amdsmi_get_clock_measure.argtypes = [amdsmi_processor_handle, amdsmi_clk_type_t, ctypes.POINTER(struct_c__SA_amdsmi_clk_measure_t)] -amdsmi_get_vram_usage = _libraries['libamd_smi.so'].amdsmi_get_vram_usage -amdsmi_get_vram_usage.restype = amdsmi_status_t -amdsmi_get_vram_usage.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_vram_info_t)] +amdsmi_get_gpu_vram_usage = _libraries['libamd_smi.so'].amdsmi_get_gpu_vram_usage +amdsmi_get_gpu_vram_usage.restype = amdsmi_status_t +amdsmi_get_gpu_vram_usage.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_vram_info_t)] amdsmi_get_target_frequency_range = _libraries['libamd_smi.so'].amdsmi_get_target_frequency_range amdsmi_get_target_frequency_range.restype = amdsmi_status_t amdsmi_get_target_frequency_range.argtypes = [amdsmi_processor_handle, amdsmi_clk_type_t, ctypes.POINTER(struct_c__SA_amdsmi_frequency_range_t)] @@ -1913,7 +1913,7 @@ __all__ = \ 'amdsmi_get_target_frequency_range', 'amdsmi_get_utilization_count', 'amdsmi_get_gpu_vbios_info', 'amdsmi_get_version', 'amdsmi_get_version_str', - 'amdsmi_get_vram_usage', 'amdsmi_get_xgmi_info', + 'amdsmi_get_gpu_vram_usage', 'amdsmi_get_xgmi_info', 'amdsmi_gpu_block_t', 'amdsmi_gpu_block_t__enumvalues', 'amdsmi_gpu_caps_t', 'amdsmi_gpu_metrics_t', 'amdsmi_init', 'amdsmi_init_event_notification', 'amdsmi_init_flags_t', diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index b5f4bf2ad3..8fe38255af 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -346,7 +346,7 @@ amdsmi_status_t amdsmi_dev_get_temp_metric(amdsmi_processor_handle processor_ha return amdsmi_status; } -amdsmi_status_t amdsmi_get_vram_usage(amdsmi_processor_handle processor_handle, +amdsmi_status_t amdsmi_get_gpu_vram_usage(amdsmi_processor_handle processor_handle, amdsmi_vram_info_t *vram_info) { AMDSMI_CHECK_INIT();