From dbe3e95aec4a990c86bc55783e7ba84e870593bd Mon Sep 17 00:00:00 2001 From: Bradley Dice <4302519+difyrrwrzd@users.noreply.github.com> Date: Wed, 13 Mar 2024 08:38:21 -0500 Subject: [PATCH] Add upper bound to prevent usage of NumPy 2 (#52) 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: - Divye Gala (https://github.com/divyegala) - Dante Gama Dessavre (https://github.com/dantegd) - Ray Douglass (https://github.com/raydouglass) URL: https://github.com/rapidsai/cuvs/pull/52 --- conda/environments/all_cuda-118_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-122_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-122_arch-x86_64.yaml | 2 +- dependencies.yaml | 2 +- python/cuvs/pyproject.toml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index e8854ea..897e200 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -40,7 +40,7 @@ dependencies: - make - nccl>=2.9.9 - ninja -- numpy>=1.23 +- numpy>=1.23,<2.0a0 - numpydoc - nvcc_linux-aarch64=11.8 - pre-commit diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index f8269df..92c9c2d 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -40,7 +40,7 @@ dependencies: - make - nccl>=2.9.9 - ninja -- 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-aarch64.yaml b/conda/environments/all_cuda-122_arch-aarch64.yaml index e5940cb..0e8fa75 100644 --- a/conda/environments/all_cuda-122_arch-aarch64.yaml +++ b/conda/environments/all_cuda-122_arch-aarch64.yaml @@ -37,7 +37,7 @@ dependencies: - make - nccl>=2.9.9 - ninja -- numpy>=1.23 +- numpy>=1.23,<2.0a0 - numpydoc - pre-commit - pydata-sphinx-theme diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 1008c02..06da6fe 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -37,7 +37,7 @@ dependencies: - make - nccl>=2.9.9 - ninja -- numpy>=1.23 +- numpy>=1.23,<2.0a0 - numpydoc - pre-commit - pydata-sphinx-theme diff --git a/dependencies.yaml b/dependencies.yaml index fedf494..ff3aa61 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -356,7 +356,7 @@ dependencies: common: - output_types: [conda, pyproject] packages: - - &numpy numpy>=1.23 + - &numpy numpy>=1.23,<2.0a0 - output_types: [conda] packages: - *rmm_conda diff --git a/python/cuvs/pyproject.toml b/python/cuvs/pyproject.toml index 07578ab..ae56a37 100644 --- a/python/cuvs/pyproject.toml +++ b/python/cuvs/pyproject.toml @@ -37,7 +37,7 @@ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ "cuda-python>=11.7.1,<12.0a0", - "numpy>=1.23", + "numpy>=1.23,<2.0a0", "pylibraft==24.4.*", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [