From 785aed4a0e7ea8e110bba3b2e375ec8633960c79 Mon Sep 17 00:00:00 2001 From: brandon-b-miller Date: Tue, 12 Dec 2023 09:56:04 -0800 Subject: [PATCH 1/7] remove numba restriction --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-120_arch-x86_64.yaml | 2 +- dependencies.yaml | 5 ++--- python/cudf/pyproject.toml | 2 +- python/dask_cudf/pyproject.toml | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 8e0a7bc5495..0e7e9d744e2 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -58,7 +58,7 @@ dependencies: - nbsphinx - ninja - notebook -- numba>=0.57,<0.58 +- numba - numpy>=1.21,<1.25 - numpydoc - nvcc_linux-64=11.8 diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index e52e0adb163..9a0620e34c3 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -57,7 +57,7 @@ dependencies: - nbsphinx - ninja - notebook -- numba>=0.57,<0.58 +- numba - numpy>=1.21,<1.25 - numpydoc - nvcomp==3.0.5 diff --git a/dependencies.yaml b/dependencies.yaml index 4a1c2ad1cd3..c7e8ea46ee5 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -481,8 +481,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - cachetools - # TODO: Pin to numba<0.58 until #14160 is resolved - - &numba numba>=0.57,<0.58 + - numba - nvtx>=0.2.1 - packaging - rich @@ -639,7 +638,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - dask-cuda==24.2.* - - *numba + - numba depends_on_cudf: common: - output_types: conda diff --git a/python/cudf/pyproject.toml b/python/cudf/pyproject.toml index d32284c0c5d..7927c18f147 100644 --- a/python/cudf/pyproject.toml +++ b/python/cudf/pyproject.toml @@ -31,7 +31,7 @@ dependencies = [ "cuda-python>=11.7.1,<12.0a0", "cupy-cuda11x>=12.0.0", "fsspec>=0.6.0", - "numba>=0.57,<0.58", + "numba", "numpy>=1.21,<1.25", "nvtx>=0.2.1", "packaging", diff --git a/python/dask_cudf/pyproject.toml b/python/dask_cudf/pyproject.toml index 890be46b974..1f97be40b7a 100644 --- a/python/dask_cudf/pyproject.toml +++ b/python/dask_cudf/pyproject.toml @@ -38,7 +38,7 @@ classifiers = [ [project.optional-dependencies] test = [ "dask-cuda==24.2.*", - "numba>=0.57,<0.58", + "numba", "pytest", "pytest-cov", "pytest-xdist", From ba89eed9aaf9293c15fb3a2f98d36c4c3d5bc59a Mon Sep 17 00:00:00 2001 From: brandon-b-miller Date: Tue, 12 Dec 2023 09:59:12 -0800 Subject: [PATCH 2/7] put lower bound back in --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-120_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 0e7e9d744e2..f17ad56b49f 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -58,7 +58,7 @@ dependencies: - nbsphinx - ninja - notebook -- numba +- numba>=0.57 - numpy>=1.21,<1.25 - numpydoc - nvcc_linux-64=11.8 diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index 9a0620e34c3..558fa6894c1 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -57,7 +57,7 @@ dependencies: - nbsphinx - ninja - notebook -- numba +- numba>=0.57 - numpy>=1.21,<1.25 - numpydoc - nvcomp==3.0.5 diff --git a/dependencies.yaml b/dependencies.yaml index c7e8ea46ee5..a9e068be361 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -481,7 +481,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - cachetools - - numba + - &numba numba>=0.57 - nvtx>=0.2.1 - packaging - rich @@ -638,7 +638,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - dask-cuda==24.2.* - - numba + - *numba depends_on_cudf: common: - output_types: conda diff --git a/python/cudf/pyproject.toml b/python/cudf/pyproject.toml index 7927c18f147..ea3b6034f92 100644 --- a/python/cudf/pyproject.toml +++ b/python/cudf/pyproject.toml @@ -31,7 +31,7 @@ dependencies = [ "cuda-python>=11.7.1,<12.0a0", "cupy-cuda11x>=12.0.0", "fsspec>=0.6.0", - "numba", + "numba>=0.57", "numpy>=1.21,<1.25", "nvtx>=0.2.1", "packaging", diff --git a/python/dask_cudf/pyproject.toml b/python/dask_cudf/pyproject.toml index 1f97be40b7a..01474faf746 100644 --- a/python/dask_cudf/pyproject.toml +++ b/python/dask_cudf/pyproject.toml @@ -38,7 +38,7 @@ classifiers = [ [project.optional-dependencies] test = [ "dask-cuda==24.2.*", - "numba", + "numba>=0.57", "pytest", "pytest-cov", "pytest-xdist", From 991312f052bb95bdc59daebf55a57e0e6bd998a7 Mon Sep 17 00:00:00 2001 From: brandon-b-miller Date: Thu, 14 Dec 2023 07:37:10 -0800 Subject: [PATCH 3/7] try numba/label/ci --- conda/environments/all_cuda-118_arch-x86_64.yaml | 1 + conda/environments/all_cuda-120_arch-x86_64.yaml | 1 + dependencies.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index f17ad56b49f..b605e820448 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -1,6 +1,7 @@ # This file is generated by `rapids-dependency-file-generator`. # To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. channels: +- numba/label/ci - rapidsai - rapidsai-nightly - dask/label/dev diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index 558fa6894c1..bce3aba9c0d 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -1,6 +1,7 @@ # This file is generated by `rapids-dependency-file-generator`. # To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. channels: +- numba/label/ci - rapidsai - rapidsai-nightly - dask/label/dev diff --git a/dependencies.yaml b/dependencies.yaml index a9e068be361..ccc63066fc3 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -184,6 +184,7 @@ files: includes: - test_python_common channels: + - numba/label/ci - rapidsai - rapidsai-nightly - dask/label/dev From 1e36a486134d291f2dd7fba17a450bca5e3ef1a6 Mon Sep 17 00:00:00 2001 From: brandon-b-miller Date: Thu, 14 Dec 2023 11:40:20 -0800 Subject: [PATCH 4/7] remove extra numba channel --- conda/environments/all_cuda-118_arch-x86_64.yaml | 1 - conda/environments/all_cuda-120_arch-x86_64.yaml | 1 - dependencies.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index b605e820448..f17ad56b49f 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -1,7 +1,6 @@ # This file is generated by `rapids-dependency-file-generator`. # To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. channels: -- numba/label/ci - rapidsai - rapidsai-nightly - dask/label/dev diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index bce3aba9c0d..558fa6894c1 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -1,7 +1,6 @@ # This file is generated by `rapids-dependency-file-generator`. # To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. channels: -- numba/label/ci - rapidsai - rapidsai-nightly - dask/label/dev diff --git a/dependencies.yaml b/dependencies.yaml index ccc63066fc3..a9e068be361 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -184,7 +184,6 @@ files: includes: - test_python_common channels: - - numba/label/ci - rapidsai - rapidsai-nightly - dask/label/dev From 5ffac4d6ab66b12c0ff3a24252b536ae23b4a78a Mon Sep 17 00:00:00 2001 From: brandon-b-miller Date: Thu, 14 Dec 2023 12:08:43 -0800 Subject: [PATCH 5/7] try installing numba 0.59 at the end --- ci/test_python_common.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh index 0e922c105dd..d840496d94f 100755 --- a/ci/test_python_common.sh +++ b/ci/test_python_common.sh @@ -34,3 +34,5 @@ rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ cudf libcudf + +rapids-mamba-retry install --channel "numba/label/ci" numba From 8e67d620fa8e0748482e74b5f48c5c0eb77bf671 Mon Sep 17 00:00:00 2001 From: brandon-b-miller Date: Fri, 15 Dec 2023 06:08:14 -0800 Subject: [PATCH 6/7] remove numba before reinstalling it --- ci/test_python_common.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh index d840496d94f..75273bf93ff 100755 --- a/ci/test_python_common.sh +++ b/ci/test_python_common.sh @@ -35,4 +35,5 @@ rapids-mamba-retry install \ --channel "${PYTHON_CHANNEL}" \ cudf libcudf +rapids-mamba-retry remove numba --force rapids-mamba-retry install --channel "numba/label/ci" numba From 0ea033c119e15e098509edbb89ac2380f7d0735e Mon Sep 17 00:00:00 2001 From: brandon-b-miller Date: Fri, 15 Dec 2023 09:14:53 -0800 Subject: [PATCH 7/7] revert previous two commits --- ci/test_python_common.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh index 75273bf93ff..0e922c105dd 100755 --- a/ci/test_python_common.sh +++ b/ci/test_python_common.sh @@ -34,6 +34,3 @@ rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ cudf libcudf - -rapids-mamba-retry remove numba --force -rapids-mamba-retry install --channel "numba/label/ci" numba