From cd92afe97ee94cdd3fad42d028aaf331ab6bef22 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Sat, 25 Feb 2023 08:08:29 -0500 Subject: [PATCH] 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: 84613dcf1d2042036f8745dbdcbbba04bfd4fcef] --- 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/py-interface/rocm_smi_tool.py | 4 ++-- projects/amdsmi/src/amd_smi/amd_smi.cc | 4 ++-- .../amdsmi/tests/amd_smi_test/functional/mem_util_read.cc | 4 ++-- .../tests/amd_smi_test/functional/mutual_exclusion.cc | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index 894c4e1baf..d1459792bf 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -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); /** diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index e1c06890e7..cf897ca39c 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -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) diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index f16524d9bb..f9771902cf 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -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 diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index ef4a449ea0..ff5b799e24 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -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)) ) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index f0c245e641..290e036a13 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -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', diff --git a/projects/amdsmi/py-interface/rocm_smi_tool.py b/projects/amdsmi/py-interface/rocm_smi_tool.py index 93e6eb1cff..dbf44aa392 100644 --- a/projects/amdsmi/py-interface/rocm_smi_tool.py +++ b/projects/amdsmi/py-interface/rocm_smi_tool.py @@ -301,7 +301,7 @@ class Formatter: | """ + self.style.text("12 Get device power ave. Api: amdsmi_get_power_ave ") + """ | | """ + self.style.text("13 Get device energy count. Api: amdsmi_get_energy_count ") + """ | | """ + self.style.text("14 Get device memory total. Api: amdsmi_get_gpu_memory_total ") + """ | - | """ + self.style.text("15 Get device memory usage. Api: amdsmi_dev_get_memory_usage ") + """ | + | """ + self.style.text("15 Get device memory usage. Api: amdsmi_get_gpu_memory_usage ") + """ | | """ + self.style.text("16 Get device memory busy percent. Api: amdsmi_dev_get_memory_busy_percent ") + """ | | """ + self.style.text("17 Get device memory reserved pages. Api: amdsmi_dev_get_memory_reserved_pages ") + """ | | """ + self.style.text("18 Get device fan rpms. Api: amdsmi_dev_get_fan_rpms ") + """ | @@ -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)) diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index c305078208..ea0c932974 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -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(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(mem_type), used); diff --git a/projects/amdsmi/tests/amd_smi_test/functional/mem_util_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/mem_util_read.cc index 07b83a20ab..9e7e242b22 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/mem_util_read.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/mem_util_read.cc @@ -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(mem_type), &usage); - err_chk("amdsmi_dev_get_memory_usage()"); + err_chk("amdsmi_get_gpu_memory_usage()"); if (err != AMDSMI_STATUS_SUCCESS) { return; } diff --git a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc index 3c27b88a3c..4de73fd8a4 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -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