From 404b8229aca17ba21a03e571aba78e928dea2fd7 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Sat, 25 Feb 2023 07:19:57 -0500 Subject: [PATCH] Renamed API amdsmi_get_driver_version to amdsmi_get_gpu_driver_version grep -rli 'amdsmi_get_driver_version' * | xargs -i@ sed -i 's/amdsmi_get_driver_version/amdsmi_get_gpu_driver_version/g' @ Change-Id: Ic1dfb17f7595210ec1fcbd5a936fd259e57e9638 [ROCm/amdsmi commit: 8c8f41f8932af70ac64a06fe9b54b28800906b36] --- 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 19afc9a109..bc254acef9 100644 --- a/projects/amdsmi/example/amd_smi_drm_example.cc +++ b/projects/amdsmi/example/amd_smi_drm_example.cc @@ -320,9 +320,9 @@ int main() { // Get driver version char version[AMDSMI_MAX_DRIVER_VERSION_LENGTH]; int version_length = AMDSMI_MAX_DRIVER_VERSION_LENGTH; - ret = amdsmi_get_driver_version(processor_handles[j], &version_length, version); + ret = amdsmi_get_gpu_driver_version(processor_handles[j], &version_length, version); CHK_AMDSMI_RET(ret) - printf(" Output of amdsmi_get_driver_version:\n"); + printf(" Output of amdsmi_get_gpu_driver_version:\n"); printf("\tDriver version: %s\n\n", version); // Get device uuid diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index fc44f7095a..85cbecb49b 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -3608,7 +3608,7 @@ amdsmi_get_gpu_device_uuid(amdsmi_processor_handle processor_handle, unsigned in * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_driver_version(amdsmi_processor_handle processor_handle, int *length, char *version); +amdsmi_get_gpu_driver_version(amdsmi_processor_handle processor_handle, int *length, char *version); /** @} End swversion */ diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index 028f44339e..d4615a8774 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -263,7 +263,7 @@ except AmdSmiException as e: print(e) ``` -## amdsmi_get_driver_version +## amdsmi_get_gpu_driver_version Description: Returns the version string of the driver Input parameters: @@ -271,7 +271,7 @@ Input parameters: Output: Driver version string that is handling the device -Exceptions that can be thrown by `amdsmi_get_driver_version` function: +Exceptions that can be thrown by `amdsmi_get_gpu_driver_version` function: * `AmdSmiParameterException` * `AmdSmiLibraryException` @@ -279,7 +279,7 @@ Example: ```python try: device = amdsmi_get_processor_handles()[0] - print("Driver version: ", amdsmi_get_driver_version(device)) + print("Driver version: ", amdsmi_get_gpu_driver_version(device)) except AmdSmiException as e: print(e) ``` diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index 9010499fbd..36a032c9c2 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -34,7 +34,7 @@ from .amdsmi_interface import amdsmi_get_gpu_device_uuid from .amdsmi_interface import amdsmi_get_processor_handle_from_bdf # # SW Version Information -from .amdsmi_interface import amdsmi_get_driver_version +from .amdsmi_interface import amdsmi_get_gpu_driver_version # # ASIC and Bus Static Information from .amdsmi_interface import amdsmi_get_asic_info diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index 1c42b55a3c..3fa5a0db56 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -940,7 +940,7 @@ def amdsmi_get_gpu_device_uuid(processor_handle: amdsmi_wrapper.amdsmi_processor return uuid.value.decode("utf-8") -def amdsmi_get_driver_version( +def amdsmi_get_gpu_driver_version( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> str: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -954,7 +954,7 @@ def amdsmi_get_driver_version( version = ctypes.create_string_buffer(_AMDSMI_MAX_DRIVER_VERSION_LENGTH) _check_res( - amdsmi_wrapper.amdsmi_get_driver_version( + amdsmi_wrapper.amdsmi_get_gpu_driver_version( processor_handle, ctypes.byref(length), version ) ) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index 16f924dcf0..804f327d76 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1670,9 +1670,9 @@ amdsmi_get_gpu_device_bdf.argtypes = [amdsmi_processor_handle, ctypes.POINTER(un amdsmi_get_gpu_device_uuid = _libraries['libamd_smi.so'].amdsmi_get_gpu_device_uuid amdsmi_get_gpu_device_uuid.restype = amdsmi_status_t amdsmi_get_gpu_device_uuid.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.c_char)] -amdsmi_get_driver_version = _libraries['libamd_smi.so'].amdsmi_get_driver_version -amdsmi_get_driver_version.restype = amdsmi_status_t -amdsmi_get_driver_version.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_int32), ctypes.POINTER(ctypes.c_char)] +amdsmi_get_gpu_driver_version = _libraries['libamd_smi.so'].amdsmi_get_gpu_driver_version +amdsmi_get_gpu_driver_version.restype = amdsmi_status_t +amdsmi_get_gpu_driver_version.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_int32), ctypes.POINTER(ctypes.c_char)] amdsmi_get_asic_info = _libraries['libamd_smi.so'].amdsmi_get_asic_info amdsmi_get_asic_info.restype = amdsmi_status_t amdsmi_get_asic_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_asic_info_t)] @@ -1901,7 +1901,7 @@ __all__ = \ 'amdsmi_get_compute_process_info_by_pid', 'amdsmi_get_gpu_device_bdf', 'amdsmi_get_processor_handle_from_bdf', 'amdsmi_get_processor_handles', 'amdsmi_get_processor_type', 'amdsmi_get_gpu_device_uuid', - 'amdsmi_get_driver_version', 'amdsmi_get_ecc_error_count', + 'amdsmi_get_gpu_driver_version', 'amdsmi_get_ecc_error_count', 'amdsmi_get_event_notification', 'amdsmi_get_func_iter_value', 'amdsmi_get_fw_info', 'amdsmi_get_gpu_activity', 'amdsmi_get_minmax_bandwidth', 'amdsmi_get_pcie_link_caps', diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index cd5de4c13a..fdbd9e0ce6 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -1792,7 +1792,7 @@ amdsmi_get_target_frequency_range(amdsmi_processor_handle processor_handle, amds } amdsmi_status_t -amdsmi_get_driver_version(amdsmi_processor_handle processor_handle, int *length, char *version) { +amdsmi_get_gpu_driver_version(amdsmi_processor_handle processor_handle, int *length, char *version) { AMDSMI_CHECK_INIT(); if (length == nullptr || version == nullptr) {