Skip to content

Move driver and nvrtc cython and internal layers to new generator #1972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mdboom wants to merge 21 commits into
base: main
Choose a base branch
from
Open

Move driver and nvrtc cython and internal layers to new generator #1972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f842321
Move driver and nvrtc cython and internal layers to new generator
mdboom Apr 24, 2026
992998a
Fix Cython interop tests
mdboom Apr 24, 2026
6b1d2d3
Handle headers differently
mdboom Apr 24, 2026
be5d972
Fix compilation
mdboom Apr 24, 2026
2d7c8dd
Make const match
mdboom Apr 24, 2026
f664c86
Fix compilation again
mdboom Apr 24, 2026
00ea580
Attempt to fix Windows build
mdboom Apr 25, 2026
9982e06
Fix Windows again
mdboom Apr 25, 2026
6bf0565
Fix not found error code
mdboom Apr 29, 2026
103c29f
Merge remote-tracking branch 'upstream/main' into driver-v2
mdboom Apr 29, 2026
591d101
Look up pointers in a different way
mdboom Apr 29, 2026
7119b96
Get first version right
mdboom Apr 29, 2026
0d7171c
Get first appearing versions correct
mdboom Apr 29, 2026
9bb9f5a
Fix weird special case
mdboom Apr 29, 2026
bcf5683
Merge remote-tracking branch 'upstream/main' into driver-v2
mdboom Jun 9, 2026
af70308
Fix exception signature to match what was there before
mdboom Jun 10, 2026
6a4655d
Merge remote-tracking branch 'upstream/main' into driver-v2
mdboom Jun 10, 2026
e5460c8
Also fix exception declaration in nvrtc
mdboom Jun 10, 2026
2275890
Merge branch 'main' into driver-v2
mdboom Jun 10, 2026
186c394
Merge branch 'main' into driver-v2
mdboom Jun 10, 2026
0155f57
Merge branch 'main' into driver-v2
mdboom Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,21 @@ __pycache__/
cache_driver
cache_runtime
cache_nvrtc
cuda_bindings/cuda/bindings/_lib/utils.pxi

# CUDA Python specific (auto-generated)
cuda_bindings/cuda/bindings/_bindings/cydriver.pxd
cuda_bindings/cuda/bindings/_bindings/cydriver.pyx
cuda_bindings/cuda/bindings/_bindings/cyruntime.pxd
cuda_bindings/cuda/bindings/_bindings/cyruntime.pyx
cuda_bindings/cuda/bindings/_bindings/cyruntime_ptds.pxd
cuda_bindings/cuda/bindings/_bindings/cyruntime_ptds.pyx
cuda_bindings/cuda/bindings/_internal/_nvml.pyx
cuda_bindings/cuda/bindings/_internal/cufile.pyx

@leofang leofang Jun 9, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: we should add them here now that both are auto-gen'd?

Suggested change
cuda_bindings/cuda/bindings/_internal/cufile.pyx
cuda_bindings/cuda/bindings/_internal/driver.pyx
cuda_bindings/cuda/bindings/_internal/nvrtc.pyx
cuda_bindings/cuda/bindings/_internal/cufile.pyx

@mdboom mdboom Jun 10, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We only want to ignore the .pyx files that come from .pyx.in files. .pyx files that are checked into cuda-python (even if generated by cybind) should not be on this list.

@leofang leofang Jun 10, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah @mdboom I see the confusion. Like cufile.pyx & co below, they are all auto-generated at build time too (from cufile_<platform>.pyx). It's different from the .pyx.in templates but still is generated code, hence it'd be nice to be consistent and ignore the generated files.

cuda_bindings/cuda/bindings/_internal/nvfatbin.pyx
cuda_bindings/cuda/bindings/_internal/nvjitlink.pyx
cuda_bindings/cuda/bindings/_internal/nvml.pyx
cuda_bindings/cuda/bindings/_internal/nvvm.pyx
cuda_bindings/cuda/bindings/_lib/utils.pxd
cuda_bindings/cuda/bindings/_lib/utils.pyx
cuda_bindings/cuda/bindings/cydriver.pxd
cuda_bindings/cuda/bindings/cydriver.pyx
cuda_bindings/cuda/bindings/cyruntime.pxd
cuda_bindings/cuda/bindings/cyruntime.pyx
cuda_bindings/cuda/bindings/cyruntime_functions.pxi
cuda_bindings/cuda/bindings/cyruntime_types.pxi
cuda_bindings/cuda/bindings/driver.pxd
cuda_bindings/cuda/bindings/driver.pyx
cuda_bindings/cuda/bindings/runtime.pxd
cuda_bindings/cuda/bindings/runtime.pyx
cuda_bindings/cuda/bindings/utils/_get_handle.pyx
Expand Down
7 changes: 0 additions & 7 deletions cuda_bindings/build_hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@ def _get_cuda_path() -> str:
# Header parsing helpers (called only from _build_cuda_bindings)

_REQUIRED_HEADERS = {
"driver": [
"cuda.h",
"cudaProfiler.h",
],
"runtime": [
"driver_types.h",
"vector_types.h",
Expand Down Expand Up @@ -449,9 +445,6 @@ def _cleanup_dst_files():
cuda_bindings_files = [f for f in cuda_bindings_files if "cufile" not in f]
sources_list = [
# private
(["cuda/bindings/_bindings/cydriver.pyx", "cuda/bindings/_bindings/loader.cpp"], None),
# cynvrtc.pyx is now in cuda/bindings/ (pre-generated by cybind),
# picked up by the cuda_bindings_files glob below.
(["cuda/bindings/_bindings/cyruntime.pyx"], static_runtime_libraries),
(["cuda/bindings/_bindings/cyruntime_ptds.pyx"], static_runtime_libraries),
# utils
Expand Down
17,354 changes: 0 additions & 17,354 deletions cuda_bindings/cuda/bindings/_bindings/cydriver.pyx.in
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cuda_bindings/cuda/bindings/_bindings/cyruntime.pxd.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE

# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1719+g565f73f4e. Do not modify it directly.
# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1630+gadce055ea.d20260422. Do not modify it directly.
include "../cyruntime_types.pxi"

include "../_lib/cyruntime/cyruntime.pxd"
Expand Down
2 changes: 1 addition & 1 deletion cuda_bindings/cuda/bindings/_bindings/cyruntime.pyx.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE

# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1719+g565f73f4e. Do not modify it directly.
# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1630+gadce055ea.d20260422. Do not modify it directly.
include "../cyruntime_functions.pxi"

import os
Expand Down
2 changes: 1 addition & 1 deletion cuda_bindings/cuda/bindings/_bindings/cyruntime_ptds.pxd.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE

# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1719+g565f73f4e. Do not modify it directly.
# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1630+gadce055ea.d20260422. Do not modify it directly.
cdef extern from "":
"""
#define CUDA_API_PER_THREAD_DEFAULT_STREAM
Expand Down
2 changes: 1 addition & 1 deletion cuda_bindings/cuda/bindings/_bindings/cyruntime_ptds.pyx.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE

# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1719+g565f73f4e. Do not modify it directly.
# This code was automatically generated with version 13.3.0, generator version 0.3.1.dev1630+gadce055ea.d20260422. Do not modify it directly.
cdef extern from "":
"""
#define CUDA_API_PER_THREAD_DEFAULT_STREAM
Expand Down
Loading
Loading