From 3abd39f245f42cd2dc30660ae60efdace177e067 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Mon, 27 Feb 2023 00:56:31 -0500 Subject: [PATCH] Renamed API amdsmi_dev_reset_gpu to amdsmi_reset_gpu grep -rli 'amdsmi_dev_reset_gpu' * | xargs -i@ sed -i 's/amdsmi_dev_reset_gpu/amdsmi_reset_gpu/g' @ Change-Id: Iebd03bc710fed1a75f262726ab33cd1a42d641a7 [ROCm/amdsmi commit: 98f87d9633b4489da0026cdaa4576d9c5a59ba1c] --- 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/py-interface/rocm_smi_tool.py | 4 ++-- projects/amdsmi/src/amd_smi/amd_smi.cc | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index 4832f52d8b..e1fbfd8f6e 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -2252,7 +2252,7 @@ amdsmi_status_t amdsmi_get_clk_freq(amdsmi_processor_handle processor_handle, * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_reset_gpu(amdsmi_processor_handle processor_handle); +amdsmi_status_t amdsmi_reset_gpu(amdsmi_processor_handle processor_handle); /** * @brief This function retrieves the voltage/frequency curve information diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index b78ffcd176..fc2b0a44b5 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -2465,7 +2465,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_dev_reset_gpu +## amdsmi_reset_gpu Description: Reset the gpu associated with the device with provided device handle Input parameters: @@ -2473,7 +2473,7 @@ Input parameters: Output: None -Exceptions that can be thrown by `amdsmi_dev_reset_gpu` function: +Exceptions that can be thrown by `amdsmi_reset_gpu` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2486,7 +2486,7 @@ try: print("No GPUs on machine") else: for device in devices: - amdsmi_dev_reset_gpu(device) + amdsmi_reset_gpu(device) except AmdSmiException as e: print(e) ``` diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index f1490380bf..1950ffafcf 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -88,7 +88,7 @@ from .amdsmi_interface import amdsmi_dev_set_od_volt_info from .amdsmi_interface import amdsmi_set_gpu_perf_level_v1 from .amdsmi_interface import amdsmi_set_gpu_perf_level from .amdsmi_interface import amdsmi_dev_get_power_profile_presets -from .amdsmi_interface import amdsmi_dev_reset_gpu +from .amdsmi_interface import amdsmi_reset_gpu from .amdsmi_interface import amdsmi_set_gpu_perf_determinism_mode from .amdsmi_interface import amdsmi_set_gpu_fan_speed from .amdsmi_interface import amdsmi_reset_gpu_fan diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index 278b44a7a4..52317f99de 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -1493,13 +1493,13 @@ def amdsmi_dev_get_power_profile_presets( } -def amdsmi_dev_reset_gpu(processor_handle: amdsmi_wrapper.amdsmi_processor_handle): +def amdsmi_reset_gpu(processor_handle: amdsmi_wrapper.amdsmi_processor_handle): if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - _check_res(amdsmi_wrapper.amdsmi_dev_reset_gpu(processor_handle)) + _check_res(amdsmi_wrapper.amdsmi_reset_gpu(processor_handle)) def amdsmi_set_gpu_perf_determinism_mode( diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index a433f72487..b558cd11b4 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1532,9 +1532,9 @@ amdsmi_dev_get_overdrive_level.argtypes = [amdsmi_processor_handle, ctypes.POINT amdsmi_get_clk_freq = _libraries['libamd_smi.so'].amdsmi_get_clk_freq amdsmi_get_clk_freq.restype = amdsmi_status_t amdsmi_get_clk_freq.argtypes = [amdsmi_processor_handle, amdsmi_clk_type_t, ctypes.POINTER(struct_c__SA_amdsmi_frequencies_t)] -amdsmi_dev_reset_gpu = _libraries['libamd_smi.so'].amdsmi_dev_reset_gpu -amdsmi_dev_reset_gpu.restype = amdsmi_status_t -amdsmi_dev_reset_gpu.argtypes = [amdsmi_processor_handle] +amdsmi_reset_gpu = _libraries['libamd_smi.so'].amdsmi_reset_gpu +amdsmi_reset_gpu.restype = amdsmi_status_t +amdsmi_reset_gpu.argtypes = [amdsmi_processor_handle] amdsmi_dev_get_od_volt_info = _libraries['libamd_smi.so'].amdsmi_dev_get_od_volt_info amdsmi_dev_get_od_volt_info.restype = amdsmi_status_t amdsmi_dev_get_od_volt_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_od_volt_freq_data_t)] @@ -1873,7 +1873,7 @@ __all__ = \ 'amdsmi_dev_open_supported_func_iterator', 'amdsmi_dev_open_supported_variant_iterator', 'amdsmi_dev_perf_level_t', 'amdsmi_dev_perf_level_t__enumvalues', - 'amdsmi_reset_gpu_fan', 'amdsmi_dev_reset_gpu', + 'amdsmi_reset_gpu_fan', 'amdsmi_reset_gpu', 'amdsmi_dev_reset_xgmi_error', 'amdsmi_set_clk_freq', 'amdsmi_set_gpu_clk_range', 'amdsmi_set_gpu_fan_speed', 'amdsmi_dev_set_od_clk_info', 'amdsmi_dev_set_od_volt_info', diff --git a/projects/amdsmi/py-interface/rocm_smi_tool.py b/projects/amdsmi/py-interface/rocm_smi_tool.py index d00cf3b1a6..151bad01b4 100644 --- a/projects/amdsmi/py-interface/rocm_smi_tool.py +++ b/projects/amdsmi/py-interface/rocm_smi_tool.py @@ -353,7 +353,7 @@ class Formatter: | """ + self.style.text("64 Reset dev fan. Api: amdsmi_reset_gpu_fan ") + """ | | """ + self.style.text("65 Set dev fan speed. Api: amdsmi_set_gpu_fan_speed ") + """ | | """ + self.style.text("66 Set dev gpu clk freq. Api: amdsmi_set_clk_freq ") + """ | - | """ + self.style.text("67 Reset dev gpu. Api: amdsmi_dev_reset_gpu ") + """ | + | """ + self.style.text("67 Reset dev gpu. Api: amdsmi_reset_gpu ") + """ | | """ + self.style.text("68 Set dev od clk info. Api: amdsmi_dev_set_od_clk_info ") + """ | | """ + self.style.text("69 Set dev od volt info. Api: amdsmi_dev_set_od_volt_info ") + """| | """ + self.style.text("70 Set dev overdrive level. Api: amdsmi_dev_set_overdrive_level ") + """ | @@ -926,7 +926,7 @@ commands = { "device_identifier1": [None, True], "freq_bitmask": [int, True] }], - 67: [smi_api.amdsmi_dev_reset_gpu, { + 67: [smi_api.amdsmi_reset_gpu, { "device_identifier1": [None, True] }], 68: [amdsmi_tool_dev_od_clk_info_set, { diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index 024691637e..4636c06424 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -930,7 +930,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_memory_reserved_pages_get", "amdsmi_get_gpu_memory_reserved_pages"}, {"rsmi_topo_numa_affinity_get", "amdsmi_get_gpu_topo_numa_affinity"}, {"rsmi_dev_gpu_metrics_info_get", " amdsmi_dev_get_gpu_metrics_info"}, - {"rsmi_dev_gpu_reset", "amdsmi_dev_reset_gpu"}, + {"rsmi_dev_gpu_reset", "amdsmi_reset_gpu"}, {"rsmi_dev_memory_total_get", "amdsmi_get_gpu_memory_total"}, {"rsmi_dev_memory_usage_get", "amdsmi_get_gpu_memory_usage"}, {"rsmi_dev_gpu_clk_freq_get", " amdsmi_get_clk_freq"}, @@ -1354,7 +1354,7 @@ amdsmi_status_t amdsmi_dev_set_overdrive_level_v1( od); } -amdsmi_status_t amdsmi_dev_reset_gpu(amdsmi_processor_handle processor_handle) { +amdsmi_status_t amdsmi_reset_gpu(amdsmi_processor_handle processor_handle) { return rsmi_wrapper(rsmi_dev_gpu_reset, processor_handle); }