Skip to content
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

Jump to bottom

Add pynvjitlink as a dependency #14763

Merged
merged 19 commits into from
Jan 19, 2024
Merged

Add pynvjitlink as a dependency #14763

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
532da9f
add pynvjitlink to run_cudf
brandon-b-miller Jan 16, 2024
02ef286
add pynvjitlink to meta.yaml for cudf
brandon-b-miller Jan 16, 2024
c6ae80c
unconditionally import patching function from pynvjitlink
brandon-b-miller Jan 16, 2024
6c110b4
Merge branch 'branch-24.02' into add-pynvjitlink-dep
jakirkham Jan 17, 2024
482be0f
Merge branch 'branch-24.02' into add-pynvjitlink-dep
brandon-b-miller Jan 17, 2024
d301cb9
add pynvjitlink to test_python_common
brandon-b-miller Jan 17, 2024
8b8a12c
Fix pynvjitlink dependencies.
bdice Jan 17, 2024
aefd0c0
Remove testing dependency on pynvjitlink.
bdice Jan 17, 2024
c6b3982
Remove double suffix.
bdice Jan 17, 2024
c424796
Merge branch 'branch-24.02' into add-pynvjitlink-dep
brandon-b-miller Jan 17, 2024
687225a
style
brandon-b-miller Jan 17, 2024
92c6bb1
locally import patch_numba_linker
brandon-b-miller Jan 17, 2024
7dbf9f2
update comment
brandon-b-miller Jan 17, 2024
e8a90b9
update comment
brandon-b-miller Jan 17, 2024
698f1a2
Fix typo.
bdice Jan 17, 2024
011038d
Merge branch 'branch-24.02' into add-pynvjitlink-dep
bdice Jan 17, 2024
b0972a9
Merge branch 'branch-24.02' into add-pynvjitlink-dep
bdice Jan 18, 2024
016c237
Merge branch 'branch-24.02' into add-pynvjitlink-dep
brandon-b-miller Jan 19, 2024
d5c1efa
Merge branch 'branch-24.02' into add-pynvjitlink-dep
brandon-b-miller Jan 19, 2024
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
2 changes: 1 addition & 1 deletion ci/build_wheel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ fi
if [[ $PACKAGE_CUDA_SUFFIX == "-cu12" ]]; then
sed -i "s/cuda-python[<=>\.,0-9a]*/cuda-python>=12.0,<13.0a0/g" ${pyproject_file}
sed -i "s/cupy-cuda11x/cupy-cuda12x/g" ${pyproject_file}
sed -i "/ptxcompiler/d" ${pyproject_file}
sed -i "s/ptxcompiler/pynvjitlink-cu12/g" ${pyproject_file}
bdice marked this conversation as resolved.
Show resolved Hide resolved
sed -i "/cubinlinker/d" ${pyproject_file}
fi

Expand Down
1 change: 1 addition & 0 deletions conda/environments/all_cuda-120_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ dependencies:
- protobuf>=4.21,<5
- pyarrow==14.0.1.*
- pydata-sphinx-theme!=0.14.2
- pynvjitlink
- pytest
- pytest-benchmark
- pytest-cases<3.8.2
Expand Down
3 changes: 2 additions & 1 deletion conda/recipes/cudf/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2018-2023, NVIDIA CORPORATION.
# Copyright (c) 2018-2024, NVIDIA CORPORATION.

{% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') %}
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
Expand Down Expand Up @@ -98,6 +98,7 @@ requirements:
# xref: https://github.com/rapidsai/cudf/issues/12822
- cuda-nvrtc
- cuda-python >=12.0,<13.0a0
- pynvjitlink
{% endif %}
Copy link
Member

Choose a reason for hiding this comment

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

Once we have a clearer idea on intended compatibility ( rapidsai/pynvjitlink#48 ), we may want to add some version constraints here

This could be done in a separate PR though

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, this is reasonable. John proposed pynvjitlink >=0.1.11,<0.2.0a0 offline, which seems appropriate to me.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah though let's discuss in the issue and we can do this as follow up (after this PR is merged)

- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- nvtx >=0.2.1
Expand Down
5 changes: 4 additions & 1 deletion dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,16 +533,19 @@ dependencies:
- {matrix: null, packages: *run_cudf_packages_all_cu11}
- output_types: conda
matrices:
- matrix: {cuda: "12.*"}
packages:
- pynvjitlink
- matrix: {cuda: "11.*"}
packages:
- cubinlinker
- ptxcompiler
- {matrix: null, packages: null}
- output_types: [requirements, pyproject]
matrices:
- matrix: {cuda: "12.*"}
packages:
- rmm-cu12==24.2.*
- pynvjitlink-cu12
- matrix: {cuda: "11.*"}
packages:
- rmm-cu11==24.2.*
Expand Down
19 changes: 4 additions & 15 deletions python/cudf/cudf/utils/_numba.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,13 @@
# Copyright (c) 2023, NVIDIA CORPORATION.
# Copyright (c) 2023-2024, NVIDIA CORPORATION.

import glob
import os
import sys
import warnings

from numba import config as numba_config

try:
from pynvjitlink.patch import (
patch_numba_linker as patch_numba_linker_pynvjitlink,
)
except ImportError:

def patch_numba_linker_pynvjitlink():
warnings.warn(
"CUDA Toolkit is newer than CUDA driver. "
"Numba features will not work in this configuration. "
)

from pynvjitlink.patch import (
patch_numba_linker as patch_numba_linker_pynvjitlink,
)

CC_60_PTX_FILE = os.path.join(
os.path.dirname(__file__), "../core/udf/shim_60.ptx"
Expand Down
Loading