Renamed APIs

1) amdsmi_dev_get_fan_speed to amdsmi_get_gpu_fan_speed
2) amdsmi_dev_get_fan_speed_max to amdsmi_get_gpu_fan_speed_max

grep -rli 'amdsmi_dev_get_fan_speed' * | xargs -i@ sed -i
's/amdsmi_dev_get_fan_speed/amdsmi_get_gpu_fan_speed/g' @

Change-Id: I74e93885fe3335bbde8294e3b0863256bb044fcb
This commit is contained in:
Deepak Mewar
2023-02-25 08:15:36 -05:00
committed by Naveen Krishna Chatradhi
parent 825b12a437
commit 3b62d7629f
10 changed files with 41 additions and 41 deletions
+6 -6
View File
@@ -1775,7 +1775,7 @@ try:
except AmdSmiException as e:
print(e)
```
## amdsmi_dev_get_fan_speed
## amdsmi_get_gpu_fan_speed
Description: Get the fan speed for the specified device as a value relative to
AMDSMI_MAX_FAN_SPEED
@@ -1786,7 +1786,7 @@ more than one sensor, it could be greater than 0.
Output: Fan speed in relative to MAX
Exceptions that can be thrown by `amdsmi_dev_get_fan_speed` function:
Exceptions that can be thrown by `amdsmi_get_gpu_fan_speed` function:
* `AmdSmiLibraryException`
* `AmdSmiRetryException`
* `AmdSmiParameterException`
@@ -1799,12 +1799,12 @@ try:
print("No GPUs on machine")
else:
for device in devices:
fan_speed = amdsmi_dev_get_fan_speed(device, 0)
fan_speed = amdsmi_get_gpu_fan_speed(device, 0)
print(fan_speed)
except AmdSmiException as e:
print(e)
```
## amdsmi_dev_get_fan_speed_max
## amdsmi_get_gpu_fan_speed_max
Description: Get the max fan speed of the device with provided device handle
Input parameters:
@@ -1814,7 +1814,7 @@ more than one sensor, it could be greater than 0.
Output: Max fan speed as integer
Exceptions that can be thrown by `amdsmi_dev_get_fan_speed_max` function:
Exceptions that can be thrown by `amdsmi_get_gpu_fan_speed_max` function:
* `AmdSmiLibraryException`
* `AmdSmiRetryException`
* `AmdSmiParameterException`
@@ -1827,7 +1827,7 @@ try:
print("No GPUs on machine")
else:
for device in devices:
max_fan_speed = amdsmi_dev_get_fan_speed_max(device, 0)
max_fan_speed = amdsmi_get_gpu_fan_speed_max(device, 0)
print(max_fan_speed)
except AmdSmiException as e:
print(e)
+2 -2
View File
@@ -98,8 +98,8 @@ from .amdsmi_interface import amdsmi_dev_set_overdrive_level
# # Physical State Queries
from .amdsmi_interface import amdsmi_get_gpu_fan_rpms
from .amdsmi_interface import amdsmi_dev_get_fan_speed
from .amdsmi_interface import amdsmi_dev_get_fan_speed_max
from .amdsmi_interface import amdsmi_get_gpu_fan_speed
from .amdsmi_interface import amdsmi_get_gpu_fan_speed_max
from .amdsmi_interface import amdsmi_dev_get_temp_metric
from .amdsmi_interface import amdsmi_dev_get_volt_metric
+4 -4
View File
@@ -2079,7 +2079,7 @@ def amdsmi_get_gpu_fan_rpms(
return fan_speed.value
def amdsmi_dev_get_fan_speed(
def amdsmi_get_gpu_fan_speed(
processor_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_idx: int
) -> int:
if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle):
@@ -2090,7 +2090,7 @@ def amdsmi_dev_get_fan_speed(
raise AmdSmiParameterException(sensor_idx, int)
fan_speed = ctypes.c_int64()
_check_res(
amdsmi_wrapper.amdsmi_dev_get_fan_speed(
amdsmi_wrapper.amdsmi_get_gpu_fan_speed(
processor_handle, sensor_idx, ctypes.byref(fan_speed)
)
)
@@ -2098,7 +2098,7 @@ def amdsmi_dev_get_fan_speed(
return fan_speed.value
def amdsmi_dev_get_fan_speed_max(
def amdsmi_get_gpu_fan_speed_max(
processor_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_idx: int
) -> int:
if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle):
@@ -2109,7 +2109,7 @@ def amdsmi_dev_get_fan_speed_max(
raise AmdSmiParameterException(sensor_idx, int)
fan_speed = ctypes.c_uint64()
_check_res(
amdsmi_wrapper.amdsmi_dev_get_fan_speed_max(
amdsmi_wrapper.amdsmi_get_gpu_fan_speed_max(
processor_handle, sensor_idx, ctypes.byref(fan_speed)
)
)
+7 -7
View File
@@ -1490,12 +1490,12 @@ amdsmi_get_gpu_memory_reserved_pages.argtypes = [amdsmi_processor_handle, ctypes
amdsmi_get_gpu_fan_rpms = _libraries['libamd_smi.so'].amdsmi_get_gpu_fan_rpms
amdsmi_get_gpu_fan_rpms.restype = amdsmi_status_t
amdsmi_get_gpu_fan_rpms.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_int64)]
amdsmi_dev_get_fan_speed = _libraries['libamd_smi.so'].amdsmi_dev_get_fan_speed
amdsmi_dev_get_fan_speed.restype = amdsmi_status_t
amdsmi_dev_get_fan_speed.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_int64)]
amdsmi_dev_get_fan_speed_max = _libraries['libamd_smi.so'].amdsmi_dev_get_fan_speed_max
amdsmi_dev_get_fan_speed_max.restype = amdsmi_status_t
amdsmi_dev_get_fan_speed_max.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_uint64)]
amdsmi_get_gpu_fan_speed = _libraries['libamd_smi.so'].amdsmi_get_gpu_fan_speed
amdsmi_get_gpu_fan_speed.restype = amdsmi_status_t
amdsmi_get_gpu_fan_speed.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_int64)]
amdsmi_get_gpu_fan_speed_max = _libraries['libamd_smi.so'].amdsmi_get_gpu_fan_speed_max
amdsmi_get_gpu_fan_speed_max.restype = amdsmi_status_t
amdsmi_get_gpu_fan_speed_max.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_uint64)]
amdsmi_dev_get_temp_metric = _libraries['libamd_smi.so'].amdsmi_dev_get_temp_metric
amdsmi_dev_get_temp_metric.restype = amdsmi_status_t
amdsmi_dev_get_temp_metric.argtypes = [amdsmi_processor_handle, amdsmi_temperature_type_t, amdsmi_temperature_metric_t, ctypes.POINTER(ctypes.c_int64)]
@@ -1855,7 +1855,7 @@ __all__ = \
'amdsmi_get_gpu_drm_render_minor', 'amdsmi_dev_get_ecc_count',
'amdsmi_dev_get_ecc_enabled', 'amdsmi_dev_get_ecc_status',
'amdsmi_get_energy_count', 'amdsmi_get_gpu_fan_rpms',
'amdsmi_dev_get_fan_speed', 'amdsmi_dev_get_fan_speed_max',
'amdsmi_get_gpu_fan_speed', 'amdsmi_get_gpu_fan_speed_max',
'amdsmi_dev_get_gpu_clk_freq', 'amdsmi_dev_get_gpu_metrics_info',
'amdsmi_get_gpu_id', 'amdsmi_get_gpu_memory_busy_percent',
'amdsmi_get_gpu_memory_reserved_pages',
+4 -4
View File
@@ -305,8 +305,8 @@ class Formatter:
| """ + self.style.text("16 Get device memory busy percent. Api: amdsmi_get_gpu_memory_busy_percent <bdf>") + """ |
| """ + self.style.text("17 Get device memory reserved pages. Api: amdsmi_get_gpu_memory_reserved_pages <bdf>") + """ |
| """ + self.style.text("18 Get device fan rpms. Api: amdsmi_get_gpu_fan_rpms <bdf><sensor_idx>") + """ |
| """ + self.style.text("19 Get device fan speed. Api: amdsmi_dev_get_fan_speed <bdf><sensor_idx>") + """ |
| """ + self.style.text("20 Get device fan speed max. Api: amdsmi_dev_get_fan_speed_max <bdf><sensor_idx>") + """ |
| """ + self.style.text("19 Get device fan speed. Api: amdsmi_get_gpu_fan_speed <bdf><sensor_idx>") + """ |
| """ + self.style.text("20 Get device fan speed max. Api: amdsmi_get_gpu_fan_speed_max <bdf><sensor_idx>") + """ |
| """ + self.style.text("21 Get device temp metric. Api: amdsmi_dev_get_temp_metric <bdf>") + """ |
| """ + self.style.text("22 Get device volt metric. Api: amdsmi_dev_get_volt_metric <bdf>") + """ |
| """ + self.style.text("23 Get device busy percent. Api: amdsmi_dev_get_busy_percent <bdf>") + """ |
@@ -407,11 +407,11 @@ def amdsmi_tool_dev_fan_rpms_get(dev, dic):
def amdsmi_tool_dev_fan_speed_get(dev, dic):
sensor_idx = dic["sensor_idx"]
return smi_api.amdsmi_dev_get_fan_speed(dev, sensor_idx)
return smi_api.amdsmi_get_gpu_fan_speed(dev, sensor_idx)
def amdsmi_tool_dev_fan_speed_max_get(dev, dic):
sensor_idx = dic["sensor_idx"]
return smi_api.amdsmi_dev_get_fan_speed_max(dev, sensor_idx)
return smi_api.amdsmi_get_gpu_fan_speed_max(dev, sensor_idx)
def amdsmi_tool_dev_temp_metric_get(dev):
result = {}