Skip to content

Commit

Permalink
Add upper bound to prevent usage of NumPy 2 (#712)
Browse files Browse the repository at this point in the history
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: rapidsai/build-planning#29

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)
  - Gregory Lee (https://github.com/grlee77)

URL: #712
  • Loading branch information
bdice authored Mar 13, 2024
1 parent a661e09 commit 1874f49
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies:
- matplotlib-base
- nbsphinx
- ninja
- numpy>=1.23.4
- numpy>=1.23.4,<2.0a0
- numpydoc>=1.5
- nvcc_linux-64=11.8
- openslide-python>=1.3.0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-122_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies:
- matplotlib-base
- nbsphinx
- ninja
- numpy>=1.23.4
- numpy>=1.23.4,<2.0a0
- numpydoc>=1.5
- openslide-python>=1.3.0
- pip
Expand Down
3 changes: 1 addition & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,12 @@ dependencies:
- output_types: [conda, requirements, pyproject]
packages:
- lazy_loader>=0.1
- numpy>=1.23.4,<2.0a0
- scikit-image>=0.19.0,<0.23.0a0
- scipy
- output_types: conda
packages:
- cupy>=12.0.0
- numpy>=1.23.4
# All dependencies below this point are specific to `cucim.clara` and
# are not needed for either `cucim.core` or `cucim.skimage`. I did
# not include these under a "pyproject" output so that it is still
Expand All @@ -269,7 +269,6 @@ dependencies:
- output_types: [requirements, pyproject]
packages:
- cupy-cuda11x>=12.0.0
- numpy
test_python:
common:
- output_types: [conda, requirements, pyproject]
Expand Down
2 changes: 1 addition & 1 deletion python/cucim/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ requires-python = ">=3.9"
dependencies = [
"cupy-cuda11x>=12.0.0",
"lazy_loader>=0.1",
"numpy",
"numpy>=1.23.4,<2.0a0",
"scikit-image>=0.19.0,<0.23.0a0",
"scipy",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
Expand Down

0 comments on commit 1874f49

Please sign in to comment.