From 6cfd9a9f2933c7d9834939142ac9f0a3a613623e Mon Sep 17 00:00:00 2001 From: Ralph Liu Date: Mon, 21 Oct 2024 14:23:19 -0700 Subject: [PATCH 1/3] Pre-commit suggestions --- dependencies.yaml | 248 +++++++++++++++++++++++++++++++ python/nx-cugraph/pyproject.toml | 3 +- 2 files changed, 250 insertions(+), 1 deletion(-) create mode 100644 dependencies.yaml diff --git a/dependencies.yaml b/dependencies.yaml new file mode 100644 index 000000000..e023115ba --- /dev/null +++ b/dependencies.yaml @@ -0,0 +1,248 @@ +# Dependency list for https://github.com/rapidsai/dependency-file-generator +files: + all: + output: [conda] + matrix: + cuda: ["11.8", "12.5"] + arch: [x86_64] + includes: + - checks + - cuda_version + - docs + - python_build_rapids + - python_build_wheel + - test_python_common + - python_run_nx_cugraph + - depends_on_pylibcugraph + - test_python_nx_cugraph + - depends_on_cupy + - depends_on_cudf + checks: + output: none + includes: + - checks + - py_version + docs: + output: none + includes: + - cuda_version + - docs + - py_version + test_notebooks: + output: none + includes: + - cuda_version + - py_version + - test_notebook + py_build_nx_cugraph: + output: pyproject + pyproject_dir: python/nx-cugraph + extras: + table: build-system + includes: + - python_build_rapids + - python_build_wheel + py_run_nx_cugraph: + output: pyproject + pyproject_dir: python/nx-cugraph + extras: + table: project + includes: + - depends_on_pylibcugraph + - depends_on_cupy + - python_run_nx_cugraph + py_test_nx_cugraph: + output: pyproject + pyproject_dir: python/nx-cugraph + extras: + table: project.optional-dependencies + key: test + includes: + - depends_on_cudf + - test_python_common + - test_python_nx_cugraph + +channels: + - rapidsai + - rapidsai-nightly + - conda-forge + - nvidia +dependencies: + checks: + common: + - output_types: [conda, requirements] + packages: + - pre-commit + cuda_version: + specific: + - output_types: conda + matrices: + - matrix: + cuda: "11.2" + packages: + - cuda-version=11.2 + - matrix: + cuda: "11.4" + packages: + - cuda-version=11.4 + - matrix: + cuda: "11.5" + packages: + - cuda-version=11.5 + - matrix: + cuda: "11.8" + packages: + - cuda-version=11.8 + - matrix: + cuda: "12.0" + packages: + - cuda-version=12.0 + - matrix: + cuda: "12.2" + packages: + - cuda-version=12.2 + - matrix: + cuda: "12.5" + packages: + - cuda-version=12.5 + docs: + common: + - output_types: [conda] + packages: + - graphviz + - ipython + - nbsphinx + - numpydoc + - pydata-sphinx-theme + - recommonmark + - sphinx-copybutton + - sphinx-markdown-tables + - sphinx<6 + - sphinxcontrib-websupport + py_version: + specific: + - output_types: [conda] + matrices: + - matrix: + py: "3.10" + packages: + - python=3.10 + - matrix: + py: "3.11" + packages: + - python=3.11 + - matrix: + py: "3.12" + packages: + - python=3.12 + - matrix: + packages: + - python>=3.10,<3.13 + python_build_rapids: + common: + - output_types: [conda, pyproject, requirements] + packages: + - rapids-build-backend>=0.3.1,<0.4.0.dev0 + python_build_wheel: + common: + - output_types: [conda, pyproject, requirements] + packages: + - setuptools>=61.0.0 + - wheel + test_notebook: + common: + - output_types: [conda, requirements] + packages: + - ipython + - notebook>=0.5.0 + - output_types: [conda] + packages: + - wget + test_python_common: + common: + - output_types: [conda, pyproject] + packages: + - pandas + - pytest + - pytest-benchmark + - pytest-cov + - pytest-xdist + - scipy + python_run_nx_cugraph: + common: + - output_types: [conda, pyproject] + packages: + - networkx>=3.0 + - &numpy numpy>=1.23,<3.0a0 + test_python_nx_cugraph: + common: + - output_types: [conda, pyproject] + packages: + # not needed by nx-cugraph tests, but is required for running networkx tests + - pytest-mpl + depends_on_cupy: + common: + - output_types: conda + packages: + - cupy>=12.0.0 + # NOTE: This is intentionally not broken into groups by a 'cuda_suffixed' selector like + # other packages with -cu{nn}x suffixes in this file. + # All RAPIDS wheel builds (including in devcontainers) expect cupy to be suffixed. + specific: + - output_types: [requirements, pyproject] + matrices: + - matrix: {cuda: "12.*"} + packages: + - cupy-cuda12x>=12.0.0 + - matrix: {cuda: "11.*"} + packages: &cupy_packages_cu11 + - cupy-cuda11x>=12.0.0 + - {matrix: null, packages: *cupy_packages_cu11} + depends_on_cudf: + common: + - output_types: conda + packages: + - &cudf_unsuffixed cudf==24.12.* + - output_types: requirements + packages: + # pip recognizes the index as a global option for the requirements.txt file + - --extra-index-url=https://pypi.nvidia.com + - --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple + specific: + - output_types: [requirements, pyproject] + matrices: + - matrix: + cuda: "12.*" + cuda_suffixed: "true" + packages: + - cudf-cu12==24.12.* + - matrix: + cuda: "11.*" + cuda_suffixed: "true" + packages: + - cudf-cu11==24.12.* + - {matrix: null, packages: [*cudf_unsuffixed]} + depends_on_pylibcugraph: + common: + - output_types: conda + packages: + - &pylibcugraph_unsuffixed pylibcugraph==24.12.* + - output_types: requirements + packages: + # pip recognizes the index as a global option for the requirements.txt file + - --extra-index-url=https://pypi.nvidia.com + - --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple + specific: + - output_types: [requirements, pyproject] + matrices: + - matrix: + cuda: "12.*" + cuda_suffixed: "true" + packages: + - pylibcugraph-cu12==24.12.* + - matrix: + cuda: "11.*" + cuda_suffixed: "true" + packages: + - pylibcugraph-cu11==24.12.* + - {matrix: null, packages: [*pylibcugraph_unsuffixed]} diff --git a/python/nx-cugraph/pyproject.toml b/python/nx-cugraph/pyproject.toml index d145aa549..fc89c90db 100644 --- a/python/nx-cugraph/pyproject.toml +++ b/python/nx-cugraph/pyproject.toml @@ -35,11 +35,12 @@ dependencies = [ "cupy-cuda11x>=12.0.0", "networkx>=3.0", "numpy>=1.23,<3.0a0", - "pylibcugraph==24.12.*,>=0.0.0a0", + "pylibcugraph==24.12.*", ] # 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 = [ + "cudf==24.12.*", "pandas", "pytest", "pytest-benchmark", From 9c1c3b40c3bed11640d082b92cfa2c8d0036ad8d Mon Sep 17 00:00:00 2001 From: Ralph Liu Date: Mon, 28 Oct 2024 07:26:47 -0700 Subject: [PATCH 2/3] Remove `--mode=release` for changes targetting branch-24.12 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b65faff9d..ac081df0b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -54,7 +54,7 @@ repos: meta[.]yaml$| setup[.]cfg$ - id: verify-alpha-spec - args: ["--fix", "--mode=release"] + args: ["--fix"] - repo: https://github.com/rapidsai/dependency-file-generator rev: v1.13.11 hooks: From 94b47c0507d41ab404f6e5d4c5296374b2c318e8 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 28 Oct 2024 10:46:49 -0500 Subject: [PATCH 3/3] Run pre-commit. --- .github/CODEOWNERS | 2 +- .github/workflows/add-to-project.yaml | 2 +- .github/workflows/labeler.yaml | 2 +- .github/workflows/pr.yaml | 2 +- .../all_cuda-118_arch-x86_64.yaml | 36 +++++++++++++++++++ .../all_cuda-125_arch-x86_64.yaml | 36 +++++++++++++++++++ dependencies.yaml | 12 +++---- python/nx-cugraph/pyproject.toml | 4 +-- 8 files changed, 84 insertions(+), 12 deletions(-) create mode 100644 conda/environments/all_cuda-118_arch-x86_64.yaml create mode 100644 conda/environments/all_cuda-125_arch-x86_64.yaml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 86c489c25..1e8223985 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -3,7 +3,7 @@ # doc code owners -# +# # python code owners diff --git a/.github/workflows/add-to-project.yaml b/.github/workflows/add-to-project.yaml index 6fec09bae..13ad5079c 100644 --- a/.github/workflows/add-to-project.yaml +++ b/.github/workflows/add-to-project.yaml @@ -17,4 +17,4 @@ jobs: - uses: actions/add-to-project@v0.3.0 with: project-url: https://github.com/orgs/rapidsai/projects/47 - github-token: ${{ secrets.ADD_TO_PROJECT_GITHUB_TOKEN }} \ No newline at end of file + github-token: ${{ secrets.ADD_TO_PROJECT_GITHUB_TOKEN }} diff --git a/.github/workflows/labeler.yaml b/.github/workflows/labeler.yaml index 15569e01d..31e78f82a 100644 --- a/.github/workflows/labeler.yaml +++ b/.github/workflows/labeler.yaml @@ -8,4 +8,4 @@ jobs: steps: - uses: actions/labeler@v4 with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" \ No newline at end of file + repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 05d8ab765..b75446551 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -56,4 +56,4 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.12 with: build_type: pull-request - script: ci/test_wheel_nx-cugraph.sh \ No newline at end of file + script: ci/test_wheel_nx-cugraph.sh diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml new file mode 100644 index 000000000..08624db32 --- /dev/null +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -0,0 +1,36 @@ +# This file is generated by `rapids-dependency-file-generator`. +# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. +channels: +- rapidsai +- rapidsai-nightly +- conda-forge +- nvidia +dependencies: +- cuda-version=11.8 +- cudf==24.12.*,>=0.0.0a0 +- cupy>=12.0.0 +- graphviz +- ipython +- nbsphinx +- networkx>=3.0 +- numpy>=1.23,<3.0a0 +- numpydoc +- pandas +- pre-commit +- pydata-sphinx-theme +- pylibcugraph==24.12.*,>=0.0.0a0 +- pytest +- pytest-benchmark +- pytest-cov +- pytest-mpl +- pytest-xdist +- rapids-build-backend>=0.3.1,<0.4.0.dev0 +- recommonmark +- scipy +- setuptools>=61.0.0 +- sphinx-copybutton +- sphinx-markdown-tables +- sphinx<6 +- sphinxcontrib-websupport +- wheel +name: all_cuda-118_arch-x86_64 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml new file mode 100644 index 000000000..d85df9d80 --- /dev/null +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -0,0 +1,36 @@ +# This file is generated by `rapids-dependency-file-generator`. +# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. +channels: +- rapidsai +- rapidsai-nightly +- conda-forge +- nvidia +dependencies: +- cuda-version=12.5 +- cudf==24.12.*,>=0.0.0a0 +- cupy>=12.0.0 +- graphviz +- ipython +- nbsphinx +- networkx>=3.0 +- numpy>=1.23,<3.0a0 +- numpydoc +- pandas +- pre-commit +- pydata-sphinx-theme +- pylibcugraph==24.12.*,>=0.0.0a0 +- pytest +- pytest-benchmark +- pytest-cov +- pytest-mpl +- pytest-xdist +- rapids-build-backend>=0.3.1,<0.4.0.dev0 +- recommonmark +- scipy +- setuptools>=61.0.0 +- sphinx-copybutton +- sphinx-markdown-tables +- sphinx<6 +- sphinxcontrib-websupport +- wheel +name: all_cuda-125_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index e023115ba..c2d505253 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -202,7 +202,7 @@ dependencies: common: - output_types: conda packages: - - &cudf_unsuffixed cudf==24.12.* + - &cudf_unsuffixed cudf==24.12.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -215,18 +215,18 @@ dependencies: cuda: "12.*" cuda_suffixed: "true" packages: - - cudf-cu12==24.12.* + - cudf-cu12==24.12.*,>=0.0.0a0 - matrix: cuda: "11.*" cuda_suffixed: "true" packages: - - cudf-cu11==24.12.* + - cudf-cu11==24.12.*,>=0.0.0a0 - {matrix: null, packages: [*cudf_unsuffixed]} depends_on_pylibcugraph: common: - output_types: conda packages: - - &pylibcugraph_unsuffixed pylibcugraph==24.12.* + - &pylibcugraph_unsuffixed pylibcugraph==24.12.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -239,10 +239,10 @@ dependencies: cuda: "12.*" cuda_suffixed: "true" packages: - - pylibcugraph-cu12==24.12.* + - pylibcugraph-cu12==24.12.*,>=0.0.0a0 - matrix: cuda: "11.*" cuda_suffixed: "true" packages: - - pylibcugraph-cu11==24.12.* + - pylibcugraph-cu11==24.12.*,>=0.0.0a0 - {matrix: null, packages: [*pylibcugraph_unsuffixed]} diff --git a/python/nx-cugraph/pyproject.toml b/python/nx-cugraph/pyproject.toml index fc89c90db..574c3e43b 100644 --- a/python/nx-cugraph/pyproject.toml +++ b/python/nx-cugraph/pyproject.toml @@ -35,12 +35,12 @@ dependencies = [ "cupy-cuda11x>=12.0.0", "networkx>=3.0", "numpy>=1.23,<3.0a0", - "pylibcugraph==24.12.*", + "pylibcugraph==24.12.*,>=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 = [ - "cudf==24.12.*", + "cudf==24.12.*,>=0.0.0a0", "pandas", "pytest", "pytest-benchmark",