From e9edb3403ea26380bca47839007760841a390b2a Mon Sep 17 00:00:00 2001 From: brandon-b-miller Date: Tue, 12 Nov 2024 07:07:25 -0800 Subject: [PATCH 1/2] update dependencies --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- dependencies.yaml | 4 ++-- python/cudf/pyproject.toml | 2 +- python/dask_cudf/pyproject.toml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 01764411346..4e34a1f86c2 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -55,7 +55,7 @@ dependencies: - nbsphinx - ninja - notebook -- numba-cuda>=0.0.13,<0.0.18 +- numba-cuda>=0.0.18 - numpy>=1.23,<3.0a0 - numpydoc - nvcc_linux-64=11.8 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 9074e6332d9..c2e79d2880e 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -54,7 +54,7 @@ dependencies: - nbsphinx - ninja - notebook -- numba-cuda>=0.0.13,<0.0.18 +- numba-cuda>=0.0.18 - numpy>=1.23,<3.0a0 - numpydoc - nvcomp==4.1.0.6 diff --git a/dependencies.yaml b/dependencies.yaml index e47e0c7523c..7253d6f9827 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -675,7 +675,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - cachetools - - &numba-cuda-dep numba-cuda>=0.0.13,<0.0.18 + - &numba-cuda-dep numba-cuda>=0.0.18 - nvtx>=0.2.1 - packaging - rich @@ -794,7 +794,7 @@ dependencies: - pandas==2.0.* - matrix: {dependencies: "latest"} packages: - - numba-cuda==0.0.15 + - numba-cuda>=0.0.18 - pandas==2.2.3 - matrix: packages: diff --git a/python/cudf/pyproject.toml b/python/cudf/pyproject.toml index ca6dbddfecc..c6e205d0af0 100644 --- a/python/cudf/pyproject.toml +++ b/python/cudf/pyproject.toml @@ -24,7 +24,7 @@ dependencies = [ "cupy-cuda11x>=12.0.0", "fsspec>=0.6.0", "libcudf==24.12.*,>=0.0.0a0", - "numba-cuda>=0.0.13,<0.0.18", + "numba-cuda>=0.0.18", "numpy>=1.23,<3.0a0", "nvtx>=0.2.1", "packaging", diff --git a/python/dask_cudf/pyproject.toml b/python/dask_cudf/pyproject.toml index c4bfc3054bc..2273ac9b0fd 100644 --- a/python/dask_cudf/pyproject.toml +++ b/python/dask_cudf/pyproject.toml @@ -46,7 +46,7 @@ cudf = "dask_cudf.backends:CudfDXBackendEntrypoint" [project.optional-dependencies] test = [ "dask-cuda==24.12.*,>=0.0.0a0", - "numba-cuda>=0.0.13,<0.0.18", + "numba-cuda>=0.0.18", "pytest-cov", "pytest-xdist", "pytest<8", From d508aa061e3ea941ae662d1f7dec2522018632b6 Mon Sep 17 00:00:00 2001 From: brandon-b-miller Date: Mon, 18 Nov 2024 11:36:43 -0800 Subject: [PATCH 2/2] dont import numba cuda indirectly via cython --- python/cudf/cudf/_lib/aggregation.pyx | 3 +-- python/cudf/cudf/utils/_numba.py | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/python/cudf/cudf/_lib/aggregation.pyx b/python/cudf/cudf/_lib/aggregation.pyx index 3c96b90f0a1..c2f01183689 100644 --- a/python/cudf/cudf/_lib/aggregation.pyx +++ b/python/cudf/cudf/_lib/aggregation.pyx @@ -7,7 +7,6 @@ import pylibcudf import cudf from cudf._lib.types import SUPPORTED_NUMPY_TO_PYLIBCUDF_TYPES -from cudf.utils import cudautils _agg_name_map = { "COUNT_VALID": "COUNT", @@ -196,7 +195,7 @@ class Aggregation: # Handling UDF type nb_type = numpy_support.from_dtype(kwargs['dtype']) type_signature = (nb_type[:],) - ptx_code, output_dtype = cudautils.compile_udf(op, type_signature) + ptx_code, output_dtype = cudf.utils.cudautils.compile_udf(op, type_signature) output_np_dtype = cudf.dtype(output_dtype) if output_np_dtype not in SUPPORTED_NUMPY_TO_PYLIBCUDF_TYPES: raise TypeError(f"Result of window function has unsupported dtype {op[1]}") diff --git a/python/cudf/cudf/utils/_numba.py b/python/cudf/cudf/utils/_numba.py index d9dde58d998..d6dedc1783a 100644 --- a/python/cudf/cudf/utils/_numba.py +++ b/python/cudf/cudf/utils/_numba.py @@ -130,9 +130,7 @@ def _setup_numba(): if driver_version < (12, 0): patch_numba_linker_cuda_11() else: - from pynvjitlink.patch import patch_numba_linker - - patch_numba_linker() + numba_config.CUDA_ENABLE_PYNVJITLINK = True class _CUDFNumbaConfig: