cython: use cuda.ccuda.CUstream

madsbk · Aug 12, 2024 · d965e66 · d965e66
1 parent 53833b7
commit d965e66
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/conda/environments/all_cuda-125_arch-aarch64.yaml b/conda/environments/all_cuda-125_arch-aarch64.yaml
@@ -9,6 +9,7 @@ dependencies:
 - c-compiler
 - cmake>=3.26.4,!=3.30.0
 - cuda-nvcc
+- cuda-profiler-api>=12.0,<13.0a0
 - cuda-python>=12.0,<13.0a0
 - cuda-version=12.5
 - cupy>=12.0.0

diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -9,6 +9,7 @@ dependencies:
 - c-compiler
 - cmake>=3.26.4,!=3.30.0
 - cuda-nvcc
+- cuda-profiler-api>=12.0,<13.0a0
 - cuda-python>=12.0,<13.0a0
 - cuda-version=12.5
 - cupy>=12.0.0

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -326,6 +326,9 @@ dependencies:
               cuda: "12.*"
             packages:
               - cuda-python>=12.0,<13.0a0
+              # cuda-python's cython bindings requires cudaProfiler.h,
+              # which is found in cuda-profiler-api.
+              - cuda-profiler-api>=12.0,<13.0a0
           - matrix: # All CUDA 11 versions
             packages:
               - cuda-python>=11.7.1,<12.0a0

diff --git a/python/kvikio/kvikio/_lib/file_handle.pyx b/python/kvikio/kvikio/_lib/file_handle.pyx
@@ -9,6 +9,7 @@ from typing import Optional
 
 from posix cimport fcntl
 
+from cuda.ccuda cimport CUstream
 from libc.stdint cimport uintptr_t
 from libcpp cimport bool
 from libcpp.string cimport string
@@ -27,10 +28,6 @@ from kvikio._lib.future cimport (
 from kvikio._lib import defaults
 
 
-cdef extern from "cuda.h":
-    ctypedef void* CUstream
-
-
 cdef extern from "<kvikio/file_handle.hpp>" namespace "kvikio" nogil:
     cdef cppclass FileHandle:
         FileHandle() except +