From fda91fac9df7429febfa61251db1044aa1149fc1 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 13 Mar 2024 10:22:13 -0500 Subject: [PATCH] Add upper bound to prevent usage of NumPy 2 (#4233) 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: - Rick Ratzel (https://github.com/rlratzel) - Ray Douglass (https://github.com/raydouglass) URL: https://github.com/rapidsai/cugraph/pull/4233 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-122_arch-x86_64.yaml | 2 +- conda/recipes/cugraph-dgl/meta.yaml | 2 +- conda/recipes/cugraph-pyg/meta.yaml | 2 +- conda/recipes/cugraph-service/meta.yaml | 2 +- dependencies.yaml | 2 +- python/cugraph-dgl/pyproject.toml | 2 +- python/cugraph-pyg/pyproject.toml | 2 +- python/cugraph-service/server/pyproject.toml | 4 ++-- python/cugraph/pyproject.toml | 4 ++-- python/nx-cugraph/pyproject.toml | 2 +- python/pylibcugraph/pyproject.toml | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 6aed308c498..f0eff82e1ae 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -42,7 +42,7 @@ dependencies: - ninja - notebook>=0.5.0 - numba>=0.57 -- numpy>=1.23 +- numpy>=1.23,<2.0a0 - numpydoc - nvcc_linux-64=11.8 - openmpi diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 4a095058219..93972f40d8b 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -48,7 +48,7 @@ dependencies: - ninja - notebook>=0.5.0 - numba>=0.57 -- numpy>=1.23 +- numpy>=1.23,<2.0a0 - numpydoc - openmpi - packaging>=21 diff --git a/conda/recipes/cugraph-dgl/meta.yaml b/conda/recipes/cugraph-dgl/meta.yaml index 09322a9c7d3..5e28e69a0d7 100644 --- a/conda/recipes/cugraph-dgl/meta.yaml +++ b/conda/recipes/cugraph-dgl/meta.yaml @@ -25,7 +25,7 @@ requirements: - cugraph ={{ version }} - dgl >=1.1.0.cu* - numba >=0.57 - - numpy >=1.23 + - numpy >=1.23,<2.0a0 - pylibcugraphops ={{ minor_version }} - python - pytorch diff --git a/conda/recipes/cugraph-pyg/meta.yaml b/conda/recipes/cugraph-pyg/meta.yaml index 624f5753fd2..4ada5e31211 100644 --- a/conda/recipes/cugraph-pyg/meta.yaml +++ b/conda/recipes/cugraph-pyg/meta.yaml @@ -28,7 +28,7 @@ requirements: run: - rapids-dask-dependency ={{ minor_version }} - numba >=0.57 - - numpy >=1.23 + - numpy >=1.23,<2.0a0 - python - pytorch >=2.0 - cupy >=12.0.0 diff --git a/conda/recipes/cugraph-service/meta.yaml b/conda/recipes/cugraph-service/meta.yaml index c04c1a7c7fa..8698d4f6985 100644 --- a/conda/recipes/cugraph-service/meta.yaml +++ b/conda/recipes/cugraph-service/meta.yaml @@ -60,7 +60,7 @@ outputs: - dask-cuda ={{ minor_version }} - dask-cudf ={{ minor_version }} - numba >=0.57 - - numpy >=1.23 + - numpy >=1.23,<2.0a0 - python - rapids-dask-dependency ={{ minor_version }} - thriftpy2 >=0.4.15 diff --git a/dependencies.yaml b/dependencies.yaml index e6cf6c9e93c..d8be5352c7d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -449,7 +449,7 @@ dependencies: - &dask rapids-dask-dependency==24.4.* - &dask_cuda dask-cuda==24.4.* - &numba numba>=0.57 - - &numpy numpy>=1.23 + - &numpy numpy>=1.23,<2.0a0 - &ucx_py ucx-py==0.37.* - output_types: conda packages: diff --git a/python/cugraph-dgl/pyproject.toml b/python/cugraph-dgl/pyproject.toml index c6f76325761..f17292c5e70 100644 --- a/python/cugraph-dgl/pyproject.toml +++ b/python/cugraph-dgl/pyproject.toml @@ -25,7 +25,7 @@ classifiers = [ dependencies = [ "cugraph==24.4.*", "numba>=0.57", - "numpy>=1.23", + "numpy>=1.23,<2.0a0", "pylibcugraphops==24.4.*", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. diff --git a/python/cugraph-pyg/pyproject.toml b/python/cugraph-pyg/pyproject.toml index cbee5ed4b58..150ecbf506b 100644 --- a/python/cugraph-pyg/pyproject.toml +++ b/python/cugraph-pyg/pyproject.toml @@ -29,7 +29,7 @@ classifiers = [ dependencies = [ "cugraph==24.4.*", "numba>=0.57", - "numpy>=1.23", + "numpy>=1.23,<2.0a0", "pylibcugraphops==24.4.*", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml index a32b18a9551..d6cf48432cb 100644 --- a/python/cugraph-service/server/pyproject.toml +++ b/python/cugraph-service/server/pyproject.toml @@ -26,7 +26,7 @@ dependencies = [ "dask-cuda==24.4.*", "dask-cudf==24.4.*", "numba>=0.57", - "numpy>=1.23", + "numpy>=1.23,<2.0a0", "rapids-dask-dependency==24.4.*", "rmm==24.4.*", "thriftpy2", @@ -46,7 +46,7 @@ cugraph-service-server = "cugraph_service_server.__main__:main" [project.optional-dependencies] test = [ "networkx>=2.5.1", - "numpy>=1.23", + "numpy>=1.23,<2.0a0", "pandas", "pytest", "pytest-benchmark", diff --git a/python/cugraph/pyproject.toml b/python/cugraph/pyproject.toml index 113c316ccbf..a6d3d841298 100644 --- a/python/cugraph/pyproject.toml +++ b/python/cugraph/pyproject.toml @@ -35,7 +35,7 @@ dependencies = [ "dask-cudf==24.4.*", "fsspec[http]>=0.6.0", "numba>=0.57", - "numpy>=1.23", + "numpy>=1.23,<2.0a0", "pylibcugraph==24.4.*", "raft-dask==24.4.*", "rapids-dask-dependency==24.4.*", @@ -53,7 +53,7 @@ classifiers = [ [project.optional-dependencies] test = [ "networkx>=2.5.1", - "numpy>=1.23", + "numpy>=1.23,<2.0a0", "pandas", "pytest", "pytest-benchmark", diff --git a/python/nx-cugraph/pyproject.toml b/python/nx-cugraph/pyproject.toml index 07ec0eab264..dbdc8dd19e1 100644 --- a/python/nx-cugraph/pyproject.toml +++ b/python/nx-cugraph/pyproject.toml @@ -33,7 +33,7 @@ classifiers = [ dependencies = [ "cupy-cuda11x>=12.0.0", "networkx>=3.0", - "numpy>=1.23", + "numpy>=1.23,<2.0a0", "pylibcugraph==24.4.*", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. diff --git a/python/pylibcugraph/pyproject.toml b/python/pylibcugraph/pyproject.toml index eb7323d19e5..d5f568a7a90 100644 --- a/python/pylibcugraph/pyproject.toml +++ b/python/pylibcugraph/pyproject.toml @@ -42,7 +42,7 @@ classifiers = [ [project.optional-dependencies] test = [ "cudf==24.4.*", - "numpy>=1.23", + "numpy>=1.23,<2.0a0", "pandas", "pytest", "pytest-benchmark",