Renamed API amdsmi_dev_get_memory_usage to
amdsmi_get_gpu_memory_usage
grep -rli 'amdsmi_dev_get_memory_usage' * | xargs -i@ sed -i
's/amdsmi_dev_get_memory_usage/amdsmi_get_gpu_memory_usage/g' @
Change-Id: I04f44c7d7c06490d25f136c77ba545c3010a2e18
[ROCm/amdsmi commit: 84613dcf1d]
Этот коммит содержится в:
Deepak Mewar
коммит произвёл
Naveen Krishna Chatradhi
Naveen Krishna Chatradhi
родитель
4a662552fb
Коммит
cd92afe97e
@@ -1782,7 +1782,7 @@ amdsmi_get_gpu_memory_total(amdsmi_processor_handle processor_handle, amdsmi_mem
|
||||
* @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail
|
||||
*/
|
||||
amdsmi_status_t
|
||||
amdsmi_dev_get_memory_usage(amdsmi_processor_handle processor_handle, amdsmi_memory_type_t mem_type,
|
||||
amdsmi_get_gpu_memory_usage(amdsmi_processor_handle processor_handle, amdsmi_memory_type_t mem_type,
|
||||
uint64_t *used);
|
||||
|
||||
/**
|
||||
|
||||
@@ -1627,7 +1627,7 @@ except AmdSmiException as e:
|
||||
```
|
||||
|
||||
|
||||
## amdsmi_dev_get_memory_usage
|
||||
## amdsmi_get_gpu_memory_usage
|
||||
|
||||
Description: Get the current memory usage
|
||||
|
||||
@@ -1638,7 +1638,7 @@ Input parameters:
|
||||
|
||||
Output: the amount of memory currently being used
|
||||
|
||||
Exceptions that can be thrown by `amdsmi_dev_get_memory_usage` function:
|
||||
Exceptions that can be thrown by `amdsmi_get_gpu_memory_usage` function:
|
||||
* `AmdSmiLibraryException`
|
||||
* `AmdSmiRetryException`
|
||||
* `AmdSmiParameterException`
|
||||
@@ -1651,7 +1651,7 @@ try:
|
||||
print("No GPUs on machine")
|
||||
else:
|
||||
for device in devices:
|
||||
memory = amdsmi_dev_get_memory_usage(device)
|
||||
memory = amdsmi_get_gpu_memory_usage(device)
|
||||
print(memory)
|
||||
except AmdSmiException as e:
|
||||
print(e)
|
||||
|
||||
@@ -149,7 +149,7 @@ from .amdsmi_interface import amdsmi_get_energy_count
|
||||
|
||||
# # Memory information
|
||||
from .amdsmi_interface import amdsmi_get_gpu_memory_total
|
||||
from .amdsmi_interface import amdsmi_dev_get_memory_usage
|
||||
from .amdsmi_interface import amdsmi_get_gpu_memory_usage
|
||||
from .amdsmi_interface import amdsmi_dev_get_memory_busy_percent
|
||||
from .amdsmi_interface import amdsmi_dev_get_memory_reserved_pages
|
||||
|
||||
|
||||
@@ -1977,7 +1977,7 @@ def amdsmi_dev_set_od_clk_info(
|
||||
)
|
||||
|
||||
|
||||
def amdsmi_dev_get_memory_usage(processor_handle: amdsmi_wrapper.amdsmi_processor_handle, mem_type: AmdSmiMemoryType):
|
||||
def amdsmi_get_gpu_memory_usage(processor_handle: amdsmi_wrapper.amdsmi_processor_handle, mem_type: AmdSmiMemoryType):
|
||||
if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle):
|
||||
raise AmdSmiParameterException(
|
||||
processor_handle, amdsmi_wrapper.amdsmi_processor_handle
|
||||
@@ -1991,7 +1991,7 @@ def amdsmi_dev_get_memory_usage(processor_handle: amdsmi_wrapper.amdsmi_processo
|
||||
used = ctypes.c_uint64()
|
||||
|
||||
_check_res(
|
||||
amdsmi_wrapper.amdsmi_dev_get_memory_usage(
|
||||
amdsmi_wrapper.amdsmi_get_gpu_memory_usage(
|
||||
processor_handle, mem_type, ctypes.byref(used))
|
||||
)
|
||||
|
||||
|
||||
@@ -1472,9 +1472,9 @@ amdsmi_set_gpu_power_profile.argtypes = [amdsmi_processor_handle, uint32_t, amds
|
||||
amdsmi_get_gpu_memory_total = _libraries['libamd_smi.so'].amdsmi_get_gpu_memory_total
|
||||
amdsmi_get_gpu_memory_total.restype = amdsmi_status_t
|
||||
amdsmi_get_gpu_memory_total.argtypes = [amdsmi_processor_handle, amdsmi_memory_type_t, ctypes.POINTER(ctypes.c_uint64)]
|
||||
amdsmi_dev_get_memory_usage = _libraries['libamd_smi.so'].amdsmi_dev_get_memory_usage
|
||||
amdsmi_dev_get_memory_usage.restype = amdsmi_status_t
|
||||
amdsmi_dev_get_memory_usage.argtypes = [amdsmi_processor_handle, amdsmi_memory_type_t, ctypes.POINTER(ctypes.c_uint64)]
|
||||
amdsmi_get_gpu_memory_usage = _libraries['libamd_smi.so'].amdsmi_get_gpu_memory_usage
|
||||
amdsmi_get_gpu_memory_usage.restype = amdsmi_status_t
|
||||
amdsmi_get_gpu_memory_usage.argtypes = [amdsmi_processor_handle, amdsmi_memory_type_t, ctypes.POINTER(ctypes.c_uint64)]
|
||||
amdsmi_get_bad_page_info = _libraries['libamd_smi.so'].amdsmi_get_bad_page_info
|
||||
amdsmi_get_bad_page_info.restype = amdsmi_status_t
|
||||
amdsmi_get_bad_page_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_retired_page_record_t)]
|
||||
@@ -1859,7 +1859,7 @@ __all__ = \
|
||||
'amdsmi_dev_get_gpu_clk_freq', 'amdsmi_dev_get_gpu_metrics_info',
|
||||
'amdsmi_get_gpu_id', 'amdsmi_dev_get_memory_busy_percent',
|
||||
'amdsmi_dev_get_memory_reserved_pages',
|
||||
'amdsmi_get_gpu_memory_total', 'amdsmi_dev_get_memory_usage',
|
||||
'amdsmi_get_gpu_memory_total', 'amdsmi_get_gpu_memory_usage',
|
||||
'amdsmi_dev_get_od_volt_curve_regions',
|
||||
'amdsmi_dev_get_od_volt_info', 'amdsmi_dev_get_overdrive_level',
|
||||
'amdsmi_get_gpu_pci_bandwidth', 'amdsmi_get_gpu_pci_id',
|
||||
|
||||
@@ -301,7 +301,7 @@ class Formatter:
|
||||
| """ + self.style.text("12 Get device power ave. Api: amdsmi_get_power_ave <bdf><sensor_id>") + """ |
|
||||
| """ + self.style.text("13 Get device energy count. Api: amdsmi_get_energy_count <bdf>") + """ |
|
||||
| """ + self.style.text("14 Get device memory total. Api: amdsmi_get_gpu_memory_total <bdf>") + """ |
|
||||
| """ + self.style.text("15 Get device memory usage. Api: amdsmi_dev_get_memory_usage <bdf>") + """ |
|
||||
| """ + self.style.text("15 Get device memory usage. Api: amdsmi_get_gpu_memory_usage <bdf>") + """ |
|
||||
| """ + self.style.text("16 Get device memory busy percent. Api: amdsmi_dev_get_memory_busy_percent <bdf>") + """ |
|
||||
| """ + self.style.text("17 Get device memory reserved pages. Api: amdsmi_dev_get_memory_reserved_pages <bdf>") + """ |
|
||||
| """ + self.style.text("18 Get device fan rpms. Api: amdsmi_dev_get_fan_rpms <bdf><sensor_idx>") + """ |
|
||||
@@ -394,7 +394,7 @@ def amdsmi_tool_dev_memory_usage_get(dev):
|
||||
result = {}
|
||||
for memory_type in smi_api.AmdSmiMemoryType:
|
||||
try:
|
||||
value = smi_api.amdsmi_dev_get_memory_usage(dev, memory_type)
|
||||
value = smi_api.amdsmi_get_gpu_memory_usage(dev, memory_type)
|
||||
result.update({memory_type.name: value})
|
||||
except smi_api.AmdSmiException as e:
|
||||
print("{}:\t{}".format(memory_type.name, e))
|
||||
|
||||
@@ -932,7 +932,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle,
|
||||
{"rsmi_dev_gpu_metrics_info_get", " amdsmi_dev_get_gpu_metrics_info"},
|
||||
{"rsmi_dev_gpu_reset", "amdsmi_dev_reset_gpu"},
|
||||
{"rsmi_dev_memory_total_get", "amdsmi_get_gpu_memory_total"},
|
||||
{"rsmi_dev_memory_usage_get", "amdsmi_dev_get_memory_usage"},
|
||||
{"rsmi_dev_memory_usage_get", "amdsmi_get_gpu_memory_usage"},
|
||||
{"rsmi_dev_gpu_clk_freq_get", " amdsmi_dev_get_gpu_clk_freq"},
|
||||
{"rsmi_dev_gpu_clk_freq_set", " amdsmi_dev_set_clk_freq"},
|
||||
{"rsmi_dev_firmware_version_get", "amdsmi_get_fw_info"},
|
||||
@@ -1274,7 +1274,7 @@ amdsmi_status_t amdsmi_get_gpu_memory_total(amdsmi_processor_handle processor_ha
|
||||
return rsmi_wrapper(rsmi_dev_memory_total_get, processor_handle,
|
||||
static_cast<rsmi_memory_type_t>(mem_type), total);
|
||||
}
|
||||
amdsmi_status_t amdsmi_dev_get_memory_usage(amdsmi_processor_handle processor_handle,
|
||||
amdsmi_status_t amdsmi_get_gpu_memory_usage(amdsmi_processor_handle processor_handle,
|
||||
amdsmi_memory_type_t mem_type, uint64_t *used) {
|
||||
return rsmi_wrapper(rsmi_dev_memory_usage_get, processor_handle,
|
||||
static_cast<rsmi_memory_type_t>(mem_type), used);
|
||||
|
||||
@@ -138,9 +138,9 @@ void TestMemUtilRead::Run(void) {
|
||||
return;
|
||||
}
|
||||
|
||||
err = amdsmi_dev_get_memory_usage(processor_handles_[i],
|
||||
err = amdsmi_get_gpu_memory_usage(processor_handles_[i],
|
||||
static_cast<amdsmi_memory_type_t>(mem_type), &usage);
|
||||
err_chk("amdsmi_dev_get_memory_usage()");
|
||||
err_chk("amdsmi_get_gpu_memory_usage()");
|
||||
if (err != AMDSMI_STATUS_SUCCESS) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -290,7 +290,7 @@ void TestMutualExclusion::Run(void) {
|
||||
amdsmi_dev_get_power_profile_presets
|
||||
amdsmi_set_gpu_power_profile
|
||||
amdsmi_get_gpu_memory_total
|
||||
amdsmi_dev_get_memory_usage
|
||||
amdsmi_get_gpu_memory_usage
|
||||
amdsmi_dev_get_memory_busy_percent
|
||||
amdsmi_dev_get_busy_percent
|
||||
amdsmi_dev_vbios_version_get
|
||||
|
||||
Ссылка в новой задаче
Block a user