AI/rocm-systems
2
0
Garpu 0
Kode Masalah Tarik Permintaan Actions Packages Projects Rilis Wiki Kegiatan

Renamed API amdsmi_dev_get_temp_metric to

Telusuri Sumber 
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
This commit is contained in:
Deepak Mewar
2023-02-25 08:23:10 -05:00
committed by Naveen Krishna Chatradhi
orang tua 3b62d7629f
melakukan d3289258b4
12 mengubah file dengan 34 tambahan dan 34 penghapusan
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
Melihat File
@@ -143,7 +143,7 @@ int main() {
// Get temperature
int64_t val_i64 = 0;
ret = amdsmi_dev_get_temp_metric(processor_handles[j], TEMPERATURE_TYPE_EDGE,
ret = amdsmi_get_temp_metric(processor_handles[j], TEMPERATURE_TYPE_EDGE,
AMDSMI_TEMP_CURRENT, &val_i64);
std::cout << "\t\tTemperature: " << val_i64 << "C" << std::endl;
}
example/amd_smi_drm_example.cc
+7 -7
Melihat File
@@ -394,15 +394,15 @@ int main() {
// Get VRAM temperature limit
int64_t temperature = 0;
ret = amdsmi_dev_get_temp_metric(
ret = amdsmi_get_temp_metric(
processor_handles[j], TEMPERATURE_TYPE_VRAM,
AMDSMI_TEMP_CRITICAL, &temperature);
CHK_AMDSMI_RET(ret)
printf(" Output of amdsmi_dev_get_temp_metric:\n");
printf(" Output of amdsmi_get_temp_metric:\n");
printf("\tGPU VRAM temp limit: %ld\n", temperature);
// Get GFX temperature limit
ret = amdsmi_dev_get_temp_metric(
ret = amdsmi_get_temp_metric(
processor_handles[j], TEMPERATURE_TYPE_EDGE,
AMDSMI_TEMP_CRITICAL, &temperature);
CHK_AMDSMI_RET(ret)
@@ -416,13 +416,13 @@ int main() {
TEMPERATURE_TYPE_EDGE, TEMPERATURE_TYPE_JUNCTION,
TEMPERATURE_TYPE_VRAM, TEMPERATURE_TYPE_PLX};
for (const auto &temp_type : temp_types) {
ret = amdsmi_dev_get_temp_metric(
ret = amdsmi_get_temp_metric(
processor_handles[j], temp_type,
AMDSMI_TEMP_CURRENT,
&temp_measurements[(int)(temp_type)]);
CHK_AMDSMI_RET(ret)
}
printf(" Output of amdsmi_dev_get_temp_metric:\n");
printf(" Output of amdsmi_get_temp_metric:\n");
printf("\tGPU Edge temp measurement: %ld\n",
temp_measurements[TEMPERATURE_TYPE_EDGE]);
printf("\tGPU Junction temp measurement: %ld\n",
@@ -636,10 +636,10 @@ int main() {
// Get temperature
int64_t val_i64 = 0;
ret = amdsmi_dev_get_temp_metric(processor_handles[j], TEMPERATURE_TYPE_EDGE,
ret = amdsmi_get_temp_metric(processor_handles[j], TEMPERATURE_TYPE_EDGE,
AMDSMI_TEMP_CURRENT, &val_i64);
CHK_AMDSMI_RET(ret)
printf(" Output of amdsmi_dev_get_temp_metric:\n");
printf(" Output of amdsmi_get_temp_metric:\n");
std::cout << "\t\tTemperature: " << val_i64 << "C"
<< "\n\n";
example/amd_smi_nodrm_example.cc
+4 -4
Melihat File
@@ -226,13 +226,13 @@ int main() {
TEMPERATURE_TYPE_EDGE, TEMPERATURE_TYPE_JUNCTION,
TEMPERATURE_TYPE_VRAM, TEMPERATURE_TYPE_PLX};
for (const auto &temp_type : temp_types) {
ret = amdsmi_dev_get_temp_metric(
ret = amdsmi_get_temp_metric(
processor_handles[j], temp_type,
AMDSMI_TEMP_CURRENT,
&temp_measurements[(int)(temp_type)]);
CHK_AMDSMI_RET(ret)
}
printf(" Output of amdsmi_dev_get_temp_metric:\n");
printf(" Output of amdsmi_get_temp_metric:\n");
printf("\tGPU Edge temp measurement: %ld\n",
temp_measurements[TEMPERATURE_TYPE_EDGE]);
printf("\tGPU Junction temp measurement: %ld\n",
@@ -300,10 +300,10 @@ int main() {
// Get temperature
int64_t val_i64 = 0;
ret = amdsmi_dev_get_temp_metric(processor_handles[j], TEMPERATURE_TYPE_EDGE,
ret = amdsmi_get_temp_metric(processor_handles[j], TEMPERATURE_TYPE_EDGE,
AMDSMI_TEMP_CURRENT, &val_i64);
CHK_AMDSMI_RET(ret)
printf(" Output of amdsmi_dev_get_temp_metric:\n");
printf(" Output of amdsmi_get_temp_metric:\n");
std::cout << "\t\tTemperature: " << val_i64 << "C"
<< "\n\n";
include/amd_smi/amdsmi.h
+3 -3
Melihat File
@@ -1990,7 +1990,7 @@ amdsmi_status_t amdsmi_get_gpu_fan_speed_max(amdsmi_processor_handle processor_h
*
* @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail
*/
amdsmi_status_t amdsmi_dev_get_temp_metric(amdsmi_processor_handle processor_handle,
amdsmi_status_t amdsmi_get_temp_metric(amdsmi_processor_handle processor_handle,
amdsmi_temperature_type_t sensor_type,
amdsmi_temperature_metric_t metric, int64_t *temperature);
@@ -3244,14 +3244,14 @@ amdsmi_is_P2P_accessible(amdsmi_processor_handle processor_handle_src, amdsmi_pr
*
* Some functions have several variations ("variants") where some variants are
* supported and others are not. For example, on a given device,
* :: amdsmi_dev_get_temp_metric may support some types of temperature metrics
* :: amdsmi_get_temp_metric may support some types of temperature metrics
* (e.g., ::AMDSMI_TEMP_CRITICAL_HYST), but not others
* (e.g., ::AMDSMI_TEMP_EMERGENCY).
*
* In addition to a top level of variant support for a function, a function
* may have varying support for monitors/sensors. These are considered
* "sub-variants" in functions described in this section. Continuing the
* :: amdsmi_dev_get_temp_metric example, if variant
* :: amdsmi_get_temp_metric example, if variant
* ::AMDSMI_TEMP_CRITICAL_HYST is supported, perhaps
* only the sub-variant sensors ::AMDSMI_TEMP_TYPE_EDGE
* and ::AMDSMI_TEMP_TYPE_EDGE are supported, but not
py-interface/README.md
+3 -3
Melihat File
@@ -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
+1 -1
Melihat File
@@ -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
+2 -2
Melihat File
@@ -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
+4 -4
Melihat File
@@ -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
+2 -2
Melihat File
@@ -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))
src/amd_smi/amd_smi.cc
+2 -2
Melihat File
@@ -319,7 +319,7 @@ amdsmi_status_t amdsmi_get_gpu_board_info(amdsmi_processor_handle processor_hand
return AMDSMI_STATUS_SUCCESS;
}
amdsmi_status_t amdsmi_dev_get_temp_metric(amdsmi_processor_handle processor_handle,
amdsmi_status_t amdsmi_get_temp_metric(amdsmi_processor_handle processor_handle,
amdsmi_temperature_type_t sensor_type,
amdsmi_temperature_metric_t metric, int64_t *temperature) {
@@ -946,7 +946,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle,
{"rsmi_dev_fan_rpms_get", "amdsmi_get_gpu_fan_rpms"},
{"rsmi_dev_fan_speed_get", "amdsmi_get_gpu_fan_speed"},
{"rsmi_dev_fan_speed_max_get", "amdsmi_get_gpu_fan_speed_max"},
{"rsmi_dev_temp_metric_get", " amdsmi_dev_get_temp_metric"},
{"rsmi_dev_temp_metric_get", " amdsmi_get_temp_metric"},
{"rsmi_dev_fan_reset", "amdsmi_dev_reset_fan"},
{"rsmi_dev_fan_speed_set", "amdsmi_dev_set_fan_speed"},
{"rsmi_dev_volt_metric_get", " amdsmi_dev_get_volt_metric"}
tests/amd_smi_test/functional/mutual_exclusion.cc
+2 -2
Melihat File
@@ -229,7 +229,7 @@ void TestMutualExclusion::Run(void) {
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
ret = amdsmi_get_gpu_fan_speed_max(processor_handles_[0], 0, &dmy_ui64);
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
ret = amdsmi_dev_get_temp_metric(processor_handles_[0], TEMPERATURE_TYPE_EDGE, AMDSMI_TEMP_CURRENT, &dmy_i64);
ret = amdsmi_get_temp_metric(processor_handles_[0], TEMPERATURE_TYPE_EDGE, AMDSMI_TEMP_CURRENT, &dmy_i64);
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
ret = amdsmi_dev_reset_fan(processor_handles_[0], 0);
CHECK_RET(ret, AMDSMI_STATUS_BUSY);
@@ -272,7 +272,7 @@ void TestMutualExclusion::Run(void) {
amdsmi_get_gpu_pci_bandwidth
amdsmi_set_gpu_pci_bandwidth
amdsmi_get_gpu_pci_throughput
amdsmi_dev_get_temp_metric
amdsmi_get_temp_metric
amdsmi_dev_get_volt_metric
amdsmi_get_gpu_fan_speed
amdsmi_get_gpu_fan_rpms
tests/amd_smi_test/functional/temp_read.cc
+3 -3
Melihat File
@@ -114,7 +114,7 @@ void TestTempRead::Run(void) {
auto print_temp_metric = [&](amdsmi_temperature_metric_t met,
std::string label) {
err = amdsmi_dev_get_temp_metric(processor_handles_[i], static_cast<amdsmi_temperature_type_t>(type), met, &val_i64);
err = amdsmi_get_temp_metric(processor_handles_[i], static_cast<amdsmi_temperature_type_t>(type), met, &val_i64);
if (err != AMDSMI_STATUS_SUCCESS) {
if (err == AMDSMI_STATUS_NOT_SUPPORTED) {
@@ -124,7 +124,7 @@ void TestTempRead::Run(void) {
}
// Verify api support checking functionality is working
err = amdsmi_dev_get_temp_metric(processor_handles_[i], static_cast<amdsmi_temperature_type_t>(type), met, nullptr);
err = amdsmi_get_temp_metric(processor_handles_[i], static_cast<amdsmi_temperature_type_t>(type), met, nullptr);
ASSERT_EQ(err, AMDSMI_STATUS_INVAL);
return;
} else {
@@ -132,7 +132,7 @@ void TestTempRead::Run(void) {
}
}
// Verify api support checking functionality is working
err = amdsmi_dev_get_temp_metric(processor_handles_[i], static_cast<amdsmi_temperature_type_t>(type), met, nullptr);
err = amdsmi_get_temp_metric(processor_handles_[i], static_cast<amdsmi_temperature_type_t>(type), met, nullptr);
ASSERT_EQ(err, AMDSMI_STATUS_INVAL);
IF_VERB(STANDARD) {