From 2c161dad4aa732e7a6901ab512aa9a0fac85afc4 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 13 Mar 2024 08:31:43 -0500 Subject: [PATCH] Add upper bound to prevent usage of NumPy 2 (#1501) NumPy 2 is expected to be released in the near future. For the RAPIDS 24.04 release, we will pin to `numpy>=1.23,<2.0a0`. This PR adds an upper bound to affected RAPIDS repositories. xref: https://github.com/rapidsai/build-planning/issues/29 Authors: - Bradley Dice (https://github.com/bdice) Approvers: - GALI PREM SAGAR (https://github.com/galipremsagar) - Mark Harris (https://github.com/harrism) - Ray Douglass (https://github.com/raydouglass) URL: https://github.com/rapidsai/rmm/pull/1501 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-122_arch-x86_64.yaml | 2 +- conda/recipes/rmm/meta.yaml | 2 +- dependencies.yaml | 2 +- python/pyproject.toml | 2 +- 5 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 d555eb104..c4bbcccd2 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -26,7 +26,7 @@ dependencies: - nbsphinx - ninja - numba>=0.57 -- numpy>=1.23 +- numpy>=1.23,<2.0a0 - numpydoc - nvcc_linux-64=11.8 - pre-commit diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 7c58c0024..63876715a 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -25,7 +25,7 @@ dependencies: - nbsphinx - ninja - numba>=0.57 -- numpy>=1.23 +- numpy>=1.23,<2.0a0 - numpydoc - pre-commit - pytest diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 01ac8cea8..764c3f75b 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -73,7 +73,7 @@ requirements: {% endif %} - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} - numba >=0.57 - - numpy >=1.23 + - numpy >=1.23,<2.0a0 test: imports: diff --git a/dependencies.yaml b/dependencies.yaml index ec6e33e68..548999f1b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -217,7 +217,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - numba>=0.57 - - numpy>=1.23 + - numpy>=1.23,<2.0a0 specific: - output_types: [conda, requirements, pyproject] matrices: diff --git a/python/pyproject.toml b/python/pyproject.toml index f9151ff8d..3f294d180 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -35,7 +35,7 @@ requires-python = ">=3.9" dependencies = [ "cuda-python>=11.7.1,<12.0a0", "numba>=0.57", - "numpy>=1.23", + "numpy>=1.23,<2.0a0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers",