From 8d7b6ee5d148922cf7e89e94ebbb65ae170b71c1 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Sat, 25 Feb 2023 08:29:08 -0500 Subject: [PATCH] Renamed API amdsmi_dev_set_fan_speed to amdsmi_set_gpu_fan_speed grep -rli 'amdsmi_dev_set_fan_speed' * | xargs -i@ sed -i 's/amdsmi_dev_set_fan_speed/amdsmi_set_gpu_fan_speed/g' @ Change-Id: I27a321a0e1182b4cc94d18cff5245df67c4fee31 --- 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 58b3a49536..e30e3d0d43 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -2066,7 +2066,7 @@ amdsmi_status_t amdsmi_reset_gpu_fan(amdsmi_processor_handle processor_handle, u * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_set_fan_speed(amdsmi_processor_handle processor_handle, +amdsmi_status_t amdsmi_set_gpu_fan_speed(amdsmi_processor_handle processor_handle, uint32_t sensor_ind, uint64_t speed); /** @} End PhysCont */ diff --git a/py-interface/README.md b/py-interface/README.md index 9454a45940..9bd56d763f 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -2490,7 +2490,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_dev_set_fan_speed +## amdsmi_set_gpu_fan_speed Description: Set the fan speed for the specified device with the provided speed, in RPMs @@ -2501,7 +2501,7 @@ Input parameters: Output: None -Exceptions that can be thrown by `amdsmi_dev_set_fan_speed` function: +Exceptions that can be thrown by `amdsmi_set_gpu_fan_speed` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2514,7 +2514,7 @@ try: print("No GPUs on machine") else: for device in devices: - amdsmi_dev_set_fan_speed(device, 0, 1333) + amdsmi_set_gpu_fan_speed(device, 0, 1333) except AmdSmiException as e: print(e) ``` diff --git a/py-interface/__init__.py b/py-interface/__init__.py index a4019392af..f7d8131327 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -90,7 +90,7 @@ from .amdsmi_interface import amdsmi_dev_set_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_set_perf_determinism_mode -from .amdsmi_interface import amdsmi_dev_set_fan_speed +from .amdsmi_interface import amdsmi_set_gpu_fan_speed 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 diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 3cf531e380..00519adf55 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -1519,7 +1519,7 @@ def amdsmi_set_perf_determinism_mode( ) -def amdsmi_dev_set_fan_speed( +def amdsmi_set_gpu_fan_speed( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_idx: int, fan_speed: int ): if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -1534,7 +1534,7 @@ def amdsmi_dev_set_fan_speed( fan_speed = ctypes.c_uint64(fan_speed) _check_res( - amdsmi_wrapper.amdsmi_dev_set_fan_speed( + amdsmi_wrapper.amdsmi_set_gpu_fan_speed( processor_handle, sensor_idx, fan_speed) ) diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index 3d46b55057..b500b24353 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1505,9 +1505,9 @@ amdsmi_get_gpu_volt_metric.argtypes = [amdsmi_processor_handle, amdsmi_voltage_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] +amdsmi_set_gpu_fan_speed = _libraries['libamd_smi.so'].amdsmi_set_gpu_fan_speed +amdsmi_set_gpu_fan_speed.restype = amdsmi_status_t +amdsmi_set_gpu_fan_speed.argtypes = [amdsmi_processor_handle, uint32_t, uint64_t] amdsmi_dev_get_busy_percent = _libraries['libamd_smi.so'].amdsmi_dev_get_busy_percent amdsmi_dev_get_busy_percent.restype = amdsmi_status_t amdsmi_dev_get_busy_percent.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] @@ -1875,7 +1875,7 @@ __all__ = \ 'amdsmi_dev_perf_level_t', 'amdsmi_dev_perf_level_t__enumvalues', '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_clk_range', 'amdsmi_set_gpu_fan_speed', 'amdsmi_dev_set_od_clk_info', 'amdsmi_dev_set_od_volt_info', 'amdsmi_dev_set_overdrive_level', 'amdsmi_dev_set_overdrive_level_v1', diff --git a/py-interface/rocm_smi_tool.py b/py-interface/rocm_smi_tool.py index 7f59a32f73..17b18db529 100644 --- a/py-interface/rocm_smi_tool.py +++ b/py-interface/rocm_smi_tool.py @@ -351,7 +351,7 @@ class Formatter: | """ + 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_reset_gpu_fan ") + """ | - | """ + self.style.text("65 Set dev fan speed. Api: amdsmi_dev_set_fan_speed ") + """ | + | """ + 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_dev_set_clk_freq ") + """ | | """ + self.style.text("67 Reset dev gpu. Api: amdsmi_dev_reset_gpu ") + """ | | """ + self.style.text("68 Set dev od clk info. Api: amdsmi_dev_set_od_clk_info ") + """ | @@ -474,7 +474,7 @@ def amdsmi_tool_dev_fan_reset(dev, dic): def amdsmi_tool_dev_fan_speed_set(dev, dic): sensor_idx = dic["sensor_idx"] fan_speed = dic["fan_speed"] - return smi_api.amdsmi_dev_set_fan_speed(dev, sensor_idx, fan_speed) + return smi_api.amdsmi_set_gpu_fan_speed(dev, sensor_idx, fan_speed) def amdsmi_tool_dev_overdrive_level_set(dev, dic): overdrive_value = dic["overdrive_value"] diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index 6f606e757c..1ea5ff7788 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -501,7 +501,7 @@ amdsmi_status_t amdsmi_reset_gpu_fan(amdsmi_processor_handle processor_handle, return rsmi_wrapper(rsmi_dev_fan_reset, processor_handle, sensor_ind); } -amdsmi_status_t amdsmi_dev_set_fan_speed(amdsmi_processor_handle processor_handle, +amdsmi_status_t amdsmi_set_gpu_fan_speed(amdsmi_processor_handle processor_handle, uint32_t sensor_ind, uint64_t speed) { return rsmi_wrapper(rsmi_dev_fan_speed_set, processor_handle, sensor_ind, speed); @@ -948,7 +948,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"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_reset_gpu_fan"}, - {"rsmi_dev_fan_speed_set", "amdsmi_dev_set_fan_speed"}, + {"rsmi_dev_fan_speed_set", "amdsmi_set_gpu_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 ff901e8d37..1ca1313f8d 100755 --- a/tests/amd_smi_test/functional/fan_read_write.cc +++ b/tests/amd_smi_test/functional/fan_read_write.cc @@ -136,7 +136,7 @@ void TestFanReadWrite::Run(void) { std::cout << "Setting fan speed to " << new_speed << std::endl; } - ret = amdsmi_dev_set_fan_speed(processor_handles_[dv_ind], 0, new_speed); + ret = amdsmi_set_gpu_fan_speed(processor_handles_[dv_ind], 0, new_speed); CHK_ERR_ASRT(ret) sleep(4); diff --git a/tests/amd_smi_test/functional/mutual_exclusion.cc b/tests/amd_smi_test/functional/mutual_exclusion.cc index 5977b36e09..1f00f4e6e6 100755 --- a/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -233,7 +233,7 @@ void TestMutualExclusion::Run(void) { CHECK_RET(ret, AMDSMI_STATUS_BUSY); 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); + ret = amdsmi_set_gpu_fan_speed(processor_handles_[0], dmy_ui32, 0); CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_dev_get_perf_level(processor_handles_[0], &dmy_perf_lvl); CHECK_RET(ret, AMDSMI_STATUS_BUSY); @@ -277,7 +277,7 @@ void TestMutualExclusion::Run(void) { amdsmi_get_gpu_fan_speed amdsmi_get_gpu_fan_rpms amdsmi_reset_gpu_fan - amdsmi_dev_set_fan_speed + amdsmi_set_gpu_fan_speed amdsmi_get_gpu_fan_speed_max amdsmi_dev_get_od_volt_info amdsmi_dev_get_gpu_metrics_info