From edd17ebe301acaf60ce0b4fea8a393927ebf4c2a Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Mon, 27 Feb 2023 01:34:28 -0500 Subject: [PATCH] Renamed API amdsmi_get_process_info to amdsmi_get_gpu_process_info grep -rli 'amdsmi_get_process_info' * | xargs -i@ sed -i 's/amdsmi_get_process_info/amdsmi_get_gpu_process_info/g' @ Change-Id: I8f050ed59c926a821894780f9036b9f52c48ef88 [ROCm/amdsmi commit: 64b258ae844c8712767d5d2401cc5fe9c15f0015] --- projects/amdsmi/example/amd_smi_drm_example.cc | 4 ++-- projects/amdsmi/include/amd_smi/amdsmi.h | 2 +- projects/amdsmi/py-interface/README.md | 6 +++--- projects/amdsmi/py-interface/__init__.py | 2 +- projects/amdsmi/py-interface/amdsmi_interface.py | 4 ++-- projects/amdsmi/py-interface/amdsmi_wrapper.py | 8 ++++---- projects/amdsmi/src/amd_smi/amd_smi.cc | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/projects/amdsmi/example/amd_smi_drm_example.cc b/projects/amdsmi/example/amd_smi_drm_example.cc index 7b3be04939..38267cf3d0 100644 --- a/projects/amdsmi/example/amd_smi_drm_example.cc +++ b/projects/amdsmi/example/amd_smi_drm_example.cc @@ -536,10 +536,10 @@ int main() { if (getpid() == process_list[it]) { continue; } - ret = amdsmi_get_process_info(processor_handles[j], + ret = amdsmi_get_gpu_process_info(processor_handles[j], process_list[it], &process); if (ret != AMDSMI_STATUS_SUCCESS) { - printf("amdsmi_get_process_info() failed for " + printf("amdsmi_get_gpu_process_info() failed for " "process_list[%d], returned %d\n", it, ret); continue; diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index d6029f420d..e8d8f370a2 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -3857,7 +3857,7 @@ amdsmi_get_gpu_process_list(amdsmi_processor_handle processor_handle, amdsmi_pro * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_process_info(amdsmi_processor_handle processor_handle, amdsmi_process_handle process, amdsmi_proc_info_t *info); +amdsmi_get_gpu_process_info(amdsmi_processor_handle processor_handle, amdsmi_process_handle process, amdsmi_proc_info_t *info); /** @} End processinfo */ diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index 36d48261c0..96fa1f0f37 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -837,7 +837,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_get_process_info +## amdsmi_get_gpu_process_info Description: Returns the info for the given process Input parameters: @@ -855,7 +855,7 @@ Field | Description `engine_usage`|
Subfield Description
`gfx`GFX engine usage in ns
`compute`Compute engine usage in ns
`dma`DMA engine usage in ns
`enc`Encode engine usage in ns
`dec`Decode engine usage in ns
`memory_usage`|
Subfield Description
`gtt_mem`GTT memory usage
`cpu_mem`CPU memory usage
`vram_mem`VRAM memory usage
-Exceptions that can be thrown by `amdsmi_get_process_info` function: +Exceptions that can be thrown by `amdsmi_get_gpu_process_info` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -870,7 +870,7 @@ try: for device in devices: processes = amdsmi_get_gpu_process_list(device) for process in processes: - print(amdsmi_get_process_info(device, process)) + print(amdsmi_get_gpu_process_info(device, process)) except AmdSmiException as e: print(e) ``` diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index 57726db832..eb530fec69 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -60,7 +60,7 @@ from .amdsmi_interface import amdsmi_get_gpu_target_frequency_range # # Process Information from .amdsmi_interface import amdsmi_get_gpu_process_list -from .amdsmi_interface import amdsmi_get_process_info +from .amdsmi_interface import amdsmi_get_gpu_process_info # # ECC Error Information from .amdsmi_interface import amdsmi_get_gpu_ecc_error_count diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index 57d17608cb..c0c8152256 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -881,7 +881,7 @@ def amdsmi_get_gpu_process_list( return [amdsmi_wrapper.amdsmi_process_handle(x) for x in list(process_list)] -def amdsmi_get_process_info( +def amdsmi_get_gpu_process_info( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, process: amdsmi_wrapper.amdsmi_process_handle, ) -> Dict[str, Any]: @@ -896,7 +896,7 @@ def amdsmi_get_process_info( info = amdsmi_wrapper.amdsmi_proc_info_t() _check_res( - amdsmi_wrapper.amdsmi_get_process_info( + amdsmi_wrapper.amdsmi_get_gpu_process_info( processor_handle, process, ctypes.byref(info) ) ) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index 74d4ad8f7a..c280e974ef 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1712,9 +1712,9 @@ amdsmi_get_gpu_target_frequency_range.argtypes = [amdsmi_processor_handle, amdsm amdsmi_get_gpu_process_list = _libraries['libamd_smi.so'].amdsmi_get_gpu_process_list amdsmi_get_gpu_process_list.restype = amdsmi_status_t amdsmi_get_gpu_process_list.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.c_uint32)] -amdsmi_get_process_info = _libraries['libamd_smi.so'].amdsmi_get_process_info -amdsmi_get_process_info.restype = amdsmi_status_t -amdsmi_get_process_info.argtypes = [amdsmi_processor_handle, amdsmi_process_handle, ctypes.POINTER(struct_c__SA_amdsmi_proc_info_t)] +amdsmi_get_gpu_process_info = _libraries['libamd_smi.so'].amdsmi_get_gpu_process_info +amdsmi_get_gpu_process_info.restype = amdsmi_status_t +amdsmi_get_gpu_process_info.argtypes = [amdsmi_processor_handle, amdsmi_process_handle, ctypes.POINTER(struct_c__SA_amdsmi_proc_info_t)] amdsmi_get_gpu_ecc_error_count = _libraries['libamd_smi.so'].amdsmi_get_gpu_ecc_error_count amdsmi_get_gpu_ecc_error_count.restype = amdsmi_status_t amdsmi_get_gpu_ecc_error_count.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_error_count_t)] @@ -1906,7 +1906,7 @@ __all__ = \ 'amdsmi_get_fw_info', 'amdsmi_get_gpu_activity', 'amdsmi_get_minmax_bandwidth', 'amdsmi_get_pcie_link_caps', 'amdsmi_get_pcie_link_status', 'amdsmi_get_power_cap_info', - 'amdsmi_get_power_measure', 'amdsmi_get_process_info', + 'amdsmi_get_power_measure', 'amdsmi_get_gpu_process_info', 'amdsmi_get_gpu_process_list', 'amdsmi_get_gpu_ras_block_features_enabled', 'amdsmi_get_socket_handles', 'amdsmi_get_socket_info', diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index 98fb246aa0..befaa16d7d 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -1673,7 +1673,7 @@ amdsmi_get_gpu_process_list(amdsmi_processor_handle processor_handle, amdsmi_pro } amdsmi_status_t -amdsmi_get_process_info(amdsmi_processor_handle processor_handle, amdsmi_process_handle process, amdsmi_proc_info_t *info) { +amdsmi_get_gpu_process_info(amdsmi_processor_handle processor_handle, amdsmi_process_handle process, amdsmi_proc_info_t *info) { AMDSMI_CHECK_INIT(); if (info == nullptr) {