Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove NumPy <2 pin #4615

Merged
merged 27 commits into from
Sep 30, 2024
Merged

Remove NumPy <2 pin #4615

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
acafdae
Remove NumPy <2 pin.
seberg Aug 19, 2024
df1f21d
Include pre-release identifier for upper pin
seberg Aug 20, 2024
7d6267e
Merge branch 'branch-24.10' into my_new_branch
seberg Aug 23, 2024
287d629
Merge branch 'branch-24.10' into my_new_branch
jakirkham Aug 24, 2024
d54b7d8
Try removing torch pin from tests, add torchdata/pydantic explicitly
seberg Aug 24, 2024
3384bc6
Readd PyTorch and relax upperbound
jakirkham Aug 27, 2024
37d2ca0
Merge branch 'branch-24.10' into my_new_branch
jakirkham Aug 27, 2024
21b689b
Updates test to ensure a query string is created using integer vertex…
rlratzel Aug 28, 2024
d898b84
Cleanup based on review feedback: uses a list comprehension instead o…
rlratzel Aug 28, 2024
1d66490
Merge branch 'branch-24.10' into my_new_branch
alexbarghi-nv Aug 28, 2024
ba6cbab
Merge branch 'branch-24.10' into my_new_branch
jakirkham Aug 29, 2024
6fa8d19
Merge branch 'branch-24.10' into my_new_branch
seberg Sep 5, 2024
0e37bda
Merge branch 'branch-24.10' into my_new_branch
jameslamb Sep 17, 2024
a7d9a6b
Merge remote-tracking branch 'upstream/branch-24.10' into my_new_branch
hcho3 Sep 19, 2024
f74daa3
Force install Numpy 2.0
hcho3 Sep 20, 2024
3fea26d
Merge remote-tracking branch 'upstream/branch-24.10' into numpy20_sup…
hcho3 Sep 20, 2024
5e88901
Pin pytorch<2.4
hcho3 Sep 21, 2024
2929e81
Add pin pytorch<2.4
hcho3 Sep 23, 2024
16b457d
Reviewer's comment
hcho3 Sep 24, 2024
cecafb4
Update Conda recipes
hcho3 Sep 24, 2024
efdff0a
Merge remote-tracking branch 'upstream/branch-24.10' into numpy20_sup…
hcho3 Sep 24, 2024
7926695
Merge branch 'branch-24.10' into my_new_branch
jameslamb Sep 25, 2024
a49f912
Use pytorch 2.3.0
hcho3 Sep 25, 2024
195c5df
Merge remote-tracking branch 'upstream/branch-24.10' into numpy20_sup…
hcho3 Sep 26, 2024
7d7d042
Bump nccl; update torch pins
hcho3 Sep 26, 2024
d818cf0
Fix
hcho3 Sep 26, 2024
1320573
Merge branch 'branch-24.10' into my_new_branch
jakirkham Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies:
- ninja
- notebook>=0.5.0
- numba>=0.57
- numpy>=1.23,<2.0a0
- numpy>=1.23,<3.0a0
- numpydoc
- nvcc_linux-64=11.8
- openmpi
Expand All @@ -57,7 +57,6 @@ dependencies:
- pytest-mpl
- pytest-xdist
- python-louvain
- pytorch>=2.0,<2.2.0a0
- raft-dask==24.10.*,>=0.0.0a0
- rapids-build-backend>=0.3.1,<0.4.0.dev0
- rapids-dask-dependency==24.10.*,>=0.0.0a0
Expand Down
3 changes: 1 addition & 2 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies:
- ninja
- notebook>=0.5.0
- numba>=0.57
- numpy>=1.23,<2.0a0
- numpy>=1.23,<3.0a0
- numpydoc
- openmpi
- packaging>=21
Expand All @@ -62,7 +62,6 @@ dependencies:
- pytest-mpl
- pytest-xdist
- python-louvain
- pytorch>=2.0,<2.2.0a0
- raft-dask==24.10.*,>=0.0.0a0
- rapids-build-backend>=0.3.1,<0.4.0.dev0
- rapids-dask-dependency==24.10.*,>=0.0.0a0
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cugraph-dgl/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ requirements:
- cugraph ={{ version }}
- dgl >=1.1.0.cu*
- numba >=0.57
- numpy >=1.23,<2.0a0
- numpy >=1.23,<3.0a0
- pylibcugraphops ={{ minor_version }}
- tensordict >=0.1.2
- python
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cugraph-pyg/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ requirements:
run:
- rapids-dask-dependency ={{ minor_version }}
- numba >=0.57
- numpy >=1.23,<2.0a0
- numpy >=1.23,<3.0a0
- python
- pytorch >=2.0
- cupy >=12.0.0
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cugraph-service/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ outputs:
- dask-cuda ={{ minor_version }}
- dask-cudf ={{ minor_version }}
- numba >=0.57
- numpy >=1.23,<2.0a0
- numpy >=1.23,<3.0a0
- python
- rapids-dask-dependency ={{ minor_version }}
- thriftpy2 >=0.4.15,!=0.5.0,!=0.5.1
Expand Down
38 changes: 3 additions & 35 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ files:
- depends_on_pylibcugraphops
- depends_on_pylibwholegraph
- depends_on_cupy
- depends_on_pytorch
- python_run_cugraph
- python_run_nx_cugraph
- python_run_cugraph_dgl
Expand Down Expand Up @@ -66,7 +65,6 @@ files:
- cuda_version
- depends_on_cudf
- depends_on_pylibwholegraph
- depends_on_pytorch
- py_version
- test_python_common
- test_python_cugraph
Expand Down Expand Up @@ -202,7 +200,6 @@ files:
includes:
- test_python_common
- depends_on_pylibwholegraph
- depends_on_pytorch
py_build_cugraph_pyg:
output: pyproject
pyproject_dir: python/cugraph-pyg
Expand All @@ -229,7 +226,6 @@ files:
includes:
- test_python_common
- depends_on_pylibwholegraph
- depends_on_pytorch
py_build_cugraph_equivariant:
output: pyproject
pyproject_dir: python/cugraph-equivariant
Expand Down Expand Up @@ -524,7 +520,7 @@ dependencies:
- &dask rapids-dask-dependency==24.10.*,>=0.0.0a0
- &dask_cuda dask-cuda==24.10.*,>=0.0.0a0
- &numba numba>=0.57
- &numpy numpy>=1.23,<2.0a0
- &numpy numpy>=1.23,<3.0a0
- output_types: conda
packages:
- aiohttp
Expand Down Expand Up @@ -662,10 +658,12 @@ dependencies:
- output_types: [conda, pyproject]
packages:
- pandas
- pydantic
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious what pydantic is being used for

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DGL requires it. It tries to import it and raises an exception if it isn't available. It's used by GraphBolt.

