Renamed API amdsmi_topo_get_numa_affinity to
amdsmi_get_gpu_topo_numa_affinity
grep -rli 'amdsmi_topo_get_numa_affinity' * | xargs -i@ sed -i
's/amdsmi_topo_get_numa_affinity/amdsmi_get_gpu_topo_numa_affinity/g' @
Change-Id: If24a64e9e508bbd728570da5c3e69df5b802b59a
[ROCm/amdsmi commit: 83720266dd]
This commit is contained in:
کامیت شده توسط
Naveen Krishna Chatradhi
والد
6bd013ba58
کامیت
52c0195b86
@@ -1529,7 +1529,7 @@ amdsmi_status_t amdsmi_get_gpu_pci_id(amdsmi_processor_handle processor_handle,
|
||||
*
|
||||
* @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail
|
||||
*/
|
||||
amdsmi_status_t amdsmi_topo_get_numa_affinity(amdsmi_processor_handle processor_handle, uint32_t *numa_node);
|
||||
amdsmi_status_t amdsmi_get_gpu_topo_numa_affinity(amdsmi_processor_handle processor_handle, uint32_t *numa_node);
|
||||
|
||||
/**
|
||||
* @brief Get PCIe traffic information
|
||||
|
||||
@@ -1461,7 +1461,7 @@ except AmdSmiException as e:
|
||||
print(e)
|
||||
```
|
||||
|
||||
## amdsmi_topo_get_numa_affinity
|
||||
## amdsmi_get_gpu_topo_numa_affinity
|
||||
|
||||
Description: Get the NUMA node associated with a device
|
||||
|
||||
@@ -1471,7 +1471,7 @@ Input parameters:
|
||||
|
||||
Output: NUMA node value
|
||||
|
||||
Exceptions that can be thrown by `amdsmi_topo_get_numa_affinity` function:
|
||||
Exceptions that can be thrown by `amdsmi_get_gpu_topo_numa_affinity` function:
|
||||
* `AmdSmiLibraryException`
|
||||
* `AmdSmiRetryException`
|
||||
* `AmdSmiParameterException`
|
||||
@@ -1484,7 +1484,7 @@ try:
|
||||
print("No GPUs on machine")
|
||||
else:
|
||||
for device in devices:
|
||||
numa_node = amdsmi_topo_get_numa_affinity(device)
|
||||
numa_node = amdsmi_get_gpu_topo_numa_affinity(device)
|
||||
print(numa_node)
|
||||
except AmdSmiException as e:
|
||||
print(e)
|
||||
|
||||
@@ -141,7 +141,7 @@ from .amdsmi_interface import amdsmi_get_gpu_pci_id
|
||||
from .amdsmi_interface import amdsmi_get_gpu_pci_bandwidth
|
||||
from .amdsmi_interface import amdsmi_dev_get_pci_throughput
|
||||
from .amdsmi_interface import amdsmi_dev_get_pci_replay_counter
|
||||
from .amdsmi_interface import amdsmi_topo_get_numa_affinity
|
||||
from .amdsmi_interface import amdsmi_get_gpu_topo_numa_affinity
|
||||
|
||||
# # Power information
|
||||
from .amdsmi_interface import amdsmi_dev_get_power_ave
|
||||
|
||||
@@ -1801,7 +1801,7 @@ def amdsmi_dev_get_pci_replay_counter(processor_handle: amdsmi_wrapper.amdsmi_pr
|
||||
return counter.value
|
||||
|
||||
|
||||
def amdsmi_topo_get_numa_affinity(processor_handle: amdsmi_wrapper.amdsmi_processor_handle):
|
||||
def amdsmi_get_gpu_topo_numa_affinity(processor_handle: amdsmi_wrapper.amdsmi_processor_handle):
|
||||
if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle):
|
||||
raise AmdSmiParameterException(
|
||||
processor_handle, amdsmi_wrapper.amdsmi_processor_handle
|
||||
@@ -1810,7 +1810,7 @@ def amdsmi_topo_get_numa_affinity(processor_handle: amdsmi_wrapper.amdsmi_proces
|
||||
numa_node = ctypes.c_uint32()
|
||||
|
||||
_check_res(
|
||||
amdsmi_wrapper.amdsmi_topo_get_numa_affinity(
|
||||
amdsmi_wrapper.amdsmi_get_gpu_topo_numa_affinity(
|
||||
processor_handle, ctypes.byref(numa_node))
|
||||
)
|
||||
|
||||
|
||||
@@ -1445,9 +1445,9 @@ amdsmi_get_gpu_pci_bandwidth.argtypes = [amdsmi_processor_handle, ctypes.POINTER
|
||||
amdsmi_get_gpu_pci_id = _libraries['libamd_smi.so'].amdsmi_get_gpu_pci_id
|
||||
amdsmi_get_gpu_pci_id.restype = amdsmi_status_t
|
||||
amdsmi_get_gpu_pci_id.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64)]
|
||||
amdsmi_topo_get_numa_affinity = _libraries['libamd_smi.so'].amdsmi_topo_get_numa_affinity
|
||||
amdsmi_topo_get_numa_affinity.restype = amdsmi_status_t
|
||||
amdsmi_topo_get_numa_affinity.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)]
|
||||
amdsmi_get_gpu_topo_numa_affinity = _libraries['libamd_smi.so'].amdsmi_get_gpu_topo_numa_affinity
|
||||
amdsmi_get_gpu_topo_numa_affinity.restype = amdsmi_status_t
|
||||
amdsmi_get_gpu_topo_numa_affinity.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)]
|
||||
amdsmi_dev_get_pci_throughput = _libraries['libamd_smi.so'].amdsmi_dev_get_pci_throughput
|
||||
amdsmi_dev_get_pci_throughput.restype = amdsmi_status_t
|
||||
amdsmi_dev_get_pci_throughput.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64), ctypes.POINTER(ctypes.c_uint64), ctypes.POINTER(ctypes.c_uint64)]
|
||||
@@ -1942,7 +1942,7 @@ __all__ = \
|
||||
'amdsmi_temperature_type_t',
|
||||
'amdsmi_temperature_type_t__enumvalues',
|
||||
'amdsmi_topo_get_link_type', 'amdsmi_topo_get_link_weight',
|
||||
'amdsmi_topo_get_numa_affinity',
|
||||
'amdsmi_get_gpu_topo_numa_affinity',
|
||||
'amdsmi_topo_get_numa_node_number',
|
||||
'amdsmi_utilization_counter_t', 'amdsmi_vbios_info_t',
|
||||
'amdsmi_version_t', 'amdsmi_voltage_metric_t',
|
||||
|
||||
@@ -297,7 +297,7 @@ class Formatter:
|
||||
| """ + self.style.text(" 8 Get device pci bandwidth. Api: amdsmi_get_gpu_pci_bandwidth <bdf>") + """ |
|
||||
| """ + self.style.text(" 9 Get device pci throughput. Api: amdsmi_dev_get_pci_throughput <bdf>") + """ |
|
||||
| """ + self.style.text("10 Get device pci replay counter. Api: amdsmi_dev_get_pci_replay_counter <bdf>") + """ |
|
||||
| """ + self.style.text("11 Get topo numa affinity. Api: amdsmi_topo_get_numa_affinity <bdf>") + """ |
|
||||
| """ + self.style.text("11 Get topo numa affinity. Api: amdsmi_get_gpu_topo_numa_affinity <bdf>") + """ |
|
||||
| """ + self.style.text("12 Get device power ave. Api: amdsmi_dev_get_power_ave <bdf><sensor_id>") + """ |
|
||||
| """ + self.style.text("13 Get device energy count. Api: amdsmi_dev_get_energy_count <bdf>") + """ |
|
||||
| """ + self.style.text("14 Get device memory total. Api: amdsmi_dev_get_memory_total <bdf>") + """ |
|
||||
@@ -752,7 +752,7 @@ commands = {
|
||||
10: [smi_api. amdsmi_dev_get_pci_replay_counter, {
|
||||
"device_identifier1": [None, True]
|
||||
}],
|
||||
11: [smi_api.amdsmi_topo_get_numa_affinity, {
|
||||
11: [smi_api.amdsmi_get_gpu_topo_numa_affinity, {
|
||||
"device_identifier1": [None, True]
|
||||
}],
|
||||
12: [amdsmi_tool_dev_power_ave_get, {
|
||||
|
||||
@@ -928,7 +928,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle,
|
||||
{"rsmi_dev_xgmi_error_status", "amdsmi_dev_xgmi_error_status"},
|
||||
{"rsmi_dev_xgmi_error_reset", "amdsmi_dev_reset_xgmi_error"},
|
||||
{"rsmi_dev_memory_reserved_pages_get", "amdsmi_dev_get_memory_reserved_pages"},
|
||||
{"rsmi_topo_numa_affinity_get", "amdsmi_topo_get_numa_affinity"},
|
||||
{"rsmi_topo_numa_affinity_get", "amdsmi_get_gpu_topo_numa_affinity"},
|
||||
{"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_dev_get_memory_total"},
|
||||
@@ -1391,7 +1391,7 @@ amdsmi_status_t amdsmi_get_gpu_pci_id(
|
||||
bdfid);
|
||||
}
|
||||
|
||||
amdsmi_status_t amdsmi_topo_get_numa_affinity(
|
||||
amdsmi_status_t amdsmi_get_gpu_topo_numa_affinity(
|
||||
amdsmi_processor_handle processor_handle, uint32_t *numa_node) {
|
||||
return rsmi_wrapper(rsmi_topo_numa_affinity_get, processor_handle,
|
||||
numa_node);
|
||||
|
||||
@@ -138,14 +138,14 @@ void TestSysInfoRead::Run(void) {
|
||||
err = amdsmi_get_gpu_pci_id(processor_handles_[i], nullptr);
|
||||
ASSERT_EQ(err, AMDSMI_STATUS_INVAL);
|
||||
|
||||
err = amdsmi_topo_get_numa_affinity(processor_handles_[i], &val_ui32);
|
||||
err = amdsmi_get_gpu_topo_numa_affinity(processor_handles_[i], &val_ui32);
|
||||
CHK_ERR_ASRT(err)
|
||||
IF_VERB(STANDARD) {
|
||||
std::cout << "\t**NUMA NODE: 0x" << std::hex << val_ui32;
|
||||
std::cout << " (" << std::dec << val_ui32 << ")" << std::endl;
|
||||
}
|
||||
// Verify api support checking functionality is working
|
||||
err = amdsmi_topo_get_numa_affinity(processor_handles_[i], nullptr);
|
||||
err = amdsmi_get_gpu_topo_numa_affinity(processor_handles_[i], nullptr);
|
||||
ASSERT_EQ(err, AMDSMI_STATUS_INVAL);
|
||||
|
||||
|
||||
|
||||
مرجع در شماره جدید
Block a user