AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change sensor_type in amdsmi_dev_get_temp_metric() to enum

Browse Source 
The sensor_type in amdsmi_dev_get_temp_metric() will be changed to
amdsmi_temperature_type_t

Change-Id: I72a7f271b0a55a025acc2ca523062a3d51cc036d


[ROCm/amdsmi commit: 79bd9c1d5f]
This commit is contained in:
Bill(Shuzhou) Liu
2023-01-04 12:30:11 -06:00
parent 2d97dee0c2
commit f29da5cce9
8 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/amdsmi/README.md
+1 -1
View File
@@ -133,7 +133,7 @@ int main() {
// Get temperature // Get temperature
int64_t val_i64 = 0; int64_t val_i64 = 0;
ret = amdsmi_dev_get_temp_metric(device_handles[j], 0, ret = amdsmi_dev_get_temp_metric(device_handles[j], TEMPERATURE_TYPE_EDGE,
AMDSMI_TEMP_CURRENT, &val_i64); AMDSMI_TEMP_CURRENT, &val_i64);
std::cout << "\t\tTemperature: " << val_i64/1000 << "C" << std::endl; std::cout << "\t\tTemperature: " << val_i64/1000 << "C" << std::endl;
} }
projects/amdsmi/example/amd_smi_drm_example.cc
+1 -1
View File
@@ -649,7 +649,7 @@ int main() {
// Get temperature // Get temperature
int64_t val_i64 = 0; int64_t val_i64 = 0;
ret = amdsmi_dev_get_temp_metric(device_handles[j], 0, ret = amdsmi_dev_get_temp_metric(device_handles[j], TEMPERATURE_TYPE_EDGE,
AMDSMI_TEMP_CURRENT, &val_i64); AMDSMI_TEMP_CURRENT, &val_i64);
CHK_AMDSMI_RET(ret) CHK_AMDSMI_RET(ret)
printf(" Output of amdsmi_dev_get_temp_metric:\n"); printf(" Output of amdsmi_dev_get_temp_metric:\n");
projects/amdsmi/example/amd_smi_nodrm_example.cc
+1 -1
View File
@@ -299,7 +299,7 @@ int main() {
// Get temperature // Get temperature
int64_t val_i64 = 0; int64_t val_i64 = 0;
ret = amdsmi_dev_get_temp_metric(device_handles[j], 0, ret = amdsmi_dev_get_temp_metric(device_handles[j], TEMPERATURE_TYPE_EDGE,
AMDSMI_TEMP_CURRENT, &val_i64); AMDSMI_TEMP_CURRENT, &val_i64);
CHK_AMDSMI_RET(ret) CHK_AMDSMI_RET(ret)
printf(" Output of amdsmi_dev_get_temp_metric:\n"); printf(" Output of amdsmi_dev_get_temp_metric:\n");
projects/amdsmi/include/amd_smi/amdsmi.h
+2 -1
View File
@@ -2029,7 +2029,8 @@ amdsmi_status_t amdsmi_dev_get_fan_speed_max(amdsmi_device_handle device_handle,
* *
* @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail
*/ */
amdsmi_status_t amdsmi_dev_get_temp_metric(amdsmi_device_handle device_handle, uint32_t sensor_type, amdsmi_status_t amdsmi_dev_get_temp_metric(amdsmi_device_handle device_handle,
amdsmi_temperature_type_t sensor_type,
amdsmi_temperature_metric_t metric, int64_t *temperature); amdsmi_temperature_metric_t metric, int64_t *temperature);
/** /**
projects/amdsmi/py-interface/amdsmi_wrapper.py
+1 -1
View File
@@ -1528,7 +1528,7 @@ amdsmi_dev_get_fan_speed_max.restype = amdsmi_status_t
amdsmi_dev_get_fan_speed_max.argtypes = [amdsmi_device_handle, uint32_t, ctypes.POINTER(ctypes.c_uint64)] amdsmi_dev_get_fan_speed_max.argtypes = [amdsmi_device_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 = _libraries['libamd_smi.so'].amdsmi_dev_get_temp_metric
amdsmi_dev_get_temp_metric.restype = amdsmi_status_t amdsmi_dev_get_temp_metric.restype = amdsmi_status_t
amdsmi_dev_get_temp_metric.argtypes = [amdsmi_device_handle, uint32_t, amdsmi_temperature_metric_t, ctypes.POINTER(ctypes.c_int64)] amdsmi_dev_get_temp_metric.argtypes = [amdsmi_device_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 = _libraries['libamd_smi.so'].amdsmi_dev_get_volt_metric
amdsmi_dev_get_volt_metric.restype = amdsmi_status_t amdsmi_dev_get_volt_metric.restype = amdsmi_status_t
amdsmi_dev_get_volt_metric.argtypes = [amdsmi_device_handle, amdsmi_voltage_type_t, amdsmi_voltage_metric_t, ctypes.POINTER(ctypes.c_int64)] amdsmi_dev_get_volt_metric.argtypes = [amdsmi_device_handle, amdsmi_voltage_type_t, amdsmi_voltage_metric_t, ctypes.POINTER(ctypes.c_int64)]
projects/amdsmi/src/amd_smi/amd_smi.cc
+3 -2
View File
@@ -317,7 +317,7 @@ amdsmi_status_t amdsmi_get_board_info(amdsmi_device_handle device_handle, amdsmi
} }
amdsmi_status_t amdsmi_dev_get_temp_metric(amdsmi_device_handle device_handle, amdsmi_status_t amdsmi_dev_get_temp_metric(amdsmi_device_handle device_handle,
uint32_t sensor_type, amdsmi_temperature_type_t sensor_type,
amdsmi_temperature_metric_t metric, int64_t *temperature) { amdsmi_temperature_metric_t metric, int64_t *temperature) {
AMDSMI_CHECK_INIT(); AMDSMI_CHECK_INIT();
@@ -338,7 +338,8 @@ amdsmi_status_t amdsmi_dev_get_temp_metric(amdsmi_device_handle device_handle,
return r_status; return r_status;
} }
return rsmi_wrapper(rsmi_dev_temp_metric_get, device_handle, sensor_type, return rsmi_wrapper(rsmi_dev_temp_metric_get, device_handle,
static_cast<uint32_t>(sensor_type),
static_cast<rsmi_temperature_metric_t>(metric), temperature); static_cast<rsmi_temperature_metric_t>(metric), temperature);
} }
projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc
+1 -1
View File
@@ -229,7 +229,7 @@ void TestMutualExclusion::Run(void) {
CHECK_RET(ret, AMDSMI_STATUS_BUSY); CHECK_RET(ret, AMDSMI_STATUS_BUSY);
ret = amdsmi_dev_get_fan_speed_max(device_handles_[0], 0, &dmy_ui64); ret = amdsmi_dev_get_fan_speed_max(device_handles_[0], 0, &dmy_ui64);
CHECK_RET(ret, AMDSMI_STATUS_BUSY); CHECK_RET(ret, AMDSMI_STATUS_BUSY);
ret = amdsmi_dev_get_temp_metric(device_handles_[0], dmy_ui32, AMDSMI_TEMP_CURRENT, &dmy_i64); ret = amdsmi_dev_get_temp_metric(device_handles_[0], TEMPERATURE_TYPE_EDGE, AMDSMI_TEMP_CURRENT, &dmy_i64);
CHECK_RET(ret, AMDSMI_STATUS_BUSY); CHECK_RET(ret, AMDSMI_STATUS_BUSY);
ret = amdsmi_dev_reset_fan(device_handles_[0], 0); ret = amdsmi_dev_reset_fan(device_handles_[0], 0);
CHECK_RET(ret, AMDSMI_STATUS_BUSY); CHECK_RET(ret, AMDSMI_STATUS_BUSY);
projects/amdsmi/tests/amd_smi_test/functional/temp_read.cc
+3 -3
View File
@@ -114,7 +114,7 @@ void TestTempRead::Run(void) {
auto print_temp_metric = [&](amdsmi_temperature_metric_t met, auto print_temp_metric = [&](amdsmi_temperature_metric_t met,
std::string label) { std::string label) {
err = amdsmi_dev_get_temp_metric(device_handles_[i], type, met, &val_i64); err = amdsmi_dev_get_temp_metric(device_handles_[i], static_cast<amdsmi_temperature_type_t>(type), met, &val_i64);
if (err != AMDSMI_STATUS_SUCCESS) { if (err != AMDSMI_STATUS_SUCCESS) {
if (err == AMDSMI_STATUS_NOT_SUPPORTED) { if (err == AMDSMI_STATUS_NOT_SUPPORTED) {
@@ -124,7 +124,7 @@ void TestTempRead::Run(void) {
} }
// Verify api support checking functionality is working // Verify api support checking functionality is working
err = amdsmi_dev_get_temp_metric(device_handles_[i], type, met, nullptr); err = amdsmi_dev_get_temp_metric(device_handles_[i], static_cast<amdsmi_temperature_type_t>(type), met, nullptr);
ASSERT_EQ(err, AMDSMI_STATUS_INVAL); ASSERT_EQ(err, AMDSMI_STATUS_INVAL);
return; return;
} else { } else {
@@ -132,7 +132,7 @@ void TestTempRead::Run(void) {
} }
} }
// Verify api support checking functionality is working // Verify api support checking functionality is working
err = amdsmi_dev_get_temp_metric(device_handles_[i], type, met, nullptr); err = amdsmi_dev_get_temp_metric(device_handles_[i], static_cast<amdsmi_temperature_type_t>(type), met, nullptr);
ASSERT_EQ(err, AMDSMI_STATUS_INVAL); ASSERT_EQ(err, AMDSMI_STATUS_INVAL);
IF_VERB(STANDARD) { IF_VERB(STANDARD) {