merge profiler module to runtime

cupy · takagi · Nov 16, 2023 · Oct 21, 2023 · Oct 21, 2023 · Oct 21, 2023
commit 75465c8a48a8ebc25d5f82c49cc266fbc26b8872
diff --git a/cupy_backends/cuda/api/_runtime_extern.pxi b/cupy_backends/cuda/api/_runtime_extern.pxi
@@ -152,6  152,7 @@ cdef extern from '../../cupy_backend_runtime.h' nogil:
     int cudaGraphLaunch(GraphExec, driver.Stream)
     int cudaGraphUpload(GraphExec, driver.Stream)
 
     # Constants
     int cudaDevAttrComputeCapabilityMajor
     int cudaDevAttrComputeCapabilityMinor
 
@@ -161,3  162,9 @@ cdef extern from '../../cupy_backend_runtime.h' nogil:
     int cudaErrorPeerAccessAlreadyEnabled
     int cudaErrorContextIsDestroyed
     int cudaErrorInvalidResourceHandle
 
 
 cdef extern from '../../cupy_profiler.h' nogil:
     # Profiler
     int cudaProfilerStart()
     int cudaProfilerStop()
diff --git a/cupy_backends/cuda/api/runtime.pxd b/cupy_backends/cuda/api/runtime.pxd
@@ -320,3  320,11 @@ cpdef graphExecDestroy(intptr_t graphExec)
 cpdef intptr_t graphInstantiate(intptr_t graph) except? 0
 cpdef graphLaunch(intptr_t graphExec, intptr_t stream)
 cpdef graphUpload(intptr_t graphExec, intptr_t stream)
 
 
 ##############################################################################
 # Profiler
 ##############################################################################
 
 cpdef profilerStart()
 cpdef profilerStop()
diff --git a/cupy_backends/cuda/api/runtime.pyx b/cupy_backends/cuda/api/runtime.pyx
@@ -1078,3  1078,31 @@ cpdef graphUpload(intptr_t graphExec, intptr_t stream):
     with nogil:
         status = cudaGraphUpload(<GraphExec>(graphExec), <driver.Stream>stream)
     check_status(status)
 
 
 ##############################################################################
 # Profiler
 ##############################################################################
 
 cpdef profilerStart():
     """Enable profiling.
 
     A user can enable CUDA profiling. When an error occurs, it raises an
     exception.
 
     See the CUDA document for detail.
     """
     status = cudaProfilerStart()
     check_status(status)
 
 
 cpdef profilerStop():
     """Disable profiling.
 
     A user can disable CUDA profiling. When an error occurs, it raises an
     exception.
 
     See the CUDA document for detail.
     """
     status = cudaProfilerStop()
     check_status(status)
diff --git a/cupy_backends/cuda/cupy_cuda_profiler_api.h b/cupy_backends/cuda/cupy_cuda_profiler_api.h
@@ -4,15  4,4 @@
 #include <cuda.h>
 #include <cuda_profiler_api.h>
 
-#if CUDA_VERSION >= 12000
-// Functions removed in CUDA 12.0
-
-enum cudaOutputMode_t {};
-
-cudaError_t cudaProfilerInitialize(...) {
-    return cudaErrorUnknown;
-}
-
-#endif // #if CUDA_VERSION >= 12
-
 #endif // #ifndef INCLUDE_GUARD_CUDA_CUPY_PROFILER_H
diff --git a/cupy_backends/cuda/libs/profiler.pxd b/cupy_backends/cuda/libs/profiler.pxd
diff --git a/cupy_backends/cuda/libs/profiler.pyx b/cupy_backends/cuda/libs/profiler.pyx
diff --git a/cupy_backends/hip/cupy_hip_runtime.h b/cupy_backends/hip/cupy_hip_runtime.h
@@ -516,6  516,15 @@ cudaError_t cudaGraphUpload(...) {
     return hipErrorUnknown;
 }
 
 // Profiler
 cudaError_t cudaProfilerStart() {
   return hipProfilerStart();
 }
 
 cudaError_t cudaProfilerStop() {
   return hipProfilerStop();
 }
 
 } // extern "C"
 
 #endif // #ifndef INCLUDE_GUARD_HIP_CUPY_RUNTIME_H
diff --git a/cupy_backends/hip/cupy_profiler.h b/cupy_backends/hip/cupy_profiler.h
@@ -7,10  7,6 @@ extern "C" {
 
 typedef enum {} cudaOutputMode_t;
 
-cudaError_t cudaProfilerInitialize(...) {
-  return cudaSuccess;
-}
-
 cudaError_t cudaProfilerStart() {
   return hipProfilerStart();
 }

diff --git a/cupy_backends/stub/cupy_profiler.h b/cupy_backends/stub/cupy_profiler.h
@@ -7,12  7,6 @@
 
 extern "C" {
 
-typedef enum {} cudaOutputMode_t;
-
-cudaError_t cudaProfilerInitialize(...) {
-  return cudaSuccess;
-}
-
 cudaError_t cudaProfilerStart() {
   return cudaSuccess;
 }

diff --git a/install/cupy_builder/_features.py b/install/cupy_builder/_features.py
@@ -100,7  100,6 @@ def _from_dict(d: Dict[str, Any], ctx: Context) -> Feature:
     'cupy_backends.cuda.libs.curand',
     'cupy_backends.cuda.libs.cusparse',
     'cupy_backends.cuda.libs.nvrtc',
-    'cupy_backends.cuda.libs.profiler',
     'cupy_backends.cuda.stream',
     'cupy_backends.cuda._softlink',
     'cupy._core._accelerator',
@@ -462,8  461,6 @@ def __init__(self, ctx: Context):
             'curand.h',
             'cusparse.h',
         ]
-        # TODO(kmaehashi): Split profiler module so that dependency to
-        # `cudart` can be removed when using CUDA Python.
         self.libraries = (
             # CUDA Driver
             ([] if ctx.use_cuda_python else ['cuda'])