Renamed API amdsmi_dev_get_temp_metric to

amdsmi_get_temp_metric

grep -rli 'amdsmi_dev_get_temp_metric' * | xargs -i@ sed -i
's/amdsmi_dev_get_temp_metric/amdsmi_get_temp_metric/g' @

Change-Id: I4a342f9d1c5183afdeac67506fef73e895911283

py-interface/README.md

@@ -1832,7 +1832,7 @@ try:
 except AmdSmiException as e:
     print(e)
 ```
-##  amdsmi_dev_get_temp_metric
+##  amdsmi_get_temp_metric
 Description: Get the temperature metric value for the specified metric, from the
 specified temperature sensor on the specified device
 
@@ -1843,7 +1843,7 @@ Input parameters:
 
 Output: Temperature as integer in millidegrees Celcius
 
-Exceptions that can be thrown by ` amdsmi_dev_get_temp_metric` function:
+Exceptions that can be thrown by ` amdsmi_get_temp_metric` function:
 * `AmdSmiLibraryException`
 * `AmdSmiRetryException`
 * `AmdSmiParameterException`
@@ -1856,7 +1856,7 @@ try:
         print("No GPUs on machine")
     else:
         for device in devices:
-            temp_metric =  amdsmi_dev_get_temp_metric(device, AmdSmiTemperatureType.EDGE,
+            temp_metric =  amdsmi_get_temp_metric(device, AmdSmiTemperatureType.EDGE,
                             AmdSmiTemperatureMetric.CURRENT)
             print(temp_metric)
 except AmdSmiException as e:

py-interface/__init__.py

@@ -100,7 +100,7 @@ from .amdsmi_interface import  amdsmi_dev_set_overdrive_level
 from .amdsmi_interface import amdsmi_get_gpu_fan_rpms
 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_get_temp_metric
 from .amdsmi_interface import  amdsmi_dev_get_volt_metric
 
 # # Clock, Power and Performance Query

py-interface/amdsmi_interface.py

@@ -2117,7 +2117,7 @@ def amdsmi_get_gpu_fan_speed_max(
     return fan_speed.value
 
 
-def amdsmi_dev_get_temp_metric(
+def amdsmi_get_temp_metric(
     processor_handle: amdsmi_wrapper.amdsmi_processor_handle,
     sensor_type: AmdSmiTemperatureType,
     metric: AmdSmiTemperatureMetric,
@@ -2133,7 +2133,7 @@ def amdsmi_dev_get_temp_metric(
 
     temp_value = ctypes.c_int64()
     _check_res(
-        amdsmi_wrapper. amdsmi_dev_get_temp_metric(
+        amdsmi_wrapper. amdsmi_get_temp_metric(
             processor_handle, sensor_type, metric, ctypes.byref(temp_value)
         )
     )

py-interface/amdsmi_wrapper.py

@@ -1496,9 +1496,9 @@ amdsmi_get_gpu_fan_speed.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.P
 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)]
+amdsmi_get_temp_metric = _libraries['libamd_smi.so'].amdsmi_get_temp_metric
+amdsmi_get_temp_metric.restype = amdsmi_status_t
+amdsmi_get_temp_metric.argtypes = [amdsmi_processor_handle, amdsmi_temperature_type_t, amdsmi_temperature_metric_t, ctypes.POINTER(ctypes.c_int64)]
 amdsmi_dev_get_volt_metric = _libraries['libamd_smi.so'].amdsmi_dev_get_volt_metric
 amdsmi_dev_get_volt_metric.restype = amdsmi_status_t
 amdsmi_dev_get_volt_metric.argtypes = [amdsmi_processor_handle, amdsmi_voltage_type_t, amdsmi_voltage_metric_t, ctypes.POINTER(ctypes.c_int64)]
@@ -1868,7 +1868,7 @@ __all__ = \
     'amdsmi_get_power_ave',
     'amdsmi_dev_get_power_profile_presets',
     'amdsmi_get_gpu_subsystem_id', 'amdsmi_get_gpu_subsystem_name',
-    'amdsmi_dev_get_temp_metric', 'amdsmi_get_gpu_vendor_name',
+    'amdsmi_get_temp_metric', 'amdsmi_get_gpu_vendor_name',
     'amdsmi_dev_get_volt_metric', 'amdsmi_get_gpu_vram_vendor',
     'amdsmi_dev_open_supported_func_iterator',
     'amdsmi_dev_open_supported_variant_iterator',

py-interface/rocm_smi_tool.py

@@ -307,7 +307,7 @@ class Formatter:
     |     """ + 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_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("21   Get device temp metric.               Api:  amdsmi_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>") + """                        |
     |     """ + self.style.text("24   Get utilization count.                Api: amdsmi_get_utilization_count           <bdf>") + """                        |
@@ -418,7 +418,7 @@ def amdsmi_tool_dev_temp_metric_get(dev):
     for temperature_type in smi_api.AmdSmiTemperatureType:
         for temperature_metric in smi_api.AmdSmiTemperatureMetric:
             try:
-                value = smi_api. amdsmi_dev_get_temp_metric(dev, temperature_type, temperature_metric)
+                value = smi_api. amdsmi_get_temp_metric(dev, temperature_type, temperature_metric)
                 result.update({"AmdSmiTemperatureType: " + temperature_type.name + ", AmdSmiTemperatureMetric: " + temperature_metric.name: value})
             except smi_api.AmdSmiException as e:
                 print("{},{}:\t{}".format(temperature_type.name,  temperature_metric.name, e))