From 4f0481c84d4ff65496debea76944079985943e67 Mon Sep 17 00:00:00 2001 From: Graham Markall Date: Fri, 2 Aug 2024 10:20:33 +0100 Subject: [PATCH 1/5] Use numba-cuda>=0.0.13 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/recipes/cudf/meta.yaml | 2 +- dependencies.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index d04804cafafe..4364251fcaa2 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>=0.57 +- numba-cuda>=0.0.13 - numpy>=1.23,<2.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 e2c3558030d9..f22c9d97b0b0 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>=0.57 +- numba-cuda>=0.0.13 - numpy>=1.23,<2.0a0 - numpydoc - nvcomp==3.0.6 diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml index 9137f099ad19..49f59bd33bc1 100644 --- a/conda/recipes/cudf/meta.yaml +++ b/conda/recipes/cudf/meta.yaml @@ -82,7 +82,7 @@ requirements: - typing_extensions >=4.0.0 - pandas >=2.0,<2.2.3dev0 - cupy >=12.0.0 - - numba >=0.57 + - numba-cuda >= 0.0.13 # TODO: Update `numpy` in `host` when dropping `<2.0a0` - numpy >=1.23,<2.0a0 - {{ pin_compatible('pyarrow', max_pin='x.x') }} diff --git a/dependencies.yaml b/dependencies.yaml index abb55a5e0117..524dcba4cc9d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -565,7 +565,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - cachetools - - &numba numba>=0.57 + - &numba-cuda numba-cuda>=0.0.13 - nvtx>=0.2.1 - packaging - rich @@ -723,7 +723,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - dask-cuda==24.10.*,>=0.0.0a0 - - *numba + - *numba-cuda depends_on_cudf: common: - output_types: conda From 421e6253adbb438f39e380376fdfe3df11ddc059 Mon Sep 17 00:00:00 2001 From: Graham Markall Date: Fri, 2 Aug 2024 10:29:58 +0100 Subject: [PATCH 2/5] Use numba-cuda>=0.0.13 in pyproject.tomls --- python/cudf/pyproject.toml | 2 +- python/dask_cudf/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/cudf/pyproject.toml b/python/cudf/pyproject.toml index b2ddb06d8c95..94899afa1474 100644 --- a/python/cudf/pyproject.toml +++ b/python/cudf/pyproject.toml @@ -23,7 +23,7 @@ dependencies = [ "cuda-python>=11.7.1,<12.0a0", "cupy-cuda11x>=12.0.0", "fsspec>=0.6.0", - "numba>=0.57", + "numba-cuda>=0.0.13", "numpy>=1.23,<2.0a0", "nvtx>=0.2.1", "packaging", diff --git a/python/dask_cudf/pyproject.toml b/python/dask_cudf/pyproject.toml index 872ecd35c283..2f53c385b272 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.10.*,>=0.0.0a0", - "numba>=0.57", + "numba-cuda>=0.0.13", "pytest-cov", "pytest-xdist", "pytest<8", From 29859edb4051c8a0778aae2c863cf537360911dd Mon Sep 17 00:00:00 2001 From: Graham Markall Date: Fri, 2 Aug 2024 20:18:57 +0100 Subject: [PATCH 3/5] Try and fix syntax issue in dependencies.yaml --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 524dcba4cc9d..1908c5928a7d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -565,7 +565,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - cachetools - - &numba-cuda numba-cuda>=0.0.13 + - &numba_cuda numba-cuda>=0.0.13 - nvtx>=0.2.1 - packaging - rich @@ -723,7 +723,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - dask-cuda==24.10.*,>=0.0.0a0 - - *numba-cuda + - *numba_cuda depends_on_cudf: common: - output_types: conda From fa93beb54823ec8369527a229b4b3ba8be87662e Mon Sep 17 00:00:00 2001 From: Graham Markall <535640+gmarkall@users.noreply.github.com> Date: Fri, 2 Aug 2024 21:08:07 +0100 Subject: [PATCH 4/5] Update conda/recipes/cudf/meta.yaml Co-authored-by: Mike Sarahan --- conda/recipes/cudf/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml index 49f59bd33bc1..e008f85846e0 100644 --- a/conda/recipes/cudf/meta.yaml +++ b/conda/recipes/cudf/meta.yaml @@ -82,7 +82,7 @@ requirements: - typing_extensions >=4.0.0 - pandas >=2.0,<2.2.3dev0 - cupy >=12.0.0 - - numba-cuda >= 0.0.13 + - numba-cuda >=0.0.13 # TODO: Update `numpy` in `host` when dropping `<2.0a0` - numpy >=1.23,<2.0a0 - {{ pin_compatible('pyarrow', max_pin='x.x') }} From b87d83ffe865127170af0836baf2bf2ed0064a7b Mon Sep 17 00:00:00 2001 From: Graham Markall <535640+gmarkall@users.noreply.github.com> Date: Sat, 3 Aug 2024 10:05:47 +0100 Subject: [PATCH 5/5] Apply suggestions from code review --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 1908c5928a7d..25b3e79bf90e 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -565,7 +565,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - cachetools - - &numba_cuda numba-cuda>=0.0.13 + - &numba-cuda-dep numba-cuda>=0.0.13 - nvtx>=0.2.1 - packaging - rich @@ -723,7 +723,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - dask-cuda==24.10.*,>=0.0.0a0 - - *numba_cuda + - *numba-cuda-dep depends_on_cudf: common: - output_types: conda