From dd00a16124d8f888284bff3b82d680d75702ba46 Mon Sep 17 00:00:00 2001 From: Suma Hegde Date: Sat, 25 Feb 2023 05:30:19 -0500 Subject: [PATCH] Change device_type to processor_type also rename amdsmi_get_device_type to amdsmi_get_processor_type grep -rli 'device_type' * | xargs -i@ sed -i 's/device_type/processor_type/g' @ Change-Id: Ic6a73c1a170757d5ab5d10ad20b4fc2f0b280e78 --- README.md | 8 ++++---- example/amd_smi_drm_example.cc | 8 ++++---- example/amd_smi_nodrm_example.cc | 8 ++++---- include/amd_smi/amdsmi.h | 8 ++++---- include/amd_smi/impl/amd_smi_device.h | 6 +++--- py-interface/README.md | 6 +++--- py-interface/__init__.py | 2 +- py-interface/amdsmi_interface.py | 6 +++--- py-interface/amdsmi_wrapper.py | 22 +++++++++++----------- src/amd_smi/amd_smi.cc | 14 +++++++------- src/amd_smi/amd_smi_system.cc | 2 +- 11 files changed, 45 insertions(+), 45 deletions(-) diff --git a/README.md b/README.md index 64bbab66aa..82614e3851 100755 --- a/README.md +++ b/README.md @@ -127,10 +127,10 @@ int main() { // For each device of the socket, get name and temperature. for (uint32_t j=0; j < device_count; j++) { // Get device type. Since the amdsmi is initialized with - // AMD_SMI_INIT_AMD_GPUS, the device_type must be AMD_GPU. - device_type_t device_type; - ret = amdsmi_get_device_type(processor_handles[j], &device_type); - if (device_type != AMD_GPU) { + // AMD_SMI_INIT_AMD_GPUS, the processor_type must be AMD_GPU. + processor_type_t processor_type; + ret = amdsmi_get_processor_type(processor_handles[j], &processor_type); + if (processor_type != AMD_GPU) { std::cout << "Expect AMD_GPU device type!\n"; return 1; } diff --git a/example/amd_smi_drm_example.cc b/example/amd_smi_drm_example.cc index b70e16cf75..27f2f37e4d 100644 --- a/example/amd_smi_drm_example.cc +++ b/example/amd_smi_drm_example.cc @@ -257,11 +257,11 @@ int main() { // For each device of the socket, get name and temperature. for (uint32_t j = 0; j < device_count; j++) { // Get device type. Since the amdsmi is initialized with - // AMD_SMI_INIT_AMD_GPUS, the device_type must be AMD_GPU. - device_type_t device_type = {}; - ret = amdsmi_get_device_type(processor_handles[j], &device_type); + // AMD_SMI_INIT_AMD_GPUS, the processor_type must be AMD_GPU. + processor_type_t processor_type = {}; + ret = amdsmi_get_processor_type(processor_handles[j], &processor_type); CHK_AMDSMI_RET(ret) - if (device_type != AMD_GPU) { + if (processor_type != AMD_GPU) { std::cout << "Expect AMD_GPU device type!\n"; return AMDSMI_STATUS_NOT_SUPPORTED; } diff --git a/example/amd_smi_nodrm_example.cc b/example/amd_smi_nodrm_example.cc index 9a89699d51..885334133d 100644 --- a/example/amd_smi_nodrm_example.cc +++ b/example/amd_smi_nodrm_example.cc @@ -109,11 +109,11 @@ int main() { // For each device of the socket, get name and temperature. for (uint32_t j = 0; j < device_count; j++) { // Get device type. Since the amdsmi is initialized with - // AMD_SMI_INIT_AMD_GPUS, the device_type must be AMD_GPU. - device_type_t device_type = {}; - ret = amdsmi_get_device_type(processor_handles[j], &device_type); + // AMD_SMI_INIT_AMD_GPUS, the processor_type must be AMD_GPU. + processor_type_t processor_type = {}; + ret = amdsmi_get_processor_type(processor_handles[j], &processor_type); CHK_AMDSMI_RET(ret) - if (device_type != AMD_GPU) { + if (processor_type != AMD_GPU) { std::cout << "Expect AMD_GPU device type!\n"; return AMDSMI_STATUS_NOT_SUPPORTED; } diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 4bc3216d00..6da9945892 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -132,7 +132,7 @@ typedef enum { AMD_CPU, NON_AMD_GPU, NON_AMD_CPU -} device_type_t; +} processor_type_t; /** * @brief Error codes returned by amdsmi functions @@ -1263,14 +1263,14 @@ amdsmi_status_t amdsmi_get_processor_handles(amdsmi_socket_handle socket_handle, * * @param[in] processor_handle a device handle * - * @param[out] device_type a pointer to device_type_t to which the device type + * @param[out] processor_type a pointer to processor_type_t to which the device type * will be written. If this parameter is nullptr, this function will return * ::AMDSMI_STATUS_INVAL. * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_get_device_type(amdsmi_processor_handle processor_handle, - device_type_t* device_type); +amdsmi_status_t amdsmi_get_processor_type(amdsmi_processor_handle processor_handle, + processor_type_t* processor_type); /** * @brief Get device handle with the matching bdf. diff --git a/include/amd_smi/impl/amd_smi_device.h b/include/amd_smi/impl/amd_smi_device.h index be1bfb9cd9..10c2074a68 100644 --- a/include/amd_smi/impl/amd_smi_device.h +++ b/include/amd_smi/impl/amd_smi_device.h @@ -51,11 +51,11 @@ namespace smi { class AMDSmiProcessor { public: - explicit AMDSmiProcessor(device_type_t device) : device_type_(device) {} + explicit AMDSmiProcessor(processor_type_t device) : processor_type_(device) {} virtual ~AMDSmiProcessor() {} - device_type_t get_device_type() const { return device_type_;} + processor_type_t get_processor_type() const { return processor_type_;} private: - device_type_t device_type_; + processor_type_t processor_type_; }; diff --git a/py-interface/README.md b/py-interface/README.md index 573c460e89..867cf7fc68 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -102,20 +102,20 @@ except AmdSmiException as e: print(e) ``` -## amdsmi_get_device_type +## amdsmi_get_processor_type Description: Checks the type of device with provided handle. Input parameters: device handle as an instance of `amdsmi_processor_handle` Output: Integer, type of gpu -Exceptions that can be thrown by `amdsmi_get_device_type` function: +Exceptions that can be thrown by `amdsmi_get_processor_type` function: * `AmdSmiLibraryException` Example: ```python try: - type_of_GPU = amdsmi_get_device_type(processor_handle) + type_of_GPU = amdsmi_get_processor_type(processor_handle) if type_of_GPU == 1: print("This is an AMD GPU") except AmdSmiException as e: diff --git a/py-interface/__init__.py b/py-interface/__init__.py index da3e3d94b1..ffc64a617b 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -24,7 +24,7 @@ from .amdsmi_interface import amdsmi_init from .amdsmi_interface import amdsmi_shut_down # Device Descovery -from .amdsmi_interface import amdsmi_get_device_type +from .amdsmi_interface import amdsmi_get_processor_type from .amdsmi_interface import amdsmi_get_processor_handles from .amdsmi_interface import amdsmi_get_socket_handles from .amdsmi_interface import amdsmi_get_socket_info diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index a4aea1dc3f..b1ddb4cae9 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -550,7 +550,7 @@ def amdsmi_shut_down(): _check_res(amdsmi_wrapper.amdsmi_shut_down()) -def amdsmi_get_device_type( +def amdsmi_get_processor_type( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> ctypes.c_uint32: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -558,9 +558,9 @@ def amdsmi_get_device_type( processor_handle, amdsmi_wrapper.amdsmi_processor_handle ) - dev_type = amdsmi_wrapper.device_type_t() + dev_type = amdsmi_wrapper.processor_type_t() _check_res( - amdsmi_wrapper.amdsmi_get_device_type( + amdsmi_wrapper.amdsmi_get_processor_type( processor_handle, ctypes.byref(dev_type)) ) return dev_type.value diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index d2c07d3ec4..6df7c6e2a3 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -232,8 +232,8 @@ amdsmi_container_types_t__enumvalues = c__EA_amdsmi_container_types_t__enumvalue amdsmi_processor_handle = ctypes.POINTER(None) amdsmi_socket_handle = ctypes.POINTER(None) -# values for enumeration 'c__EA_device_type_t' -c__EA_device_type_t__enumvalues = { +# values for enumeration 'c__EA_processor_type_t' +c__EA_processor_type_t__enumvalues = { 0: 'UNKNOWN', 1: 'AMD_GPU', 2: 'AMD_CPU', @@ -245,9 +245,9 @@ AMD_GPU = 1 AMD_CPU = 2 NON_AMD_GPU = 3 NON_AMD_CPU = 4 -c__EA_device_type_t = ctypes.c_uint32 # enum -device_type_t = c__EA_device_type_t -device_type_t__enumvalues = c__EA_device_type_t__enumvalues +c__EA_processor_type_t = ctypes.c_uint32 # enum +processor_type_t = c__EA_processor_type_t +processor_type_t__enumvalues = c__EA_processor_type_t__enumvalues # values for enumeration 'c__EA_amdsmi_status_t' c__EA_amdsmi_status_t__enumvalues = { @@ -1414,9 +1414,9 @@ amdsmi_get_socket_info.argtypes = [amdsmi_socket_handle, ctypes.POINTER(ctypes.c amdsmi_get_processor_handles = _libraries['libamd_smi.so'].amdsmi_get_processor_handles amdsmi_get_processor_handles.restype = amdsmi_status_t amdsmi_get_processor_handles.argtypes = [amdsmi_socket_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.POINTER(None))] -amdsmi_get_device_type = _libraries['libamd_smi.so'].amdsmi_get_device_type -amdsmi_get_device_type.restype = amdsmi_status_t -amdsmi_get_device_type.argtypes = [amdsmi_processor_handle, ctypes.POINTER(c__EA_device_type_t)] +amdsmi_get_processor_type = _libraries['libamd_smi.so'].amdsmi_get_processor_type +amdsmi_get_processor_type.restype = amdsmi_status_t +amdsmi_get_processor_type.argtypes = [amdsmi_processor_handle, ctypes.POINTER(c__EA_processor_type_t)] amdsmi_get_processor_handle_from_bdf = _libraries['libamd_smi.so'].amdsmi_get_processor_handle_from_bdf amdsmi_get_processor_handle_from_bdf.restype = amdsmi_status_t amdsmi_get_processor_handle_from_bdf.argtypes = [amdsmi_bdf_t, ctypes.POINTER(ctypes.POINTER(None))] @@ -1900,7 +1900,7 @@ __all__ = \ 'amdsmi_get_compute_process_info', 'amdsmi_get_compute_process_info_by_pid', 'amdsmi_get_device_bdf', 'amdsmi_get_processor_handle_from_bdf', 'amdsmi_get_processor_handles', - 'amdsmi_get_device_type', 'amdsmi_get_device_uuid', + 'amdsmi_get_processor_type', 'amdsmi_get_device_uuid', 'amdsmi_get_driver_version', 'amdsmi_get_ecc_error_count', 'amdsmi_get_event_notification', 'amdsmi_get_func_iter_value', 'amdsmi_get_fw_info', 'amdsmi_get_gpu_activity', @@ -1964,8 +1964,8 @@ __all__ = \ 'c__EA_amdsmi_temperature_metric_t', 'c__EA_amdsmi_temperature_type_t', 'c__EA_amdsmi_voltage_metric_t', 'c__EA_amdsmi_voltage_type_t', - 'c__EA_amdsmi_xgmi_status_t', 'c__EA_device_type_t', - 'device_type_t', 'device_type_t__enumvalues', 'size_t', + 'c__EA_amdsmi_xgmi_status_t', 'c__EA_processor_type_t', + 'processor_type_t', 'processor_type_t__enumvalues', 'size_t', 'struct_amdsmi_func_id_iter_handle', 'struct_c__SA_amd_metrics_table_header_t', 'struct_c__SA_amdsmi_asic_info_t', diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index 1ce630123a..0bf288a665 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -89,7 +89,7 @@ static amdsmi_status_t get_gpu_device_from_handle(amdsmi_processor_handle proces .handle_to_device(processor_handle, &device); if (r != AMDSMI_STATUS_SUCCESS) return r; - if (device->get_device_type() == AMD_GPU) { + if (device->get_processor_type() == AMD_GPU) { *gpudevice = static_cast(processor_handle); return AMDSMI_STATUS_SUCCESS; } @@ -249,19 +249,19 @@ amdsmi_status_t amdsmi_get_processor_handles(amdsmi_socket_handle socket_handle, return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_get_device_type(amdsmi_processor_handle processor_handle , - device_type_t* device_type) { +amdsmi_status_t amdsmi_get_processor_type(amdsmi_processor_handle processor_handle , + processor_type_t* processor_type) { AMDSMI_CHECK_INIT(); - if (device_type == nullptr) { + if (processor_type == nullptr) { return AMDSMI_STATUS_INVAL; } amd::smi::AMDSmiProcessor* device = nullptr; amdsmi_status_t r = amd::smi::AMDSmiSystem::getInstance() .handle_to_device(processor_handle, &device); if (r != AMDSMI_STATUS_SUCCESS) return r; - *device_type = device->get_device_type(); + *processor_type = device->get_processor_type(); return AMDSMI_STATUS_SUCCESS; } @@ -360,7 +360,7 @@ amdsmi_status_t amdsmi_get_vram_usage(amdsmi_processor_handle processor_handle, .handle_to_device(processor_handle, &device); if (ret != AMDSMI_STATUS_SUCCESS) return ret; - if (device->get_device_type() != AMD_GPU) { + if (device->get_processor_type() != AMD_GPU) { return AMDSMI_STATUS_NOT_SUPPORTED; } @@ -402,7 +402,7 @@ amdsmi_status_t amdsmi_get_caps_info(amdsmi_processor_handle processor_handle, .handle_to_device(processor_handle, &amd_device); if (ret != AMDSMI_STATUS_SUCCESS) return ret; - if (amd_device->get_device_type() != AMD_GPU) { + if (amd_device->get_processor_type() != AMD_GPU) { return AMDSMI_STATUS_NOT_SUPPORTED; } amd::smi::AMDSmiGPUDevice* gpu_device = nullptr; diff --git a/src/amd_smi/amd_smi_system.cc b/src/amd_smi/amd_smi_system.cc index 19c9c51292..5daee940ba 100644 --- a/src/amd_smi/amd_smi_system.cc +++ b/src/amd_smi/amd_smi_system.cc @@ -188,7 +188,7 @@ amdsmi_status_t AMDSmiSystem::gpu_index_to_handle(uint32_t gpu_index, auto iter = devices_.begin(); for (; iter != devices_.end(); iter++) { auto cur_device = (*iter); - if (cur_device->get_device_type() != AMD_GPU) + if (cur_device->get_processor_type() != AMD_GPU) continue; amd::smi::AMDSmiGPUDevice* gpu_device = static_cast(cur_device);