Merge pull request cupy#8774 from kmaehashi/fix-softlink-init-race

Fix race during SoftLink initialization
chainer-ci · Dec 3, 2024 · 2d187e0 · 2d187e0
1 parent 40d48cd
commit 2d187e0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/cupy_backends/cuda/api/_driver_extern.pxi b/cupy_backends/cuda/api/_driver_extern.pxi
@@ -79,11 +79,10 @@ cdef inline void initialize() except *:
     global _L
     if _L is not None:
         return
-    _initialize()
+    _L = _initialize()
 
 
-cdef void _initialize() except *:
-    global _L
+cdef SoftLink _initialize():
     _L = _get_softlink()
 
     cdef str version = '_v2' if CUPY_CUDA_VERSION != 0 else ''
@@ -139,6 +138,8 @@ cdef void _initialize() except *:
     global cuStreamGetCtx
     cuStreamGetCtx = <F_cuStreamGetCtx>_L.get('StreamGetCtx')
 
+    return _L
+
 
 cdef SoftLink _get_softlink():
     cdef str prefix = 'cu'

diff --git a/cupy_backends/cuda/api/_runtime_softlink.pxi b/cupy_backends/cuda/api/_runtime_softlink.pxi
@@ -17,16 +17,17 @@ cdef inline void initialize() except *:
     global _L
     if _L is not None:
         return
-    _initialize()
+    _L = _initialize()
 
 
-cdef void _initialize() except *:
-    global _L
+cdef SoftLink _initialize():
     _L = _get_softlink()
 
     global DYN_cudaRuntimeGetVersion
     DYN_cudaRuntimeGetVersion = <F_cudaRuntimeGetVersion>_L.get('RuntimeGetVersion')  # noqa
 
+    return _L
+
 
 cdef SoftLink _get_softlink():
     cdef int runtime_version

diff --git a/cupy_backends/cuda/libs/_cnvrtc.pxi b/cupy_backends/cuda/libs/_cnvrtc.pxi
@@ -69,10 +69,9 @@ cdef inline void initialize() except *:
     global _L
     if _L is not None:
         return
-    _initialize()
+    _L = _initialize()
 
-cdef void _initialize() except *:
-    global _L
+cdef SoftLink _initialize():
     _L = _get_softlink()
 
     global nvrtcGetErrorString
@@ -110,6 +109,8 @@ cdef void _initialize() except *:
     global nvrtcGetNVVM
     nvrtcGetNVVM = <F_nvrtcGetNVVM>_L.get('GetNVVM')
 
+    return _L
+
 
 cdef SoftLink _get_softlink():
     cdef int runtime_version