- pytest
- pytest-benchmark
- pytest-cov
- pytest-xdist
- torchdata
- scipy
test_python_cugraph:
common:
Expand Down Expand Up @@ -710,36 +708,6 @@ dependencies:
- *tensordict
- pyg>=2.5,<2.6

depends_on_pytorch:
common:
- output_types: [conda]
packages:
- &pytorch_unsuffixed pytorch>=2.0,<2.2.0a0
- torchdata
- pydantic

specific:
- output_types: [requirements]
matrices:
- matrix: {cuda: "12.*"}
packages:
- --extra-index-url=https://download.pytorch.org/whl/cu121
- matrix: {cuda: "11.*"}
packages:
- --extra-index-url=https://download.pytorch.org/whl/cu118
- {matrix: null, packages: null}
- output_types: [requirements, pyproject]
matrices:
- matrix: {cuda: "12.*"}
packages:
- &pytorch_pip torch>=2.0,<2.2.0a0
- *tensordict
- matrix: {cuda: "11.*"}
packages:
- *pytorch_pip
- *tensordict
- {matrix: null, packages: [*pytorch_pip, *tensordict]}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think it is ok to keep this. We just want to relax the upper bound. At a minimum we need PyTorch 2.3.0 for NumPy 2 support ( pytorch/pytorch#107302 ). Though wonder if this upper bound can be dropped altogether

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As long as we have cupy>13.2 in our test environment we are ok to remove the upper bound

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm also ok if we enforce pytorch >=2.3 for both test and runtime

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep the discussion about what to do with the pytorch dependency in one thread, for ease of linking.

@hcho3 would >=2.3.0, as @alexbarghi-nv suggested here, work? A floor would be preferable to a ceiling, I think...otherwise this will have to be changed again in the next release.

Note: we should match whatever's done here in rapidsai/wholegraph#218

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, because 2.4.0 has issues with Conda-forge packaging. See conda-forge/pytorch-cpu-feedstock#254 (comment)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah! Sorry, I did see you'd posted that link but misunderstood what it contained. Ok great, I think a ceiling on 2.4.0 is ok here. Let's see what @alexbarghi-nv says.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was recently resolved. So have submitted PR ( #4703 ) to relax this in 24.12

depends_on_pylibwholegraph:
common:
- output_types: conda
Expand Down
2 changes: 2 additions & 0 deletions python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies:
- dgl>=1.1.0.cu*
- pandas
- pre-commit
- pydantic
- pylibcugraphops==24.10.*,>=0.0.0a0
- pytest
- pytest-benchmark
Expand All @@ -22,4 +23,5 @@ dependencies:
- pytorch>=2.0
- scipy
- tensordict>=0.1.2
- torchdata
name: cugraph_dgl_dev_cuda-118
6 changes: 3 additions & 3 deletions python/cugraph-dgl/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@ classifiers = [
dependencies = [
"cugraph==24.10.*,>=0.0.0a0",
"numba>=0.57",
"numpy>=1.23,<2.0a0",
"numpy>=1.23,<3.0a0",
"pylibcugraphops==24.10.*,>=0.0.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

[project.optional-dependencies]
test = [
"pandas",
"pydantic",
"pylibwholegraph==24.10.*,>=0.0.0a0",
"pytest",
"pytest-benchmark",
"pytest-cov",
"pytest-xdist",
"scipy",
"tensordict>=0.1.2",
"torch>=2.0,<2.2.0a0",
"torchdata",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

[project.urls]
Expand Down
2 changes: 2 additions & 0 deletions python/cugraph-equivariant/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,13 @@ Documentation = "https://docs.rapids.ai/api/cugraph/stable/api_docs/cugraph-ops/
[project.optional-dependencies]
test = [
"pandas",
"pydantic",
"pytest",
"pytest-benchmark",
"pytest-cov",
"pytest-xdist",
"scipy",
"torchdata",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

[tool.setuptools]
Expand Down
2 changes: 2 additions & 0 deletions python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies:
- cugraph==24.10.*,>=0.0.0a0
- pandas
- pre-commit
- pydantic
- pyg>=2.5,<2.6
- pylibcugraphops==24.10.*,>=0.0.0a0
- pytest
Expand All @@ -22,4 +23,5 @@ dependencies:
- pytorch>=2.0
- scipy
- tensordict>=0.1.2
- torchdata
name: cugraph_pyg_dev_cuda-118
6 changes: 3 additions & 3 deletions python/cugraph-pyg/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ classifiers = [
dependencies = [
"cugraph==24.10.*,>=0.0.0a0",
"numba>=0.57",
"numpy>=1.23,<2.0a0",
"numpy>=1.23,<3.0a0",
"pylibcugraphops==24.10.*,>=0.0.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

Expand All @@ -42,14 +42,14 @@ Documentation = "https://docs.rapids.ai/api/cugraph/stable/"
[project.optional-dependencies]
test = [
"pandas",
"pydantic",
"pylibwholegraph==24.10.*,>=0.0.0a0",
"pytest",
"pytest-benchmark",
"pytest-cov",
"pytest-xdist",
"scipy",
"tensordict>=0.1.2",
"torch>=2.0,<2.2.0a0",
"torchdata",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

[tool.setuptools]
Expand Down
6 changes: 4 additions & 2 deletions python/cugraph-service/server/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies = [
"dask-cuda==24.10.*,>=0.0.0a0",
"dask-cudf==24.10.*,>=0.0.0a0",
"numba>=0.57",
"numpy>=1.23,<2.0a0",
"numpy>=1.23,<3.0a0",
"rapids-dask-dependency==24.10.*,>=0.0.0a0",
"rmm==24.10.*,>=0.0.0a0",
"thriftpy2!=0.5.0,!=0.5.1",
Expand All @@ -47,15 +47,17 @@ cugraph-service-server = "cugraph_service_server.__main__:main"
[project.optional-dependencies]
test = [
"networkx>=2.5.1",
"numpy>=1.23,<2.0a0",
"numpy>=1.23,<3.0a0",
"pandas",
"pydantic",
"pytest",
"pytest-benchmark",
"pytest-cov",
"pytest-xdist",
"python-louvain",
"scikit-learn>=0.23.1",
"scipy",
"torchdata",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`.

[project.urls]
Expand Down
6 changes: 4 additions & 2 deletions python/cugraph/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"dask-cudf==24.10.*,>=0.0.0a0",
"fsspec[http]>=0.6.0",
"numba>=0.57",
"numpy>=1.23,<2.0a0",
"numpy>=1.23,<3.0a0",
"pylibcugraph==24.10.*,>=0.0.0a0",
"raft-dask==24.10.*,>=0.0.0a0",
"rapids-dask-dependency==24.10.*,>=0.0.0a0",
Expand All @@ -47,8 +47,9 @@ classifiers = [
[project.optional-dependencies]
test = [
"networkx>=2.5.1",
"numpy>=1.23,<2.0a0",
"numpy>=1.23,<3.0a0",
"pandas",
"pydantic",
"pylibwholegraph==24.10.*,>=0.0.0a0",
"pytest",
"pytest-benchmark",
Expand All @@ -57,6 +58,7 @@ test = [
"python-louvain",
"scikit-learn>=0.23.1",
"scipy",
"torchdata",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

[project.urls]
Expand Down
4 changes: 3 additions & 1 deletion python/nx-cugraph/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,22 @@ classifiers = [
dependencies = [
"cupy-cuda11x>=12.0.0",
"networkx>=3.0",
"numpy>=1.23,<2.0a0",
"numpy>=1.23,<3.0a0",
"pylibcugraph==24.10.*,>=0.0.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

[project.optional-dependencies]
test = [
"packaging>=21",
"pandas",
"pydantic",
"pytest",
"pytest-benchmark",
"pytest-cov",
"pytest-mpl",
"pytest-xdist",
"scipy",
"torchdata",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

[project.urls]
Expand Down
4 changes: 3 additions & 1 deletion python/pylibcugraph/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,15 @@ classifiers = [
[project.optional-dependencies]
test = [
"cudf==24.10.*,>=0.0.0a0",
"numpy>=1.23,<2.0a0",
"numpy>=1.23,<3.0a0",
"pandas",
"pydantic",
"pytest",
"pytest-benchmark",
"pytest-cov",
"pytest-xdist",
"scipy",
"torchdata",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

[project.urls]
Expand Down
Loading