Skip to content

Commit bd1ef45

Browse files
Merge branch 'main' into ksimpson/public_entrypoint_testing_196
2 parents d663afb + 6820f30 commit bd1ef45

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+793
-125
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ cuda_bindings/cuda/bindings/_bindings/cydriver.pxd
1919
cuda_bindings/cuda/bindings/_bindings/cydriver.pyx
2020
cuda_bindings/cuda/bindings/_bindings/cynvrtc.pxd
2121
cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx
22+
cuda_bindings/cuda/bindings/_internal/nvjitlink.pyx
2223
cuda_bindings/cuda/bindings/_lib/cyruntime/cyruntime.pxd
2324
cuda_bindings/cuda/bindings/_lib/cyruntime/cyruntime.pyx
2425
cuda_bindings/cuda/bindings/_lib/cyruntime/utils.pxd

cuda_bindings/MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
recursive-include cuda/ *.pyx *.pxd
22
# at least with setuptools 75.0.0 this folder was added erroneously
33
# to the payload, causing file copying to the build environment failed
4-
exclude cuda/bindings
4+
exclude cuda/bindings cuda?bindings

cuda_bindings/cuda/ccuda.pyx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@ cdef extern from *:
55
#pragma message ( "The cuda.ccuda module is deprecated and will be removed in a future release, " \
66
"please switch to use the cuda.bindings.cydriver module instead." )
77
"""
8+
9+
10+
from cuda.bindings import cydriver
11+
__pyx_capi__ = cydriver.__pyx_capi__
12+
del cydriver

cuda_bindings/cuda/ccudart.pyx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@ cdef extern from *:
55
#pragma message ( "The cuda.ccudart module is deprecated and will be removed in a future release, " \
66
"please switch to use the cuda.bindings.cyruntime module instead." )
77
"""
8+
9+
10+
from cuda.bindings import cyruntime
11+
__pyx_capi__ = cyruntime.__pyx_capi__
12+
del cyruntime

cuda_bindings/cuda/cnvrtc.pyx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@ cdef extern from *:
55
#pragma message ( "The cuda.cnvrtc module is deprecated and will be removed in a future release, " \
66
"please switch to use the cuda.bindings.cynvrtc module instead." )
77
"""
8+
9+
10+
from cuda.bindings import cynvrtc
11+
__pyx_capi__ = cynvrtc.__pyx_capi__
12+
del cynvrtc

cuda_bindings/docs/build_docs.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
set -ex
44

55
# SPHINX_CUDA_BINDINGS_VER is used to create a subdir under build/html
6-
# (the Makefile file for sphinx-build also honors it if defined)
6+
# (the Makefile file for sphinx-build also honors it if defined).
7+
# If there's a post release (ex: .post1) we don't want it to show up in the
8+
# version selector or directory structure.
79
if [[ -z "${SPHINX_CUDA_BINDINGS_VER}" ]]; then
8-
export SPHINX_CUDA_BINDINGS_VER=$(python -c "from importlib.metadata import version; print(version('cuda-python'))" \
10+
export SPHINX_CUDA_BINDINGS_VER=$(python -c "from importlib.metadata import version; \
11+
ver = '.'.join(str(version('cuda-python')).split('.')[:3]); \
12+
print(ver)" \
913
| awk -F'+' '{print $1}')
1014
fi
1115

cuda_bindings/docs/source/release.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
maxdepth: 3
66
---
77
8+
12.6.2 <release/12.6.2-notes>
89
12.6.1 <release/12.6.1-notes>
910
12.6.0 <release/12.6.0-notes>
1011
12.5.0 <release/12.5.0-notes>
@@ -14,6 +15,7 @@ maxdepth: 3
1415
12.2.0 <release/12.2.0-notes>
1516
12.1.0 <release/12.1.0-notes>
1617
12.0.0 <release/12.0.0-notes>
18+
11.8.5 <release/11.8.5-notes>
1719
11.8.4 <release/11.8.4-notes>
1820
11.8.3 <release/11.8.3-notes>
1921
11.8.2 <release/11.8.2-notes>

cuda_bindings/docs/source/release/11.4.0-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Released on August 16, 2021
44

5-
## Hightlights
5+
## Highlights
66
- Initial EA release for CUDA Python
77
- Supports all platforms that CUDA is supported
88
- Supports all CUDA 11.x releases

cuda_bindings/docs/source/release/11.5.0-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Released on October 18, 2021
44

5-
## Hightlights
5+
## Highlights
66
- PyPi support
77
- Conda support
88
- GA release for CUDA Python

cuda_bindings/docs/source/release/11.6.0-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Released on Januray 12, 2022
44

5-
## Hightlights
5+
## Highlights
66
- Support CUDA Toolkit 11.6
77
- Support Profiler APIs
88
- Support Graphic APIs (EGL, GL, VDPAU)

0 commit comments

Comments
 (0)