From 74069a6821c8117c6dc0836417cd3f1283079980 Mon Sep 17 00:00:00 2001 From: Vladislav Zhurba Date: Tue, 5 Nov 2024 22:54:33 -0800 Subject: [PATCH] Update __pyx_capi__ due to layout change --- cuda_bindings/cuda/ccuda.pyx | 5 +++++ cuda_bindings/cuda/ccudart.pyx | 5 +++++ cuda_bindings/cuda/cnvrtc.pyx | 5 +++++ cuda_bindings/setup.py | 6 ++---- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/cuda_bindings/cuda/ccuda.pyx b/cuda_bindings/cuda/ccuda.pyx index 73f3fc5c..a07525bb 100644 --- a/cuda_bindings/cuda/ccuda.pyx +++ b/cuda_bindings/cuda/ccuda.pyx @@ -5,3 +5,8 @@ cdef extern from *: #pragma message ( "The cuda.ccuda module is deprecated and will be removed in a future release, " \ "please switch to use the cuda.bindings.cydriver module instead." ) """ + + +from cuda.bindings import cydriver +__pyx_capi__ = cydriver.__pyx_capi__ +del cydriver diff --git a/cuda_bindings/cuda/ccudart.pyx b/cuda_bindings/cuda/ccudart.pyx index b32eece8..3cef0811 100644 --- a/cuda_bindings/cuda/ccudart.pyx +++ b/cuda_bindings/cuda/ccudart.pyx @@ -5,3 +5,8 @@ cdef extern from *: #pragma message ( "The cuda.ccudart module is deprecated and will be removed in a future release, " \ "please switch to use the cuda.bindings.cyruntime module instead." ) """ + + +from cuda.bindings import cyruntime +__pyx_capi__ = cyruntime.__pyx_capi__ +del cyruntime diff --git a/cuda_bindings/cuda/cnvrtc.pyx b/cuda_bindings/cuda/cnvrtc.pyx index d4034084..405d7de0 100644 --- a/cuda_bindings/cuda/cnvrtc.pyx +++ b/cuda_bindings/cuda/cnvrtc.pyx @@ -5,3 +5,8 @@ cdef extern from *: #pragma message ( "The cuda.cnvrtc module is deprecated and will be removed in a future release, " \ "please switch to use the cuda.bindings.cynvrtc module instead." ) """ + + +from cuda.bindings import cynvrtc +__pyx_capi__ = cynvrtc.__pyx_capi__ +del cynvrtc diff --git a/cuda_bindings/setup.py b/cuda_bindings/setup.py index fb9d7b95..3a20ff8c 100644 --- a/cuda_bindings/setup.py +++ b/cuda_bindings/setup.py @@ -228,8 +228,6 @@ def do_cythonize(extensions): ["cuda/bindings/*.pyx"], # public (deprecated, to be removed) ["cuda/*.pyx"], - # tests - ["tests/*.pyx"], ] for sources in sources_list: @@ -260,9 +258,9 @@ def finalize_options(self): setup( version=versioneer.get_version(), ext_modules=do_cythonize(extensions), - packages=find_packages(include=["cuda.cuda", "cuda.cuda.*", "cuda.cuda.bindings", "cuda.cuda.bindings._bindings", "cuda.cuda.bindings._lib", "cuda.cuda.bindings._lib.cyruntime", "tests"]), + packages=find_packages(include=["cuda", "cuda.*", "cuda.bindings", "cuda.bindings._bindings", "cuda.bindings._lib", "cuda.bindings._lib.cyruntime"]), package_data=dict.fromkeys( - find_packages(include=["cuda.cuda", "cuda.cuda.*", "cuda.cuda.bindings", "cuda.cuda.bindings._bindings", "cuda.cuda.bindings._lib", "cuda.cuda.bindings._lib.cyruntime", "tests"]), + find_packages(include=["cuda", "cuda.*", "cuda.bindings", "cuda.bindings._bindings", "cuda.bindings._lib", "cuda.bindings._lib.cyruntime"]), ["*.pxd", "*.pyx", "*.py", "*.h", "*.cpp"], ), cmdclass=cmdclass,