Try removing torch pin from tests, add torchdata/pydantic explicitly

See gh-4486 for adding torchdata/pydantic and gh-4464 for introducing the torch pin due to NCCL difficulties. It is entirely possible that this still fails due to the NCCL issue!
rapidsai · Aug 24, 2024 · d54b7d8 · d54b7d8
1 parent 287d629
commit d54b7d8
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 40 deletions.
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -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

diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -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

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -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
@@ -66,7 +65,6 @@ files:
       - cuda_version
       - depends_on_cudf
       - depends_on_pylibwholegraph
-      - depends_on_pytorch
       - py_version
       - test_python_common
       - test_python_cugraph
@@ -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
@@ -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
@@ -662,10 +658,12 @@ dependencies:
       - output_types: [conda, pyproject]
         packages:
           - pandas
+          - pydantic
           - pytest
           - pytest-benchmark
           - pytest-cov
           - pytest-xdist
+          - torchdata
           - scipy
   test_python_cugraph:
     common:
@@ -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]}
-
   depends_on_pylibwholegraph:
     common:
       - output_types: conda

diff --git a/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml b/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml
@@ -13,6 +13,7 @@ dependencies:
 - dgl>=1.1.0.cu*
 - pandas
 - pre-commit
+- pydantic
 - pylibcugraphops==24.10.*,>=0.0.0a0
 - pytest
 - pytest-benchmark
@@ -22,4 +23,5 @@ dependencies:
 - pytorch>=2.0
 - scipy
 - tensordict>=0.1.2
+- torchdata
 name: cugraph_dgl_dev_cuda-118
diff --git a/python/cugraph-dgl/pyproject.toml b/python/cugraph-dgl/pyproject.toml
@@ -33,14 +33,14 @@ dependencies = [
 [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]

diff --git a/python/cugraph-equivariant/pyproject.toml b/python/cugraph-equivariant/pyproject.toml
@@ -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]

diff --git a/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml b/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml
@@ -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
@@ -22,4 +23,5 @@ dependencies:
 - pytorch>=2.0
 - scipy
 - tensordict>=0.1.2
+- torchdata
 name: cugraph_pyg_dev_cuda-118
diff --git a/python/cugraph-pyg/pyproject.toml b/python/cugraph-pyg/pyproject.toml
@@ -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]

diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml
@@ -49,13 +49,15 @@ test = [
     "networkx>=2.5.1",
     "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]

diff --git a/python/cugraph/pyproject.toml b/python/cugraph/pyproject.toml
@@ -49,6 +49,7 @@ test = [
     "networkx>=2.5.1",
     "numpy>=1.23,<3.0a0",
     "pandas",
+    "pydantic",
     "pylibwholegraph==24.10.*,>=0.0.0a0",
     "pytest",
     "pytest-benchmark",
@@ -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]

diff --git a/python/nx-cugraph/pyproject.toml b/python/nx-cugraph/pyproject.toml
@@ -42,12 +42,14 @@ 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]

diff --git a/python/pylibcugraph/pyproject.toml b/python/pylibcugraph/pyproject.toml
@@ -43,11 +43,13 @@ test = [
     "cudf==24.10.*,>=0.0.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]