diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index e7812cb8d5..9f47efdc55 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -3462,7 +3462,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, * * @details This function prepares to collect events for the GPU with device * ID @p processor_handle, by initializing any required system parameters. This call - * may open files which will remain open until ::amdsmi_stop_event_notification() + * may open files which will remain open until ::amdsmi_stop_gpu_event_notification() * is called. * * @param processor_handle a processor handle corresponding to the device on which to @@ -3555,7 +3555,7 @@ amdsmi_status_t * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_stop_event_notification(amdsmi_processor_handle processor_handle); +amdsmi_status_t amdsmi_stop_gpu_event_notification(amdsmi_processor_handle processor_handle); /** @} End EvntNotif */ diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index b987e6d9ee..9cee241c2b 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -348,7 +348,7 @@ class AmdSmiEventReader: return ret def stop(self): - _check_res(amdsmi_wrapper.amdsmi_stop_event_notification( + _check_res(amdsmi_wrapper.amdsmi_stop_gpu_event_notification( self.processor_handle)) def __enter__(self): diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index f921231aed..d66f27dcd3 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1661,9 +1661,9 @@ amdsmi_set_event_notification_mask.argtypes = [amdsmi_processor_handle, uint64_t amdsmi_get_gpu_event_notification = _libraries['libamd_smi.so'].amdsmi_get_gpu_event_notification amdsmi_get_gpu_event_notification.restype = amdsmi_status_t amdsmi_get_gpu_event_notification.argtypes = [ctypes.c_int32, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_evt_notification_data_t)] -amdsmi_stop_event_notification = _libraries['libamd_smi.so'].amdsmi_stop_event_notification -amdsmi_stop_event_notification.restype = amdsmi_status_t -amdsmi_stop_event_notification.argtypes = [amdsmi_processor_handle] +amdsmi_stop_gpu_event_notification = _libraries['libamd_smi.so'].amdsmi_stop_gpu_event_notification +amdsmi_stop_gpu_event_notification.restype = amdsmi_status_t +amdsmi_stop_gpu_event_notification.argtypes = [amdsmi_processor_handle] amdsmi_get_gpu_device_bdf = _libraries['libamd_smi.so'].amdsmi_get_gpu_device_bdf amdsmi_get_gpu_device_bdf.restype = amdsmi_status_t amdsmi_get_gpu_device_bdf.argtypes = [amdsmi_processor_handle, ctypes.POINTER(union_c__UA_amdsmi_bdf_t)] @@ -1935,7 +1935,7 @@ __all__ = \ 'amdsmi_set_event_notification_mask', 'amdsmi_set_gpu_perf_determinism_mode', 'amdsmi_shut_down', 'amdsmi_socket_handle', 'amdsmi_status_string', 'amdsmi_status_t', - 'amdsmi_status_t__enumvalues', 'amdsmi_stop_event_notification', + 'amdsmi_status_t__enumvalues', 'amdsmi_stop_gpu_event_notification', 'amdsmi_sw_component_t', 'amdsmi_sw_component_t__enumvalues', 'amdsmi_temperature_metric_t', 'amdsmi_temperature_metric_t__enumvalues', diff --git a/py-interface/rocm_smi_tool.py b/py-interface/rocm_smi_tool.py index 6fc53efbfe..9f5bba9858 100644 --- a/py-interface/rocm_smi_tool.py +++ b/py-interface/rocm_smi_tool.py @@ -340,7 +340,7 @@ class Formatter: | """ + self.style.text("51 Get event notification. Api: amdsmi_get_gpu_event_notification ") + """ | | """ + self.style.text("52 Init event notification. Api: amdsmi_init_event_notification ") + """ | | """ + self.style.text("53 Set event notification mask. Api: amdsmi_set_event_notification_mask ") + """ | - | """ + self.style.text("54 Get event notification. Api: amdsmi_stop_event_notification ") + """ | + | """ + self.style.text("54 Get event notification. Api: amdsmi_stop_gpu_event_notification ") + """ | | """ + self.style.text("55 Init. Api: amdsmi_init ") + """ | | """ + self.style.text("56 Shut down. Api: amdsmi_shut_down ") + """ | | """ + self.style.text("57 Get fw info. Api: amdsmi_get_fw_info ") + """ | @@ -571,7 +571,7 @@ def amdsmi_tool_event_notification_mask_set(dev, dic): return smi_api.amdsmi_wrapper. amdsmi_set_event_notification_mask(dev, ctypes.c_uint64(mask)) def amdsmi_tool_event_notification_stop(dev): - return smi_api.amdsmi_wrapper.amdsmi_stop_event_notification(dev) + return smi_api.amdsmi_wrapper.amdsmi_stop_gpu_event_notification(dev) def amdsmi_tool_shut_down(): smi_api.amdsmi_init() diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index c0135ed2d8..e1213061ce 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -685,7 +685,7 @@ amdsmi_status_t return AMDSMI_STATUS_SUCCESS; } -amdsmi_status_t amdsmi_stop_event_notification( +amdsmi_status_t amdsmi_stop_gpu_event_notification( amdsmi_processor_handle processor_handle) { return rsmi_wrapper(rsmi_event_notification_stop, processor_handle); } diff --git a/tests/amd_smi_test/functional/evt_notif_read_write.cc b/tests/amd_smi_test/functional/evt_notif_read_write.cc index 1e2481c33f..e9bc9b2482 100755 --- a/tests/amd_smi_test/functional/evt_notif_read_write.cc +++ b/tests/amd_smi_test/functional/evt_notif_read_write.cc @@ -191,7 +191,7 @@ void TestEvtNotifReadWrite::Run(void) { } for (uint32_t dv_ind = 0; dv_ind < num_monitor_devs(); ++dv_ind) { - ret = amdsmi_stop_event_notification(processor_handles_[dv_ind]); + ret = amdsmi_stop_gpu_event_notification(processor_handles_[dv_ind]); ASSERT_EQ(ret, AMDSMI_STATUS_SUCCESS); } } diff --git a/tests/amd_smi_test/functional/mutual_exclusion.cc b/tests/amd_smi_test/functional/mutual_exclusion.cc index b3fdaca149..fb8af2fc35 100755 --- a/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -307,7 +307,7 @@ void TestMutualExclusion::Run(void) { amdsmi_topo_get_link_weight amdsmi_set_event_notification_mask amdsmi_init_event_notification - amdsmi_stop_event_notification + amdsmi_stop_gpu_event_notification */ IF_VERB(STANDARD) {