From 8bc7c2acc90a9043b81053e67e5beb6c9d70b413 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Mon, 27 Feb 2023 01:44:06 -0500 Subject: [PATCH] Renamed API amdsmi_get_compute_process_gpus to amdsmi_get_gpu_compute_process_gpus grep -rli 'amdsmi_get_compute_process_gpus' * | xargs -i@ sed -i 's/amdsmi_get_compute_process_gpus/amdsmi_get_gpu_compute_process_gpus/g' @ Change-Id: I230bbf85e96983f9e0d2e3c61464c2bf4b353a95 [ROCm/amdsmi commit: 26f8190cb42975566fda383e838d6aeb4d188c49] --- 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 | 6 +++--- projects/amdsmi/py-interface/amdsmi_wrapper.py | 8 ++++---- projects/amdsmi/py-interface/rocm_smi_tool.py | 4 ++-- projects/amdsmi/src/amd_smi/amd_smi.cc | 2 +- .../tests/amd_smi_test/functional/process_info_read.cc | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index 5e6a7a001c..8e9f4ff32c 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -3062,7 +3062,7 @@ amdsmi_get_gpu_compute_process_info_by_pid(uint32_t pid, amdsmi_process_info_t * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_compute_process_gpus(uint32_t pid, uint32_t *dv_indices, +amdsmi_get_gpu_compute_process_gpus(uint32_t pid, uint32_t *dv_indices, uint32_t *num_devices); /** @} End SysInfo */ diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index 87b3323d64..3f2863f896 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -2799,7 +2799,7 @@ except AmdSmiException as e: print(e) ``` -## amdsmi_get_compute_process_gpus +## amdsmi_get_gpu_compute_process_gpus Description: Get the device indices currently being used by a process Input parameters: @@ -2807,7 +2807,7 @@ Input parameters: Output: List of indices of devices currently being used by the process -Exceptions that can be thrown by `amdsmi_get_compute_process_gpus` function: +Exceptions that can be thrown by `amdsmi_get_gpu_compute_process_gpus` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2816,7 +2816,7 @@ Example: ```python try: pid = 0 # << valid pid here - indices = amdsmi_get_compute_process_gpus(pid) + indices = amdsmi_get_gpu_compute_process_gpus(pid) print(indices) except AmdSmiException as e: print(e) diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index c72adbb1f3..efdb066dab 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -132,7 +132,7 @@ from .amdsmi_interface import amdsmi_status_string # # System Information Query from .amdsmi_interface import amdsmi_get_gpu_compute_process_info from .amdsmi_interface import amdsmi_get_gpu_compute_process_info_by_pid -from .amdsmi_interface import amdsmi_get_compute_process_gpus +from .amdsmi_interface import amdsmi_get_gpu_compute_process_gpus from .amdsmi_interface import amdsmi_dev_xgmi_error_status from .amdsmi_interface import amdsmi_dev_reset_xgmi_error diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index 15ec7d3d3a..2e1e05bb8f 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -2581,21 +2581,21 @@ def amdsmi_get_gpu_compute_process_info_by_pid(pid: int) -> Dict[str, int]: } -def amdsmi_get_compute_process_gpus(pid: int) -> List[int]: +def amdsmi_get_gpu_compute_process_gpus(pid: int) -> List[int]: if not isinstance(pid, int): raise AmdSmiParameterException(pid, int) num_devices = ctypes.c_uint32(0) nullptr = ctypes.POINTER(ctypes.c_uint32)() _check_res( - amdsmi_wrapper.amdsmi_get_compute_process_gpus( + amdsmi_wrapper.amdsmi_get_gpu_compute_process_gpus( pid, nullptr, ctypes.byref(num_devices) ) ) dv_indices = (ctypes.c_uint32 * num_devices.value)() _check_res( - amdsmi_wrapper.amdsmi_get_compute_process_gpus( + amdsmi_wrapper.amdsmi_get_gpu_compute_process_gpus( pid, dv_indices, ctypes.byref(num_devices) ) ) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index ca244aad03..afd4f38fff 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1613,9 +1613,9 @@ amdsmi_get_gpu_compute_process_info.argtypes = [ctypes.POINTER(struct_c__SA_amds amdsmi_get_gpu_compute_process_info_by_pid = _libraries['libamd_smi.so'].amdsmi_get_gpu_compute_process_info_by_pid amdsmi_get_gpu_compute_process_info_by_pid.restype = amdsmi_status_t amdsmi_get_gpu_compute_process_info_by_pid.argtypes = [uint32_t, ctypes.POINTER(struct_c__SA_amdsmi_process_info_t)] -amdsmi_get_compute_process_gpus = _libraries['libamd_smi.so'].amdsmi_get_compute_process_gpus -amdsmi_get_compute_process_gpus.restype = amdsmi_status_t -amdsmi_get_compute_process_gpus.argtypes = [uint32_t, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_gpu_compute_process_gpus = _libraries['libamd_smi.so'].amdsmi_get_gpu_compute_process_gpus +amdsmi_get_gpu_compute_process_gpus.restype = amdsmi_status_t +amdsmi_get_gpu_compute_process_gpus.argtypes = [uint32_t, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.c_uint32)] amdsmi_dev_xgmi_error_status = _libraries['libamd_smi.so'].amdsmi_dev_xgmi_error_status amdsmi_dev_xgmi_error_status.restype = amdsmi_status_t amdsmi_dev_xgmi_error_status.argtypes = [amdsmi_processor_handle, ctypes.POINTER(c__EA_amdsmi_xgmi_status_t)] @@ -1896,7 +1896,7 @@ __all__ = \ 'amdsmi_fw_info_t', 'amdsmi_get_gpu_asic_info', 'amdsmi_get_gpu_bad_page_info', 'amdsmi_get_gpu_board_info', 'amdsmi_get_caps_info', 'amdsmi_get_clock_measure', - 'amdsmi_get_compute_process_gpus', + 'amdsmi_get_gpu_compute_process_gpus', 'amdsmi_get_gpu_compute_process_info', 'amdsmi_get_gpu_compute_process_info_by_pid', 'amdsmi_get_gpu_device_bdf', 'amdsmi_get_processor_handle_from_bdf', 'amdsmi_get_processor_handles', diff --git a/projects/amdsmi/py-interface/rocm_smi_tool.py b/projects/amdsmi/py-interface/rocm_smi_tool.py index 8be10a887e..1de296d653 100644 --- a/projects/amdsmi/py-interface/rocm_smi_tool.py +++ b/projects/amdsmi/py-interface/rocm_smi_tool.py @@ -327,7 +327,7 @@ class Formatter: | """ + self.style.text("38 Get status string. Api: amdsmi_status_string ") + """ | | """ + self.style.text("39 Get compute process info. Api: amdsmi_get_gpu_compute_process_info ") + """ | | """ + self.style.text("40 Get compute process info by pid. Api: amdsmi_get_gpu_compute_process_info_by_pid ") + """ | - | """ + self.style.text("41 Get compute process gpus. Api: amdsmi_get_compute_process_gpus ") + """ | + | """ + self.style.text("41 Get compute process gpus. Api: amdsmi_get_gpu_compute_process_gpus ") + """ | | """ + self.style.text("42 Get device xgmi_error_status. Api: amdsmi_dev_xgmi_error_status ") + """ | | """ + self.style.text("43 Get device xgmi error reset. Api: amdsmi_dev_reset_xgmi_error ") + """ | | """ + self.style.text("44 Get topo get numa node number. Api: amdsmi_topo_get_numa_node_number ") + """ | @@ -533,7 +533,7 @@ def amdsmi_tool_status_string(dic): def amdsmi_tool_compute_process_gpus_get(dic): pid = dic["pid"] - return smi_api.amdsmi_get_compute_process_gpus(pid) + return smi_api.amdsmi_get_gpu_compute_process_gpus(pid) def amdsmi_tool_compute_process_info_by_pid_get(dic): pid = dic["pid"] diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index ff86747f76..25ed1d15b5 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -998,7 +998,7 @@ amdsmi_status_t amdsmi_get_gpu_compute_process_info_by_pid(uint32_t pid, } amdsmi_status_t -amdsmi_get_compute_process_gpus(uint32_t pid, uint32_t *dv_indices, +amdsmi_get_gpu_compute_process_gpus(uint32_t pid, uint32_t *dv_indices, uint32_t *num_devices) { AMDSMI_CHECK_INIT(); diff --git a/projects/amdsmi/tests/amd_smi_test/functional/process_info_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/process_info_read.cc index 1ab7f857ff..18bb30d258 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/process_info_read.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/process_info_read.cc @@ -162,7 +162,7 @@ void TestProcInfoRead::Run(void) { uint32_t amt_allocd = num_devices; for (uint32_t j = 0; j < num_proc_found; j++) { - err = amdsmi_get_compute_process_gpus(procs[j].process_id, dev_inds, + err = amdsmi_get_gpu_compute_process_gpus(procs[j].process_id, dev_inds, &amt_allocd); if (err == AMDSMI_STATUS_NOT_FOUND) { std::cout << "\t** Process " << procs[j].process_id <<