Move one layer up

rapidsai · Oct 17, 2024 · e339b32 · e339b32
1 parent 405e144
commit e339b32
Show file tree

Hide file tree

Showing 98 changed files with 22 additions and 411 deletions.
diff --git a/.flake8 b/.flake8
@@ -1,25 +1,15 @@
-# Copyright (c) 2022-2024, NVIDIA CORPORATION.
+# Copyright (c) 2023-2024, NVIDIA CORPORATION.
 
 [flake8]
-filename = *.py, *.pyx, *.pxd, *.pxi
-exclude = __init__.py, *.egg, build, docs, .git
-force-check = True
 max-line-length = 88
-ignore =
-    # line break before binary operator
-    W503,
-    # whitespace before :
-    E203
+inline-quotes = "
+extend-ignore =
+    B020,
+    E203,
+    SIM105,
+    SIM401,
+# E203 whitespace before ':' (to be compatible with black)
 per-file-ignores =
-    # Rules ignored only in Cython:
-    # E211: whitespace before '(' (used in multi-line imports)
-    # E225: Missing whitespace around operators (breaks cython casting syntax like <int>)
-    # E226: Missing whitespace around arithmetic operators (breaks cython pointer syntax like int*)
-    # E227: Missing whitespace around bitwise or shift operator (Can also break casting syntax)
-    # E275: Missing whitespace after keyword (Doesn't work with Cython except?)
-    # E402: invalid syntax (works for Python, not Cython)
-    # E999: invalid syntax (works for Python, not Cython)
-    # W504: line break after binary operator (breaks lines that end with a pointer)
-    *.pyx: E211, E225, E226, E227, E275, E402, E999, W504
-    *.pxd: E211, E225, E226, E227, E275, E402, E999, W504
-    *.pxi: E211, E225, E226, E227, E275, E402, E999, W504
+    nx_cugraph/tests/*.py:T201,
+    __init__.py:F401,F403,
+    _nx_cugraph/__init__.py:E501,
diff --git a/python/Makefile → Makefile b/python/Makefile → Makefile
diff --git a/README.md b/README.md
@@ -8,8 +8,8 @@ to run supported algorithms with GPU acceleration.
 
 nx-cugraph requires the following:
  * NVIDIA GPU, Volta architecture or later, with [compute capability](https://developer.nvidia.com/cuda-gpus) 7.0+
- * CUDA 11.2, 11.4, 11.5, 11.8, or 12.0
- * Python version 3.9, 3.10, or 3.11
+ * CUDA 11.2, 11.4, 11.5, 11.8, 12.0, 12.2, or 12.5
+ * Python version 3.10, 3.11, or 3.12
  * NetworkX >= version 3.0 (version 3.2 or higher recommended)
 
 More details about system requirements can be found in the [RAPIDS System Requirements documentation](https://docs.rapids.ai/install#system-req).

diff --git a/python/_nx_cugraph/VERSION → _nx_cugraph/VERSION b/python/_nx_cugraph/VERSION → _nx_cugraph/VERSION
diff --git a/python/_nx_cugraph/__init__.py → _nx_cugraph/__init__.py b/python/_nx_cugraph/__init__.py → _nx_cugraph/__init__.py
diff --git a/python/_nx_cugraph/_version.py → _nx_cugraph/_version.py b/python/_nx_cugraph/_version.py → _nx_cugraph/_version.py
diff --git a/python/_nx_cugraph/core.py → _nx_cugraph/core.py b/python/_nx_cugraph/core.py → _nx_cugraph/core.py
diff --git a/python/conftest.py → conftest.py b/python/conftest.py → conftest.py
diff --git a/lint.yaml b/lint.yaml
@@ -26,7 +26,7 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.18
+    rev: v0.19
     hooks:
       - id: validate-pyproject
         name: Validate pyproject.toml
@@ -40,29 +40,29 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.16.0
+    rev: v3.17.0
     hooks:
       - id: pyupgrade
-        args: [--py39-plus]
+        args: [--py310-plus]
   - repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 24.8.0
     hooks:
       - id: black
       # - id: black-jupyter
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.4
+    rev: v0.6.7
     hooks:
       - id: ruff
         args: [--fix-only, --show-fixes]  # --unsafe-fixes]
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.0
+    rev: 7.1.1
     hooks:
       - id: flake8
         args: ['--per-file-ignores=_nx_cugraph/__init__.py:E501', '--extend-ignore=B020,SIM105']  # Why is this necessary?
         additional_dependencies: &flake8_dependencies
           # These versions need updated manually
-          - flake8==7.1.0
-          - flake8-bugbear==24.4.26
+          - flake8==7.1.1
+          - flake8-bugbear==24.8.19
           - flake8-simplify==0.21.0
   - repo: https://github.com/asottile/yesqa
     rev: v1.5.0
@@ -77,7 +77,7 @@ repos:
         additional_dependencies: [tomli]
         files: ^(nx_cugraph|docs)/
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.4
+    rev: v0.6.7
     hooks:
       - id: ruff
   - repo: https://github.com/pre-commit/pre-commit-hooks

diff --git a/python/nx_cugraph/__init__.py → nx_cugraph/__init__.py b/python/nx_cugraph/__init__.py → nx_cugraph/__init__.py
diff --git a/python/nx_cugraph/algorithms/__init__.py → nx_cugraph/algorithms/__init__.py b/python/nx_cugraph/algorithms/__init__.py → nx_cugraph/algorithms/__init__.py
diff --git a/..._cugraph/algorithms/bipartite/__init__.py → nx_cugraph/algorithms/bipartite/__init__.py b/..._cugraph/algorithms/bipartite/__init__.py → nx_cugraph/algorithms/bipartite/__init__.py
diff --git a/...ugraph/algorithms/bipartite/generators.py → ...ugraph/algorithms/bipartite/generators.py b/...ugraph/algorithms/bipartite/generators.py → ...ugraph/algorithms/bipartite/generators.py
diff --git a/...cugraph/algorithms/centrality/__init__.py → nx_cugraph/algorithms/centrality/__init__.py b/...cugraph/algorithms/centrality/__init__.py → nx_cugraph/algorithms/centrality/__init__.py
diff --git a/...raph/algorithms/centrality/betweenness.py → ...raph/algorithms/centrality/betweenness.py b/...raph/algorithms/centrality/betweenness.py → ...raph/algorithms/centrality/betweenness.py
diff --git a/...graph/algorithms/centrality/degree_alg.py → ...graph/algorithms/centrality/degree_alg.py b/...graph/algorithms/centrality/degree_alg.py → ...graph/algorithms/centrality/degree_alg.py
diff --git a/...raph/algorithms/centrality/eigenvector.py → ...raph/algorithms/centrality/eigenvector.py b/...raph/algorithms/centrality/eigenvector.py → ...raph/algorithms/centrality/eigenvector.py
diff --git a/.../nx_cugraph/algorithms/centrality/katz.py → nx_cugraph/algorithms/centrality/katz.py b/.../nx_cugraph/algorithms/centrality/katz.py → nx_cugraph/algorithms/centrality/katz.py
diff --git a/python/nx_cugraph/algorithms/cluster.py → nx_cugraph/algorithms/cluster.py b/python/nx_cugraph/algorithms/cluster.py → nx_cugraph/algorithms/cluster.py
diff --git a/..._cugraph/algorithms/community/__init__.py → nx_cugraph/algorithms/community/__init__.py b/..._cugraph/algorithms/community/__init__.py → nx_cugraph/algorithms/community/__init__.py
diff --git a/...x_cugraph/algorithms/community/louvain.py → nx_cugraph/algorithms/community/louvain.py b/...x_cugraph/algorithms/community/louvain.py → nx_cugraph/algorithms/community/louvain.py
diff --git a/...cugraph/algorithms/components/__init__.py → nx_cugraph/algorithms/components/__init__.py b/...cugraph/algorithms/components/__init__.py → nx_cugraph/algorithms/components/__init__.py
diff --git a/...ugraph/algorithms/components/connected.py → ...ugraph/algorithms/components/connected.py b/...ugraph/algorithms/components/connected.py → ...ugraph/algorithms/components/connected.py
diff --git a/...gorithms/components/strongly_connected.py → ...gorithms/components/strongly_connected.py b/...gorithms/components/strongly_connected.py → ...gorithms/components/strongly_connected.py
diff --git a/...algorithms/components/weakly_connected.py → ...algorithms/components/weakly_connected.py b/...algorithms/components/weakly_connected.py → ...algorithms/components/weakly_connected.py
diff --git a/python/nx_cugraph/algorithms/core.py → nx_cugraph/algorithms/core.py b/python/nx_cugraph/algorithms/core.py → nx_cugraph/algorithms/core.py
diff --git a/python/nx_cugraph/algorithms/dag.py → nx_cugraph/algorithms/dag.py b/python/nx_cugraph/algorithms/dag.py → nx_cugraph/algorithms/dag.py
diff --git a/python/nx_cugraph/algorithms/isolate.py → nx_cugraph/algorithms/isolate.py b/python/nx_cugraph/algorithms/isolate.py → nx_cugraph/algorithms/isolate.py
diff --git a/...raph/algorithms/link_analysis/__init__.py → ...raph/algorithms/link_analysis/__init__.py b/...raph/algorithms/link_analysis/__init__.py → ...raph/algorithms/link_analysis/__init__.py
diff --git a/...raph/algorithms/link_analysis/hits_alg.py → ...raph/algorithms/link_analysis/hits_alg.py b/...raph/algorithms/link_analysis/hits_alg.py → ...raph/algorithms/link_analysis/hits_alg.py
diff --git a/.../algorithms/link_analysis/pagerank_alg.py → .../algorithms/link_analysis/pagerank_alg.py b/.../algorithms/link_analysis/pagerank_alg.py → .../algorithms/link_analysis/pagerank_alg.py
diff --git a/..._cugraph/algorithms/operators/__init__.py → nx_cugraph/algorithms/operators/__init__.py b/..._cugraph/algorithms/operators/__init__.py → nx_cugraph/algorithms/operators/__init__.py
diff --git a/.../nx_cugraph/algorithms/operators/unary.py → nx_cugraph/algorithms/operators/unary.py b/.../nx_cugraph/algorithms/operators/unary.py → nx_cugraph/algorithms/operators/unary.py
diff --git a/python/nx_cugraph/algorithms/reciprocity.py → nx_cugraph/algorithms/reciprocity.py b/python/nx_cugraph/algorithms/reciprocity.py → nx_cugraph/algorithms/reciprocity.py
diff --git a/...aph/algorithms/shortest_paths/__init__.py → ...aph/algorithms/shortest_paths/__init__.py b/...aph/algorithms/shortest_paths/__init__.py → ...aph/algorithms/shortest_paths/__init__.py
diff --git a/...raph/algorithms/shortest_paths/generic.py → ...raph/algorithms/shortest_paths/generic.py b/...raph/algorithms/shortest_paths/generic.py → ...raph/algorithms/shortest_paths/generic.py
diff --git a/...h/algorithms/shortest_paths/unweighted.py → ...h/algorithms/shortest_paths/unweighted.py b/...h/algorithms/shortest_paths/unweighted.py → ...h/algorithms/shortest_paths/unweighted.py
diff --git a/...aph/algorithms/shortest_paths/weighted.py → ...aph/algorithms/shortest_paths/weighted.py b/...aph/algorithms/shortest_paths/weighted.py → ...aph/algorithms/shortest_paths/weighted.py
diff --git a/..._cugraph/algorithms/traversal/__init__.py → nx_cugraph/algorithms/traversal/__init__.py b/..._cugraph/algorithms/traversal/__init__.py → nx_cugraph/algorithms/traversal/__init__.py
diff --git a/...orithms/traversal/breadth_first_search.py → ...orithms/traversal/breadth_first_search.py b/...orithms/traversal/breadth_first_search.py → ...orithms/traversal/breadth_first_search.py
diff --git a/...on/nx_cugraph/algorithms/tree/__init__.py → nx_cugraph/algorithms/tree/__init__.py b/...on/nx_cugraph/algorithms/tree/__init__.py → nx_cugraph/algorithms/tree/__init__.py
diff --git a/...nx_cugraph/algorithms/tree/recognition.py → nx_cugraph/algorithms/tree/recognition.py b/...nx_cugraph/algorithms/tree/recognition.py → nx_cugraph/algorithms/tree/recognition.py
diff --git a/python/nx_cugraph/classes/__init__.py → nx_cugraph/classes/__init__.py b/python/nx_cugraph/classes/__init__.py → nx_cugraph/classes/__init__.py
diff --git a/python/nx_cugraph/classes/digraph.py → nx_cugraph/classes/digraph.py b/python/nx_cugraph/classes/digraph.py → nx_cugraph/classes/digraph.py
diff --git a/python/nx_cugraph/classes/function.py → nx_cugraph/classes/function.py b/python/nx_cugraph/classes/function.py → nx_cugraph/classes/function.py
diff --git a/python/nx_cugraph/classes/graph.py → nx_cugraph/classes/graph.py b/python/nx_cugraph/classes/graph.py → nx_cugraph/classes/graph.py
diff --git a/python/nx_cugraph/classes/multidigraph.py → nx_cugraph/classes/multidigraph.py b/python/nx_cugraph/classes/multidigraph.py → nx_cugraph/classes/multidigraph.py
diff --git a/python/nx_cugraph/classes/multigraph.py → nx_cugraph/classes/multigraph.py b/python/nx_cugraph/classes/multigraph.py → nx_cugraph/classes/multigraph.py
diff --git a/python/nx_cugraph/convert.py → nx_cugraph/convert.py b/python/nx_cugraph/convert.py → nx_cugraph/convert.py
diff --git a/python/nx_cugraph/convert_matrix.py → nx_cugraph/convert_matrix.py b/python/nx_cugraph/convert_matrix.py → nx_cugraph/convert_matrix.py
diff --git a/python/nx_cugraph/generators/__init__.py → nx_cugraph/generators/__init__.py b/python/nx_cugraph/generators/__init__.py → nx_cugraph/generators/__init__.py
diff --git a/python/nx_cugraph/generators/_utils.py → nx_cugraph/generators/_utils.py b/python/nx_cugraph/generators/_utils.py → nx_cugraph/generators/_utils.py
diff --git a/python/nx_cugraph/generators/classic.py → nx_cugraph/generators/classic.py b/python/nx_cugraph/generators/classic.py → nx_cugraph/generators/classic.py
diff --git a/python/nx_cugraph/generators/community.py → nx_cugraph/generators/community.py b/python/nx_cugraph/generators/community.py → nx_cugraph/generators/community.py
diff --git a/python/nx_cugraph/generators/ego.py → nx_cugraph/generators/ego.py b/python/nx_cugraph/generators/ego.py → nx_cugraph/generators/ego.py
diff --git a/python/nx_cugraph/generators/small.py → nx_cugraph/generators/small.py b/python/nx_cugraph/generators/small.py → nx_cugraph/generators/small.py
diff --git a/python/nx_cugraph/generators/social.py → nx_cugraph/generators/social.py b/python/nx_cugraph/generators/social.py → nx_cugraph/generators/social.py
diff --git a/python/nx_cugraph/interface.py → nx_cugraph/interface.py b/python/nx_cugraph/interface.py → nx_cugraph/interface.py
diff --git a/python/nx_cugraph/relabel.py → nx_cugraph/relabel.py b/python/nx_cugraph/relabel.py → nx_cugraph/relabel.py
diff --git a/python/nx_cugraph/scripts/__init__.py → nx_cugraph/scripts/__init__.py b/python/nx_cugraph/scripts/__init__.py → nx_cugraph/scripts/__init__.py
diff --git a/python/nx_cugraph/scripts/__main__.py → nx_cugraph/scripts/__main__.py b/python/nx_cugraph/scripts/__main__.py → nx_cugraph/scripts/__main__.py
diff --git a/python/nx_cugraph/scripts/print_table.py → nx_cugraph/scripts/print_table.py b/python/nx_cugraph/scripts/print_table.py → nx_cugraph/scripts/print_table.py
diff --git a/python/nx_cugraph/scripts/print_tree.py → nx_cugraph/scripts/print_tree.py b/python/nx_cugraph/scripts/print_tree.py → nx_cugraph/scripts/print_tree.py
diff --git a/python/nx_cugraph/tests/__init__.py → nx_cugraph/tests/__init__.py b/python/nx_cugraph/tests/__init__.py → nx_cugraph/tests/__init__.py
diff --git a/python/nx_cugraph/tests/bench_convert.py → nx_cugraph/tests/bench_convert.py b/python/nx_cugraph/tests/bench_convert.py → nx_cugraph/tests/bench_convert.py
diff --git a/python/nx_cugraph/tests/conftest.py → nx_cugraph/tests/conftest.py b/python/nx_cugraph/tests/conftest.py → nx_cugraph/tests/conftest.py
diff --git a/.../nx_cugraph/tests/ensure_algos_covered.py → nx_cugraph/tests/ensure_algos_covered.py b/.../nx_cugraph/tests/ensure_algos_covered.py → nx_cugraph/tests/ensure_algos_covered.py
diff --git a/python/nx_cugraph/tests/pytest.ini → nx_cugraph/tests/pytest.ini b/python/nx_cugraph/tests/pytest.ini → nx_cugraph/tests/pytest.ini
diff --git a/python/nx_cugraph/tests/test_bfs.py → nx_cugraph/tests/test_bfs.py b/python/nx_cugraph/tests/test_bfs.py → nx_cugraph/tests/test_bfs.py
diff --git a/python/nx_cugraph/tests/test_classes.py → nx_cugraph/tests/test_classes.py b/python/nx_cugraph/tests/test_classes.py → nx_cugraph/tests/test_classes.py
diff --git a/...nx_cugraph/tests/test_classes_function.py → nx_cugraph/tests/test_classes_function.py b/...nx_cugraph/tests/test_classes_function.py → nx_cugraph/tests/test_classes_function.py
diff --git a/python/nx_cugraph/tests/test_cluster.py → nx_cugraph/tests/test_cluster.py b/python/nx_cugraph/tests/test_cluster.py → nx_cugraph/tests/test_cluster.py
diff --git a/python/nx_cugraph/tests/test_community.py → nx_cugraph/tests/test_community.py b/python/nx_cugraph/tests/test_community.py → nx_cugraph/tests/test_community.py
diff --git a/python/nx_cugraph/tests/test_connected.py → nx_cugraph/tests/test_connected.py b/python/nx_cugraph/tests/test_connected.py → nx_cugraph/tests/test_connected.py
diff --git a/python/nx_cugraph/tests/test_convert.py → nx_cugraph/tests/test_convert.py b/python/nx_cugraph/tests/test_convert.py → nx_cugraph/tests/test_convert.py
diff --git a/...n/nx_cugraph/tests/test_convert_matrix.py → nx_cugraph/tests/test_convert_matrix.py b/...n/nx_cugraph/tests/test_convert_matrix.py → nx_cugraph/tests/test_convert_matrix.py
diff --git a/python/nx_cugraph/tests/test_ego_graph.py → nx_cugraph/tests/test_ego_graph.py b/python/nx_cugraph/tests/test_ego_graph.py → nx_cugraph/tests/test_ego_graph.py
diff --git a/python/nx_cugraph/tests/test_generators.py → nx_cugraph/tests/test_generators.py b/python/nx_cugraph/tests/test_generators.py → nx_cugraph/tests/test_generators.py
diff --git a/...on/nx_cugraph/tests/test_graph_methods.py → nx_cugraph/tests/test_graph_methods.py b/...on/nx_cugraph/tests/test_graph_methods.py → nx_cugraph/tests/test_graph_methods.py
diff --git a/python/nx_cugraph/tests/test_ktruss.py → nx_cugraph/tests/test_ktruss.py b/python/nx_cugraph/tests/test_ktruss.py → nx_cugraph/tests/test_ktruss.py
diff --git a/python/nx_cugraph/tests/test_match_api.py → nx_cugraph/tests/test_match_api.py b/python/nx_cugraph/tests/test_match_api.py → nx_cugraph/tests/test_match_api.py
diff --git a/python/nx_cugraph/tests/test_multigraph.py → nx_cugraph/tests/test_multigraph.py b/python/nx_cugraph/tests/test_multigraph.py → nx_cugraph/tests/test_multigraph.py
diff --git a/python/nx_cugraph/tests/test_pagerank.py → nx_cugraph/tests/test_pagerank.py b/python/nx_cugraph/tests/test_pagerank.py → nx_cugraph/tests/test_pagerank.py
diff --git a/python/nx_cugraph/tests/test_relabel.py → nx_cugraph/tests/test_relabel.py b/python/nx_cugraph/tests/test_relabel.py → nx_cugraph/tests/test_relabel.py
diff --git a/python/nx_cugraph/tests/test_utils.py → nx_cugraph/tests/test_utils.py b/python/nx_cugraph/tests/test_utils.py → nx_cugraph/tests/test_utils.py
diff --git a/python/nx_cugraph/tests/test_version.py → nx_cugraph/tests/test_version.py b/python/nx_cugraph/tests/test_version.py → nx_cugraph/tests/test_version.py
diff --git a/python/nx_cugraph/tests/testing_utils.py → nx_cugraph/tests/testing_utils.py b/python/nx_cugraph/tests/testing_utils.py → nx_cugraph/tests/testing_utils.py
diff --git a/python/nx_cugraph/typing.py → nx_cugraph/typing.py b/python/nx_cugraph/typing.py → nx_cugraph/typing.py
diff --git a/python/nx_cugraph/utils/__init__.py → nx_cugraph/utils/__init__.py b/python/nx_cugraph/utils/__init__.py → nx_cugraph/utils/__init__.py
diff --git a/python/nx_cugraph/utils/decorators.py → nx_cugraph/utils/decorators.py b/python/nx_cugraph/utils/decorators.py → nx_cugraph/utils/decorators.py
diff --git a/python/nx_cugraph/utils/misc.py → nx_cugraph/utils/misc.py b/python/nx_cugraph/utils/misc.py → nx_cugraph/utils/misc.py
diff --git a/python/pyproject.toml → pyproject.toml b/python/pyproject.toml → pyproject.toml
diff --git a/python/.flake8 b/python/.flake8
diff --git a/python/LICENSE b/python/LICENSE
diff --git a/python/README.md b/python/README.md
diff --git a/python/lint.yaml b/python/lint.yaml
diff --git a/python/run_nx_tests.sh → run_nx_tests.sh b/python/run_nx_tests.sh → run_nx_tests.sh
diff --git a/python/scripts/update_readme.py → scripts/update_readme.py b/python/scripts/update_readme.py → scripts/update_readme.py