From 7c82c5ec791502054664708dce8d6f8e357a11d3 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Sat, 25 Feb 2023 08:27:40 -0500 Subject: [PATCH] Renamed API amdsmi_dev_reset_fan to amdsmi_reset_gpu_fan grep -rli 'amdsmi_dev_reset_fan' * | xargs -i@ sed -i 's/amdsmi_dev_reset_fan/amdsmi_reset_gpu_fan/g' @ Change-Id: Ic9d2ed404b4ed2d6973286e6f76b732199c1b687 --- 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 ++++---- py-interface/rocm_smi_tool.py | 4 ++-- src/amd_smi/amd_smi.cc | 4 ++-- tests/amd_smi_test/functional/fan_read_write.cc | 2 +- tests/amd_smi_test/functional/mutual_exclusion.cc | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 7545628a4c..58b3a49536 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -2044,7 +2044,7 @@ amdsmi_status_t amdsmi_get_gpu_volt_metric(amdsmi_processor_handle processor_ha * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_reset_fan(amdsmi_processor_handle processor_handle, uint32_t sensor_ind); +amdsmi_status_t amdsmi_reset_gpu_fan(amdsmi_processor_handle processor_handle, uint32_t sensor_ind); /** * @brief Set the fan speed for the specified device with the provided speed, diff --git a/py-interface/README.md b/py-interface/README.md index ecbd179fa5..9454a45940 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -2518,7 +2518,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_dev_reset_fan +## amdsmi_reset_gpu_fan Description: Reset the fan to automatic driver control Input parameters: @@ -2527,7 +2527,7 @@ Input parameters: Output: None -Exceptions that can be thrown by `amdsmi_dev_reset_fan` function: +Exceptions that can be thrown by `amdsmi_reset_gpu_fan` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2540,7 +2540,7 @@ try: print("No GPUs on machine") else: for device in devices: - amdsmi_dev_reset_fan(device, 0) + amdsmi_reset_gpu_fan(device, 0) except AmdSmiException as e: print(e) ``` diff --git a/py-interface/__init__.py b/py-interface/__init__.py index a90ab8bce3..a4019392af 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -91,7 +91,7 @@ from .amdsmi_interface import amdsmi_dev_get_power_profile_presets from .amdsmi_interface import amdsmi_dev_reset_gpu from .amdsmi_interface import amdsmi_set_perf_determinism_mode from .amdsmi_interface import amdsmi_dev_set_fan_speed -from .amdsmi_interface import amdsmi_dev_reset_fan +from .amdsmi_interface import amdsmi_reset_gpu_fan from .amdsmi_interface import amdsmi_dev_set_clk_freq from .amdsmi_interface import amdsmi_dev_set_overdrive_level_v1 from .amdsmi_interface import amdsmi_dev_set_overdrive_level diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 95e947e350..3cf531e380 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -1539,7 +1539,7 @@ def amdsmi_dev_set_fan_speed( ) -def amdsmi_dev_reset_fan( +def amdsmi_reset_gpu_fan( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_idx: int ): if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -1550,7 +1550,7 @@ def amdsmi_dev_reset_fan( raise AmdSmiParameterException(sensor_idx, int) sensor_idx = ctypes.c_uint32(sensor_idx) - _check_res(amdsmi_wrapper.amdsmi_dev_reset_fan(processor_handle, sensor_idx)) + _check_res(amdsmi_wrapper.amdsmi_reset_gpu_fan(processor_handle, sensor_idx)) def amdsmi_dev_set_clk_freq( diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index 9504e70307..3d46b55057 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1502,9 +1502,9 @@ amdsmi_get_temp_metric.argtypes = [amdsmi_processor_handle, amdsmi_temperature_t amdsmi_get_gpu_volt_metric = _libraries['libamd_smi.so'].amdsmi_get_gpu_volt_metric amdsmi_get_gpu_volt_metric.restype = amdsmi_status_t amdsmi_get_gpu_volt_metric.argtypes = [amdsmi_processor_handle, amdsmi_voltage_type_t, amdsmi_voltage_metric_t, ctypes.POINTER(ctypes.c_int64)] -amdsmi_dev_reset_fan = _libraries['libamd_smi.so'].amdsmi_dev_reset_fan -amdsmi_dev_reset_fan.restype = amdsmi_status_t -amdsmi_dev_reset_fan.argtypes = [amdsmi_processor_handle, uint32_t] +amdsmi_reset_gpu_fan = _libraries['libamd_smi.so'].amdsmi_reset_gpu_fan +amdsmi_reset_gpu_fan.restype = amdsmi_status_t +amdsmi_reset_gpu_fan.argtypes = [amdsmi_processor_handle, uint32_t] amdsmi_dev_set_fan_speed = _libraries['libamd_smi.so'].amdsmi_dev_set_fan_speed amdsmi_dev_set_fan_speed.restype = amdsmi_status_t amdsmi_dev_set_fan_speed.argtypes = [amdsmi_processor_handle, uint32_t, uint64_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_dev_reset_fan', 'amdsmi_dev_reset_gpu', + 'amdsmi_reset_gpu_fan', 'amdsmi_dev_reset_gpu', 'amdsmi_dev_reset_xgmi_error', 'amdsmi_dev_set_clk_freq', 'amdsmi_dev_set_clk_range', 'amdsmi_dev_set_fan_speed', 'amdsmi_dev_set_od_clk_info', 'amdsmi_dev_set_od_volt_info', diff --git a/py-interface/rocm_smi_tool.py b/py-interface/rocm_smi_tool.py index 7ae216f3a4..7f59a32f73 100644 --- a/py-interface/rocm_smi_tool.py +++ b/py-interface/rocm_smi_tool.py @@ -350,7 +350,7 @@ class Formatter: | """ + self.style.text("61 Get counter read. Api: amdsmi_read_counter ") + """ | | """ + self.style.text("62 Set dev clk range. Api: amdsmi_dev_set_clk_range ") + """ | | """ + self.style.text("63 Get dev counter group supported. Api: amdsmi_dev_counter_group_supported ") + """ | - | """ + self.style.text("64 Reset dev fan. Api: amdsmi_dev_reset_fan ") + """ | + | """ + self.style.text("64 Reset dev fan. Api: amdsmi_reset_gpu_fan ") + """ | | """ + self.style.text("65 Set dev fan speed. Api: amdsmi_dev_set_fan_speed ") + """ | | """ + self.style.text("66 Set dev gpu clk freq. Api: amdsmi_dev_set_clk_freq ") + """ | | """ + self.style.text("67 Reset dev gpu. Api: amdsmi_dev_reset_gpu ") + """ | @@ -469,7 +469,7 @@ def amdsmi_tool_version_str_get(): def amdsmi_tool_dev_fan_reset(dev, dic): sensor_idx = dic["sensor_idx"] - return smi_api.amdsmi_dev_reset_fan(dev, sensor_idx) + return smi_api.amdsmi_reset_gpu_fan(dev, sensor_idx) def amdsmi_tool_dev_fan_speed_set(dev, dic): sensor_idx = dic["sensor_idx"] diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index aa8c43f67b..6f606e757c 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -496,7 +496,7 @@ amdsmi_status_t amdsmi_get_gpu_fan_speed_max(amdsmi_processor_handle processor_h sensor_ind, max_speed); } -amdsmi_status_t amdsmi_dev_reset_fan(amdsmi_processor_handle processor_handle, +amdsmi_status_t amdsmi_reset_gpu_fan(amdsmi_processor_handle processor_handle, uint32_t sensor_ind) { return rsmi_wrapper(rsmi_dev_fan_reset, processor_handle, sensor_ind); } @@ -947,7 +947,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_fan_speed_get", "amdsmi_get_gpu_fan_speed"}, {"rsmi_dev_fan_speed_max_get", "amdsmi_get_gpu_fan_speed_max"}, {"rsmi_dev_temp_metric_get", " amdsmi_get_temp_metric"}, - {"rsmi_dev_fan_reset", "amdsmi_dev_reset_fan"}, + {"rsmi_dev_fan_reset", "amdsmi_reset_gpu_fan"}, {"rsmi_dev_fan_speed_set", "amdsmi_dev_set_fan_speed"}, {"rsmi_dev_volt_metric_get", " amdsmi_get_gpu_volt_metric"} }; diff --git a/tests/amd_smi_test/functional/fan_read_write.cc b/tests/amd_smi_test/functional/fan_read_write.cc index 19d504657d..ff901e8d37 100755 --- a/tests/amd_smi_test/functional/fan_read_write.cc +++ b/tests/amd_smi_test/functional/fan_read_write.cc @@ -163,7 +163,7 @@ void TestFanReadWrite::Run(void) { std::cout << "Resetting fan control to auto..." << std::endl; } - ret = amdsmi_dev_reset_fan(processor_handles_[dv_ind], 0); + ret = amdsmi_reset_gpu_fan(processor_handles_[dv_ind], 0); CHK_ERR_ASRT(ret) sleep(3); diff --git a/tests/amd_smi_test/functional/mutual_exclusion.cc b/tests/amd_smi_test/functional/mutual_exclusion.cc index 5ec19e9c77..5977b36e09 100755 --- a/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -231,7 +231,7 @@ void TestMutualExclusion::Run(void) { CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_get_temp_metric(processor_handles_[0], TEMPERATURE_TYPE_EDGE, AMDSMI_TEMP_CURRENT, &dmy_i64); CHECK_RET(ret, AMDSMI_STATUS_BUSY); - ret = amdsmi_dev_reset_fan(processor_handles_[0], 0); + ret = amdsmi_reset_gpu_fan(processor_handles_[0], 0); CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_dev_set_fan_speed(processor_handles_[0], dmy_ui32, 0); CHECK_RET(ret, AMDSMI_STATUS_BUSY); @@ -276,7 +276,7 @@ void TestMutualExclusion::Run(void) { amdsmi_get_gpu_volt_metric amdsmi_get_gpu_fan_speed amdsmi_get_gpu_fan_rpms - amdsmi_dev_reset_fan + amdsmi_reset_gpu_fan amdsmi_dev_set_fan_speed amdsmi_get_gpu_fan_speed_max amdsmi_dev_get_od_volt_info