Skip to content

Commit 3879839

Browse files
committed
refactor(cuda.core): drop redundant user_data param from PyLogCallback
Python closures already give callbacks access to enclosing state (e.g. logger), and cuLogsRegisterCallback is always registered with userData as None today, so it carried no information. Updated the custom callback test to match the new 2-arg signature. Refs NVIDIA#671
1 parent b00e97f commit 3879839

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎cuda_core/cuda/core/utils/_logging.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# C callback signature for cuLogsRegisterCallback:
2222
# void callback(void *userData, CUlogLevel logLevel, char *message, size_t length)
2323
_CUlogsCallback_functype = ctypes.CFUNCTYPE(None, ctypes.c_void_p, ctypes.c_int, ctypes.c_char_p, ctypes.c_size_t)
24-
PyLogCallback = Callable[[Optional[int], int, bytes], None]
24+
PyLogCallback = Callable[[int, bytes], None]
2525

2626
# Keep a reference while registered, or GC'ing it leaves the driver with
2727
# a dangling function pointer which will crash on the next log message.
@@ -32,7 +32,7 @@
3232
def _make_c_callback(logger: logging.Logger, callback: Optional[PyLogCallback]) -> ctypes._FuncPointer:
3333
"""Build the ctypes C callback passed to cuLogsRegisterCallback."""
3434

35-
def _default_callback(user_data: Optional[int], cu_log_level: int, message: bytes) -> None:
35+
def _default_callback(cu_log_level: int, message: bytes) -> None:
3636
cuda_level_to_py_level = {
3737
int(_driver.CUlogLevel.CU_LOG_LEVEL_ERROR): logging.ERROR,
3838
int(_driver.CUlogLevel.CU_LOG_LEVEL_WARNING): logging.WARNING,
@@ -46,7 +46,7 @@ def _default_callback(user_data: Optional[int], cu_log_level: int, message: byte
4646
def _on_log(user_data, log_level, message_ptr, length):
4747
try:
4848
message = ctypes.string_at(message_ptr, length) if message_ptr else b""
49-
emit(user_data, log_level, message)
49+
emit(log_level, message)
5050
except Exception:
5151
logger.exception("cuda_error_log: error while forwarding driver log")
5252

@@ -67,13 +67,13 @@ def register_cuda_error_log(
6767
----------
6868
logger : logging.Logger, optional
6969
Target logger. Defaults to ``logging.getLogger("cuda.driver")``.
70-
callback : Callable[[Optional[int], int, bytes], None], optional
70+
callback : Callable[[int, bytes], None], optional
7171
Overrides the default forwarding. Called as
72-
``callback(user_data, log_level, message)`` with undecoded
73-
``message`` and unmapped ``log_level``; decoding/mapping is the
74-
callback's job (``len(message)`` gives its size). Close over
75-
``logger`` if needed. Defaults to ``None`` (decode, map, and
76-
forward via ``logger.log(level, "[CUDA Driver] %s", message)``).
72+
``callback(log_level, message)`` with undecoded ``message`` and
73+
unmapped ``log_level``; decoding/mapping is the callback's job
74+
(``len(message)`` gives its size). Close over ``logger`` if
75+
needed. Defaults to ``None`` (decode, map, and forward via
76+
``logger.log(level, "[CUDA Driver] %s", message)``).
7777
7878
Raises
7979
------

‎cuda_core/tests/test_cuda_log_bridge.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def test_cuda_driver_log_custom_callback_overrides_default(caplog):
151151
logger_obj = logging.getLogger(logger_name)
152152

153153
# 按 raw CUlogLevel 分发;ERROR 记成 DEBUG
154-
def my_callback(user_data, cu_log_level, message):
154+
def my_callback(cu_log_level, message):
155155
msg = message.decode("utf-8", errors="replace").rstrip("\n")
156156
if cu_log_level == driver.CUlogLevel.CU_LOG_LEVEL_WARNING:
157157
logger_obj.warning("%s: %s", logger_obj.name, msg)

0 commit comments

Comments
 (0)