From 66ee0ae0c6156f5ce2e6100a2c0bfa81e1b52904 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Sat, 25 Feb 2023 08:02:08 -0500 Subject: [PATCH] Renamed API amdsmi_dev_set_power_cap to amdsmi_set_power_cap grep -rli 'amdsmi_dev_set_power_cap' * | xargs -i@ sed -i 's/amdsmi_dev_set_power_cap/amdsmi_set_power_cap/g' @ Change-Id: I226f90f0fce12ea4f832a2ea46c3dc60f6e9fe23 [ROCm/amdsmi commit: 757765a1e33d5338170bc62d3c22d022e20bc323] --- 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 ++-- .../tests/amd_smi_test/functional/mutual_exclusion.cc | 2 +- .../tests/amd_smi_test/functional/power_cap_read_write.cc | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index b5e69e69a1..5b354ca56b 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -1705,7 +1705,7 @@ amdsmi_get_energy_count(amdsmi_processor_handle processor_handle, uint64_t *powe * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t - amdsmi_dev_set_power_cap(amdsmi_processor_handle processor_handle, uint32_t sensor_ind, uint64_t cap); + amdsmi_set_power_cap(amdsmi_processor_handle processor_handle, uint32_t sensor_ind, uint64_t cap); /** * @brief Set the power performance profile diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index c35d77fe8c..3d8572867e 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -1223,7 +1223,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_dev_set_power_cap +## amdsmi_set_power_cap Description: Set the power cap value Input parameters: @@ -1234,7 +1234,7 @@ device has more than one sensor, it could be greater than 0 Output: None -Exceptions that can be thrown by ` amdsmi_dev_set_power_cap` function: +Exceptions that can be thrown by ` amdsmi_set_power_cap` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -1248,7 +1248,7 @@ try: else: for device in devices: power_cap = 250 * 1000000 - amdsmi_dev_set_power_cap(device, 0, power_cap) + amdsmi_set_power_cap(device, 0, power_cap) except AmdSmiException as e: print(e) ``` diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index a600c50e80..8139c3af04 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -80,7 +80,7 @@ from .amdsmi_interface import amdsmi_get_func_iter_value # # Unsupported Functions In Virtual Environment from .amdsmi_interface import amdsmi_set_gpu_pci_bandwidth -from .amdsmi_interface import amdsmi_dev_set_power_cap +from .amdsmi_interface import amdsmi_set_power_cap from .amdsmi_interface import amdsmi_dev_set_power_profile from .amdsmi_interface import amdsmi_dev_set_clk_range from .amdsmi_interface import amdsmi_dev_set_od_clk_info diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index 7ed7b88e9c..91e2f635ec 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -1817,7 +1817,7 @@ def amdsmi_get_gpu_topo_numa_affinity(processor_handle: amdsmi_wrapper.amdsmi_pr return numa_node.value -def amdsmi_dev_set_power_cap( +def amdsmi_set_power_cap( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_ind: int, cap: int ) -> None: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -1832,7 +1832,7 @@ def amdsmi_dev_set_power_cap( raise AmdSmiParameterException(cap, int) _check_res( - amdsmi_wrapper. amdsmi_dev_set_power_cap( + amdsmi_wrapper. amdsmi_set_power_cap( processor_handle, ctypes.c_uint32(sensor_ind), ctypes.c_uint64(cap) ) ) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index aad9c29fa6..97b5eedad9 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1463,9 +1463,9 @@ amdsmi_get_power_ave.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINT amdsmi_get_energy_count = _libraries['libamd_smi.so'].amdsmi_get_energy_count amdsmi_get_energy_count.restype = amdsmi_status_t amdsmi_get_energy_count.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64), ctypes.POINTER(ctypes.c_float), ctypes.POINTER(ctypes.c_uint64)] -amdsmi_dev_set_power_cap = _libraries['libamd_smi.so'].amdsmi_dev_set_power_cap -amdsmi_dev_set_power_cap.restype = amdsmi_status_t -amdsmi_dev_set_power_cap.argtypes = [amdsmi_processor_handle, uint32_t, uint64_t] +amdsmi_set_power_cap = _libraries['libamd_smi.so'].amdsmi_set_power_cap +amdsmi_set_power_cap.restype = amdsmi_status_t +amdsmi_set_power_cap.argtypes = [amdsmi_processor_handle, uint32_t, uint64_t] amdsmi_dev_set_power_profile = _libraries['libamd_smi.so'].amdsmi_dev_set_power_profile amdsmi_dev_set_power_profile.restype = amdsmi_status_t amdsmi_dev_set_power_profile.argtypes = [amdsmi_processor_handle, uint32_t, amdsmi_power_profile_preset_masks_t] @@ -1880,7 +1880,7 @@ __all__ = \ 'amdsmi_dev_set_overdrive_level', 'amdsmi_dev_set_overdrive_level_v1', 'amdsmi_set_gpu_pci_bandwidth', 'amdsmi_dev_set_perf_level', - 'amdsmi_dev_set_perf_level_v1', 'amdsmi_dev_set_power_cap', + 'amdsmi_dev_set_perf_level_v1', 'amdsmi_set_power_cap', 'amdsmi_dev_set_power_profile', 'amdsmi_dev_xgmi_error_status', 'amdsmi_processor_handle', 'amdsmi_engine_usage_t', 'amdsmi_error_count_t', 'amdsmi_event_group_t', diff --git a/projects/amdsmi/py-interface/rocm_smi_tool.py b/projects/amdsmi/py-interface/rocm_smi_tool.py index 2e976eb059..a8b5ad09aa 100644 --- a/projects/amdsmi/py-interface/rocm_smi_tool.py +++ b/projects/amdsmi/py-interface/rocm_smi_tool.py @@ -361,7 +361,7 @@ class Formatter: | """ + self.style.text("72 Set dev pci bandwidth. Api: amdsmi_set_gpu_pci_bandwidth ") + """ | | """ + self.style.text("73 Set dev perf level. Api: amdsmi_dev_set_perf_level ") + """ | | """ + self.style.text("74 Set dev perf level v1. Api: amdsmi_dev_set_perf_level_v1 ") + """ | - | """ + self.style.text("75 Set dev power cap. Api: amdsmi_dev_set_power_cap ") + """ | + | """ + self.style.text("75 Set dev power cap. Api: amdsmi_set_power_cap ") + """ | | """ + self.style.text("76 Set dev power profile. Api: amdsmi_dev_set_power_profile ") + """ | | """ + self.style.text("77 Close dev supported func iterator. Api: amdsmi_dev_close_supported_func_iterator ") + """ | | """ + self.style.text("78 Pen dev supported func iterator. Api: amdsmi_dev_open_supported_func_iterator ") + """ | @@ -694,7 +694,7 @@ def amdsmi_tool_dev_perf_level_set_v1(dev): def amdsmi_tool_dev_power_cap_set(dev, dic): sensor_ind = dic["sensor_ind"] cap = dic["cap"] - return smi_api. amdsmi_dev_set_power_cap(dev, sensor_ind, cap) + return smi_api. amdsmi_set_power_cap(dev, sensor_ind, cap) def amdsmi_tool_dev_power_profile_set(dev, dic): result = {} diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index dfae1cb993..1a01dd51cd 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -942,7 +942,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_power_cap_get", "amdsmi_get_power_cap_info"}, {"rsmi_dev_power_cap_default_get", "amdsmi_get_power_cap_info"}, {"rsmi_dev_power_cap_range_get", "amdsmi_get_power_cap_info"}, - {"rsmi_dev_power_cap_set", " amdsmi_dev_set_power_cap"}, + {"rsmi_dev_power_cap_set", " amdsmi_set_power_cap"}, {"rsmi_dev_fan_rpms_get", "amdsmi_dev_get_fan_rpms"}, {"rsmi_dev_fan_speed_get", "amdsmi_dev_get_fan_speed"}, {"rsmi_dev_fan_speed_max_get", "amdsmi_dev_get_fan_speed_max"}, @@ -1124,7 +1124,7 @@ amdsmi_get_power_cap_info(amdsmi_processor_handle processor_handle, } amdsmi_status_t - amdsmi_dev_set_power_cap(amdsmi_processor_handle processor_handle, + amdsmi_set_power_cap(amdsmi_processor_handle processor_handle, uint32_t sensor_ind, uint64_t cap) { return rsmi_wrapper(rsmi_dev_power_cap_set, processor_handle, sensor_ind, cap); diff --git a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc index 53cb2b34b3..41affaf052 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -286,7 +286,7 @@ void TestMutualExclusion::Run(void) { amdsmi_get_power_ave amdsmi_dev_power_cap_get amdsmi_dev_power_cap_range_get - amdsmi_dev_set_power_cap + amdsmi_set_power_cap amdsmi_dev_get_power_profile_presets amdsmi_dev_set_power_profile amdsmi_dev_get_memory_total diff --git a/projects/amdsmi/tests/amd_smi_test/functional/power_cap_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/power_cap_read_write.cc index f26a736d6a..e0b05abe42 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/power_cap_read_write.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/power_cap_read_write.cc @@ -121,7 +121,7 @@ void TestPowerCapReadWrite::Run(void) { std::cout << "Setting new cap to " << new_cap << "..." << std::endl; } start = clock(); - ret = amdsmi_dev_set_power_cap(processor_handles_[dv_ind], 0, new_cap); + ret = amdsmi_set_power_cap(processor_handles_[dv_ind], 0, new_cap); end = clock(); cpu_time_used = ((double) (end - start)) * 1000000UL / CLOCKS_PER_SEC; @@ -139,7 +139,7 @@ void TestPowerCapReadWrite::Run(void) { std::cout << "Resetting cap to " << orig << "..." << std::endl; } - ret = amdsmi_dev_set_power_cap(processor_handles_[dv_ind], 0, orig); + ret = amdsmi_set_power_cap(processor_handles_[dv_ind], 0, orig); CHK_ERR_ASRT(ret) ret = amdsmi_get_power_cap_info(processor_handles_[dv_ind], 0, &info);