From 2793da6e1fc636ffea3468fb825d01ca5619212c Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 7 May 2024 15:17:45 -0400 Subject: [PATCH 01/47] Use rapids-build-backend --- .pre-commit-config.yaml | 2 +- build.sh | 7 ++ ci/build_python.sh | 11 --- ci/build_wheel.sh | 37 ---------- dependencies.yaml | 69 ++++++++++++------- python/cugraph-dgl/cugraph_dgl/_version.py | 12 +++- python/cugraph-dgl/pyproject.toml | 10 ++- .../cugraph_equivariant/_version.py | 10 ++- python/cugraph-equivariant/pyproject.toml | 9 ++- python/cugraph-pyg/cugraph_pyg/_version.py | 12 +++- python/cugraph-pyg/pyproject.toml | 9 ++- .../client/cugraph_service_client/_version.py | 12 +++- python/cugraph-service/client/pyproject.toml | 9 ++- .../server/cugraph_service_server/_version.py | 12 +++- python/cugraph-service/server/pyproject.toml | 13 ++-- python/cugraph/cugraph/_version.py | 9 ++- python/cugraph/pyproject.toml | 23 +++---- python/nx-cugraph/_nx_cugraph/_version.py | 10 ++- python/nx-cugraph/pyproject.toml | 10 ++- python/pylibcugraph/pylibcugraph/_version.py | 12 +++- python/pylibcugraph/pyproject.toml | 17 +++-- 21 files changed, 194 insertions(+), 121 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 07bf1667c91..8e73b2e729f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -42,7 +42,7 @@ repos: types_or: [c, c++, cuda] args: ["-fallback-style=none", "-style=file", "-i"] - repo: https://github.com/rapidsai/dependency-file-generator - rev: v1.8.0 + rev: v1.13.4 hooks: - id: rapids-dependency-file-generator args: ["--clean"] diff --git a/build.sh b/build.sh index bd716943216..8377e8b6cec 100755 --- a/build.sh +++ b/build.sh @@ -313,6 +313,13 @@ if buildDefault || hasArg libcugraph_etl || hasArg all; then fi fi +# For testing, will be removed when the package is released +git clone -b main https://github.com/rapidsai/rapids-build-backend.git +pushd rapids-build-backend +sed -e 's/^version =.*/version = "0.0.2"/' -i pyproject.toml +python -m pip install . +popd + # Build, and install pylibcugraph if buildDefault || hasArg pylibcugraph || hasArg all; then if hasArg --clean; then diff --git a/ci/build_python.sh b/ci/build_python.sh index 62154fdeced..25793a4c47a 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -22,13 +22,6 @@ echo "${version}" > VERSION rapids-logger "Begin py build" -package_dir="python" -for package_name in pylibcugraph cugraph cugraph-pyg cugraph-dgl; do - underscore_package_name=$(echo "${package_name}" | tr "-" "_") - sed -i "/^__git_commit__/ s/= .*/= \"${git_commit}\"/g" "${package_dir}/${package_name}/${underscore_package_name}/_version.py" -done -sed -i "/^__git_commit__/ s/= .*/= \"${git_commit}\"/g" "${package_dir}/nx-cugraph/_nx_cugraph/_version.py" - # TODO: Remove `--no-test` flags once importing on a CPU # node works correctly rapids-conda-retry mambabuild \ @@ -56,10 +49,6 @@ rapids-conda-retry mambabuild \ # built on each CUDA platform to ensure they are included in each set of # artifacts, since test scripts only install from one set of artifacts based on # the CUDA version used for the test run. -version_file_cugraph_service_client="python/cugraph-service/client/cugraph_service_client/_version.py" -sed -i "/^__git_commit__/ s/= .*/= \"${git_commit}\"/g" ${version_file_cugraph_service_client} -version_file_cugraph_service_server="python/cugraph-service/server/cugraph_service_server/_version.py" -sed -i "/^__git_commit__/ s/= .*/= \"${git_commit}\"/g" ${version_file_cugraph_service_server} rapids-conda-retry mambabuild \ --no-test \ --channel "${CPP_CHANNEL}" \ diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 587c5fb38e7..1ef3d8920c7 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -15,44 +15,7 @@ git_commit=$(git rev-parse HEAD) RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" -# This is the version of the suffix with a preceding hyphen. It's used -# everywhere except in the final wheel name. -PACKAGE_CUDA_SUFFIX="-${RAPIDS_PY_CUDA_SUFFIX}" - -# Patch project metadata files to include the CUDA version suffix and version override. -version_package_name="$underscore_package_name" -if [[ "${version_package_name}" = "nx_cugraph" ]]; then - version_package_name="_nx_cugraph" -fi -pyproject_file="${package_dir}/pyproject.toml" -version_file="${package_dir}/${version_package_name}/_version.py" - -sed -i "s/name = \"${package_name}\"/name = \"${package_name}${PACKAGE_CUDA_SUFFIX}\"/g" ${pyproject_file} echo "${version}" > VERSION -sed -i "/^__git_commit__ / s/= .*/= \"${git_commit}\"/g" ${version_file} - -# For nightlies we want to ensure that we're pulling in alphas as well. The -# easiest way to do so is to augment the spec with a constraint containing a -# min alpha version that doesn't affect the version bounds but does allow usage -# of alpha versions for that dependency without --pre -alpha_spec='' -if ! rapids-is-release-build; then - alpha_spec=',>=0.0.0a0' -fi - -for dep in rmm cudf cugraph raft-dask pylibcugraph pylibcugraphops pylibraft ucx-py; do - sed -r -i "s/${dep}==(.*)\"/${dep}${PACKAGE_CUDA_SUFFIX}==\1${alpha_spec}\"/g" ${pyproject_file} -done - -# dask-cuda & rapids-dask-dependency doesn't get a suffix, but it does get an alpha spec. -for dep in dask-cuda rapids-dask-dependency; do - sed -r -i "s/${dep}==(.*)\"/${dep}==\1${alpha_spec}\"/g" ${pyproject_file} -done - - -if [[ $PACKAGE_CUDA_SUFFIX == "-cu12" ]]; then - sed -i "s/cupy-cuda11x/cupy-cuda12x/g" ${pyproject_file} -fi cd "${package_dir}" diff --git a/dependencies.yaml b/dependencies.yaml index 9dca069ea33..515fe2ece1d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -70,12 +70,19 @@ files: extras: table: build-system includes: - - common_build - python_build_wheel + - python_build_cythonize + py_rapids_build_cugraph: + output: pyproject + pyproject_dir: python/cugraph + extras: + table: tool.rapids-build-backend + key: requires + includes: + - common_build - depends_on_rmm - depends_on_pylibraft - depends_on_pylibcugraph - - python_build_cythonize py_run_cugraph: output: pyproject pyproject_dir: python/cugraph @@ -104,11 +111,18 @@ files: extras: table: build-system includes: - - common_build - python_build_wheel + - python_build_cythonize + py_rapids_build_pylibcugraph: + output: pyproject + pyproject_dir: python/pylibcugraph + extras: + table: tool.rapids-build-backend + key: requires + includes: + - common_build - depends_on_rmm - depends_on_pylibraft - - python_build_cythonize py_run_pylibcugraph: output: pyproject pyproject_dir: python/pylibcugraph @@ -424,6 +438,9 @@ dependencies: - python>=3.9,<3.12 python_build_wheel: common: + - output_types: [pyproject] # TODO: Enable requirements once packages are available + packages: + - rapids-build-backend - output_types: [conda, pyproject, requirements] packages: - setuptools>=61.0.0 @@ -582,11 +599,11 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - rmm-cu12==24.6.* + - rmm-cu12==24.6.*,>=0.0.0a0 - matrix: {cuda: "11.*"} packages: - - rmm-cu11==24.6.* - - {matrix: null, packages: [*rmm_conda]} + - rmm-cu11==24.6.*,>=0.0.0a0 + - {matrix: null, packages: null} depends_on_cudf: common: @@ -603,11 +620,11 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - cudf-cu12==24.6.* + - cudf-cu12==24.6.*,>=0.0.0a0 - matrix: {cuda: "11.*"} packages: - - cudf-cu11==24.6.* - - {matrix: null, packages: [*cudf_conda]} + - cudf-cu11==24.6.*,>=0.0.0a0 + - {matrix: null, packages: null} depends_on_dask_cudf: common: @@ -624,11 +641,11 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - dask-cudf-cu12==24.6.* + - dask-cudf-cu12==24.6.*,>=0.0.0a0 - matrix: {cuda: "11.*"} packages: - - dask-cudf-cu11==24.6.* - - {matrix: null, packages: [*dask_cudf_conda]} + - dask-cudf-cu11==24.6.*,>=0.0.0a0 + - {matrix: null, packages: null} depends_on_pylibraft: common: @@ -645,11 +662,11 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - pylibraft-cu12==24.6.* + - pylibraft-cu12==24.6.*,>=0.0.0a0 - matrix: {cuda: "11.*"} packages: - - pylibraft-cu11==24.6.* - - {matrix: null, packages: [*pylibraft_conda]} + - pylibraft-cu11==24.6.*,>=0.0.0a0 + - {matrix: null, packages: null} depends_on_raft_dask: common: @@ -666,11 +683,11 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - raft-dask-cu12==24.6.* + - raft-dask-cu12==24.6.*,>=0.0.0a0 - matrix: {cuda: "11.*"} packages: - - raft-dask-cu11==24.6.* - - {matrix: null, packages: [*raft_dask_conda]} + - raft-dask-cu11==24.6.*,>=0.0.0a0 + - {matrix: null, packages: null} depends_on_pylibcugraph: common: @@ -687,11 +704,11 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - pylibcugraph-cu12==24.6.* + - pylibcugraph-cu12==24.6.*,>=0.0.0a0 - matrix: {cuda: "11.*"} packages: - - pylibcugraph-cu11==24.6.* - - {matrix: null, packages: [*pylibcugraph_conda]} + - pylibcugraph-cu11==24.6.*,>=0.0.0a0 + - {matrix: null, packages: null} depends_on_pylibcugraphops: common: @@ -708,11 +725,11 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - pylibcugraphops-cu12==24.6.* + - pylibcugraphops-cu12==24.6.*,>=0.0.0a0 - matrix: {cuda: "11.*"} packages: - - pylibcugraphops-cu11==24.6.* - - {matrix: null, packages: [*pylibcugraphops_conda]} + - pylibcugraphops-cu11==24.6.*,>=0.0.0a0 + - {matrix: null, packages: null} depends_on_cupy: common: @@ -728,4 +745,4 @@ dependencies: - matrix: {cuda: "11.*"} packages: &cupy_packages_cu11 - cupy-cuda11x>=12.0.0 - - {matrix: null, packages: *cupy_packages_cu11} + - {matrix: null, packages: null} diff --git a/python/cugraph-dgl/cugraph_dgl/_version.py b/python/cugraph-dgl/cugraph_dgl/_version.py index f95a4705467..855d1a191f8 100644 --- a/python/cugraph-dgl/cugraph_dgl/_version.py +++ b/python/cugraph-dgl/cugraph_dgl/_version.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,4 +23,12 @@ __version__ = ( importlib.resources.files("cugraph_dgl").joinpath("VERSION").read_text().strip() ) -__git_commit__ = "" +try: + __git_commit__ = ( + importlib.resources.files("cugraph_dgl") + .joinpath("GIT_COMMIT") + .read_text() + .strip() + ) +except FileNotFoundError: + __git_commit__ = "" diff --git a/python/cugraph-dgl/pyproject.toml b/python/cugraph-dgl/pyproject.toml index 37ea8b850bd..85c17173730 100644 --- a/python/cugraph-dgl/pyproject.toml +++ b/python/cugraph-dgl/pyproject.toml @@ -3,10 +3,11 @@ [build-system] requires = [ + "rapids-build-backend", "setuptools>=61.0.0", "wheel", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. -build-backend = "setuptools.build_meta" +build-backend = "rapids_build_backend.build" [project] name = "cugraph-dgl" @@ -26,7 +27,6 @@ dependencies = [ "cugraph==24.6.*", "numba>=0.57", "numpy>=1.23,<2.0a0", - "pylibcugraphops==24.6.*", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. [project.optional-dependencies] @@ -53,3 +53,9 @@ version = {file = "cugraph_dgl/VERSION"} include = [ "cugraph_dgl*", ] + +[tool.rapids-build-backend] +build-backend = "setuptools.build_meta" +requires = [] +commit-file = "cugraph_dgl/GIT_COMMIT" +dependencies-file = "../../dependencies.yaml" diff --git a/python/cugraph-equivariant/cugraph_equivariant/_version.py b/python/cugraph-equivariant/cugraph_equivariant/_version.py index 31a707bb17e..33341235967 100644 --- a/python/cugraph-equivariant/cugraph_equivariant/_version.py +++ b/python/cugraph-equivariant/cugraph_equivariant/_version.py @@ -24,4 +24,12 @@ .read_text() .strip() ) -__git_commit__ = "" +try: + __git_commit__ = ( + importlib.resources.files("cugraph_equivariant") + .joinpath("GIT_COMMIT") + .read_text() + .strip() + ) +except FileNotFoundError: + __git_commit__ = "" diff --git a/python/cugraph-equivariant/pyproject.toml b/python/cugraph-equivariant/pyproject.toml index 8947f77d7c9..b37a16f2a85 100644 --- a/python/cugraph-equivariant/pyproject.toml +++ b/python/cugraph-equivariant/pyproject.toml @@ -13,9 +13,11 @@ [build-system] requires = [ + "rapids-build-backend", "setuptools>=61.0.0", "wheel", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. +build-backend = "rapids_build_backend.build" [project] name = "cugraph-equivariant" @@ -35,7 +37,6 @@ classifiers = [ "Programming Language :: Python :: 3.11", ] dependencies = [ - "pylibcugraphops==24.6.*", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. [project.urls] @@ -63,3 +64,9 @@ include = [ "cugraph_equivariant*", "cugraph_equivariant.*", ] + +[tool.rapids-build-backend] +build-backend = "setuptools.build_meta" +requires = [] +commit-file = "cugraph_equivariant/GIT_COMMIT" +dependencies-file = "../../dependencies.yaml" diff --git a/python/cugraph-pyg/cugraph_pyg/_version.py b/python/cugraph-pyg/cugraph_pyg/_version.py index 963052da909..74dcf1527d3 100644 --- a/python/cugraph-pyg/cugraph_pyg/_version.py +++ b/python/cugraph-pyg/cugraph_pyg/_version.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,4 +23,12 @@ __version__ = ( importlib.resources.files("cugraph_pyg").joinpath("VERSION").read_text().strip() ) -__git_commit__ = "" +try: + __git_commit__ = ( + importlib.resources.files("cugraph_pyg") + .joinpath("GIT_COMMIT") + .read_text() + .strip() + ) +except FileNotFoundError: + __git_commit__ = "" diff --git a/python/cugraph-pyg/pyproject.toml b/python/cugraph-pyg/pyproject.toml index dfa522e6047..c73657f8a48 100644 --- a/python/cugraph-pyg/pyproject.toml +++ b/python/cugraph-pyg/pyproject.toml @@ -3,9 +3,11 @@ [build-system] requires = [ + "rapids-build-backend", "setuptools>=61.0.0", "wheel", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. +build-backend = "rapids_build_backend.build" [tool.pytest.ini_options] testpaths = ["cugraph_pyg/tests"] @@ -30,7 +32,6 @@ dependencies = [ "cugraph==24.6.*", "numba>=0.57", "numpy>=1.23,<2.0a0", - "pylibcugraphops==24.6.*", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. [project.urls] @@ -58,3 +59,9 @@ include = [ "cugraph_pyg*", "cugraph_pyg.*", ] + +[tool.rapids-build-backend] +build-backend = "scikit_build_core.build" +requires = [] +commit-file = "cugraph_pyg/GIT_COMMIT" +dependencies-file = "../../dependencies.yaml" diff --git a/python/cugraph-service/client/cugraph_service_client/_version.py b/python/cugraph-service/client/cugraph_service_client/_version.py index 344361973bb..a5e82464168 100644 --- a/python/cugraph-service/client/cugraph_service_client/_version.py +++ b/python/cugraph-service/client/cugraph_service_client/_version.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -26,4 +26,12 @@ .read_text() .strip() ) -__git_commit__ = "" +try: + __git_commit__ = ( + importlib.resources.files("cugraph_service_client") + .joinpath("GIT_COMMIT") + .read_text() + .strip() + ) +except FileNotFoundError: + __git_commit__ = "" diff --git a/python/cugraph-service/client/pyproject.toml b/python/cugraph-service/client/pyproject.toml index d8261c38b2d..f4b666025be 100644 --- a/python/cugraph-service/client/pyproject.toml +++ b/python/cugraph-service/client/pyproject.toml @@ -3,10 +3,11 @@ [build-system] requires = [ + "rapids-build-backend", "setuptools>=61.0.0", "wheel", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`. -build-backend = "setuptools.build_meta" +build-backend = "rapids_build_backend.build" [project] name = "cugraph-service-client" @@ -43,3 +44,9 @@ version = {file = "cugraph_service_client/VERSION"} include = [ "cugraph_service_client", ] + +[tool.rapids-build-backend] +build-backend = "scikit_build_core.build" +requires = [] +commit-file = "cugraph_service_client/GIT_COMMIT" +dependencies-file = "../../../dependencies.yaml" diff --git a/python/cugraph-service/server/cugraph_service_server/_version.py b/python/cugraph-service/server/cugraph_service_server/_version.py index 7da31f78767..05987c58545 100644 --- a/python/cugraph-service/server/cugraph_service_server/_version.py +++ b/python/cugraph-service/server/cugraph_service_server/_version.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -26,4 +26,12 @@ .read_text() .strip() ) -__git_commit__ = "" +try: + __git_commit__ = ( + importlib.resources.files("cugraph_service_server") + .joinpath("GIT_COMMIT") + .read_text() + .strip() + ) +except FileNotFoundError: + __git_commit__ = "" diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml index 020007ed902..c45806517cb 100644 --- a/python/cugraph-service/server/pyproject.toml +++ b/python/cugraph-service/server/pyproject.toml @@ -3,10 +3,11 @@ [build-system] requires = [ + "rapids-build-backend", "setuptools>=61.0.0", "wheel", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`. -build-backend = "setuptools.build_meta" +build-backend = "rapids_build_backend.build" [project] name = "cugraph-service-server" @@ -19,16 +20,12 @@ authors = [ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ - "cudf==24.6.*", "cugraph-service-client==24.6.*", "cugraph==24.6.*", - "cupy-cuda11x>=12.0.0", "dask-cuda==24.6.*", - "dask-cudf==24.6.*", "numba>=0.57", "numpy>=1.23,<2.0a0", "rapids-dask-dependency==24.6.*", - "rmm==24.6.*", "thriftpy2", "ucx-py==0.38.*", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`. @@ -72,3 +69,9 @@ include = [ "cugraph_service_server", "cugraph_service_server.*" ] + +[tool.rapids-build-backend] +build-backend = "scikit_build_core.build" +requires = [] +commit-file = "cugraph_service_server/GIT_COMMIT" +dependencies-file = "../../../dependencies.yaml" diff --git a/python/cugraph/cugraph/_version.py b/python/cugraph/cugraph/_version.py index 710afb87e29..07552d62b9d 100644 --- a/python/cugraph/cugraph/_version.py +++ b/python/cugraph/cugraph/_version.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,4 +23,9 @@ __version__ = ( importlib.resources.files("cugraph").joinpath("VERSION").read_text().strip() ) -__git_commit__ = "" +try: + __git_commit__ = ( + importlib.resources.files("cugraph").joinpath("GIT_COMMIT").read_text().strip() + ) +except FileNotFoundError: + __git_commit__ = "" diff --git a/python/cugraph/pyproject.toml b/python/cugraph/pyproject.toml index b29d6f80ff0..967ad78b6cf 100644 --- a/python/cugraph/pyproject.toml +++ b/python/cugraph/pyproject.toml @@ -3,17 +3,13 @@ [build-system] requires = [ - "cmake>=3.26.4", "cython>=3.0.0", - "ninja", - "pylibcugraph==24.6.*", - "pylibraft==24.6.*", - "rmm==24.6.*", + "rapids-build-backend", "scikit-build-core[pyproject]>=0.7.0", "setuptools>=61.0.0", "wheel", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. -build-backend = "scikit_build_core.build" +build-backend = "rapids_build_backend.build" [tool.pytest.ini_options] testpaths = ["cugraph/tests"] @@ -29,17 +25,11 @@ authors = [ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ - "cudf==24.6.*", - "cupy-cuda11x>=12.0.0", "dask-cuda==24.6.*", - "dask-cudf==24.6.*", "fsspec[http]>=0.6.0", "numba>=0.57", "numpy>=1.23,<2.0a0", - "pylibcugraph==24.6.*", - "raft-dask==24.6.*", "rapids-dask-dependency==24.6.*", - "rmm==24.6.*", "ucx-py==0.38.*", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ @@ -80,3 +70,12 @@ wheel.packages = ["cugraph"] provider = "scikit_build_core.metadata.regex" input = "cugraph/VERSION" regex = "(?P.*)" + +[tool.rapids-build-backend] +build-backend = "scikit_build_core.build" +requires = [ + "cmake>=3.26.4", + "ninja", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. +commit-file = "cugraph/GIT_COMMIT" +dependencies-file = "../../dependencies.yaml" diff --git a/python/nx-cugraph/_nx_cugraph/_version.py b/python/nx-cugraph/_nx_cugraph/_version.py index dc2d2a3a3c0..91f98396559 100644 --- a/python/nx-cugraph/_nx_cugraph/_version.py +++ b/python/nx-cugraph/_nx_cugraph/_version.py @@ -21,4 +21,12 @@ __version__ = ( importlib.resources.files("_nx_cugraph").joinpath("VERSION").read_text().strip() ) -__git_commit__ = "" +try: + __git_commit__ = ( + importlib.resources.files("_nx_cugraph") + .joinpath("GIT_COMMIT") + .read_text() + .strip() + ) +except FileNotFoundError: + __git_commit__ = "" diff --git a/python/nx-cugraph/pyproject.toml b/python/nx-cugraph/pyproject.toml index a7daf01775b..01861a10725 100644 --- a/python/nx-cugraph/pyproject.toml +++ b/python/nx-cugraph/pyproject.toml @@ -3,10 +3,11 @@ [build-system] requires = [ + "rapids-build-backend", "setuptools>=61.0.0", "wheel", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. -build-backend = "setuptools.build_meta" +build-backend = "rapids_build_backend.build" [project] name = "nx-cugraph" @@ -31,10 +32,8 @@ classifiers = [ "Topic :: Software Development :: Libraries :: Python Modules", ] dependencies = [ - "cupy-cuda11x>=12.0.0", "networkx>=3.0", "numpy>=1.23,<2.0a0", - "pylibcugraph==24.6.*", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. [project.optional-dependencies] @@ -81,6 +80,11 @@ include = [ "_nx_cugraph.*", ] +[tool.rapids-build-backend] +build-backend = "setuptools.build_meta" +commit-file = "_nx_cugraph/GIT_COMMIT" +dependencies-file = "../../dependencies.yaml" + [tool.black] line-length = 88 target-version = ["py39", "py310", "py311"] diff --git a/python/pylibcugraph/pylibcugraph/_version.py b/python/pylibcugraph/pylibcugraph/_version.py index 5dca7e48b3f..7c62bed03c9 100644 --- a/python/pylibcugraph/pylibcugraph/_version.py +++ b/python/pylibcugraph/pylibcugraph/_version.py @@ -1,4 +1,4 @@ -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,4 +23,12 @@ __version__ = ( importlib.resources.files("pylibcugraph").joinpath("VERSION").read_text().strip() ) -__git_commit__ = "" +try: + __git_commit__ = ( + importlib.resources.files("pylibcugraph") + .joinpath("GIT_COMMIT") + .read_text() + .strip() + ) +except FileNotFoundError: + __git_commit__ = "" diff --git a/python/pylibcugraph/pyproject.toml b/python/pylibcugraph/pyproject.toml index 19eafe55b7c..235027cd2d7 100644 --- a/python/pylibcugraph/pyproject.toml +++ b/python/pylibcugraph/pyproject.toml @@ -3,11 +3,8 @@ [build-system] requires = [ - "cmake>=3.26.4", "cython>=3.0.0", - "ninja", - "pylibraft==24.6.*", - "rmm==24.6.*", + "rapids-build-backend", "scikit-build-core[pyproject]>=0.7.0", "setuptools>=61.0.0", "wheel", @@ -28,8 +25,6 @@ authors = [ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ - "pylibraft==24.6.*", - "rmm==24.6.*", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers", @@ -41,7 +36,6 @@ classifiers = [ [project.optional-dependencies] test = [ - "cudf==24.6.*", "numpy>=1.23,<2.0a0", "pandas", "pytest", @@ -67,3 +61,12 @@ wheel.packages = ["pylibcugraph"] provider = "scikit_build_core.metadata.regex" input = "pylibcugraph/VERSION" regex = "(?P.*)" + +[tool.rapids-build-backend] +build-backend = "scikit_build_core.build" +commit-file = "pylibcugraph/GIT_COMMIT" +dependencies-file = "../../dependencies.yaml" +requires = [ + "cmake>=3.26.4", + "ninja", +] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. From ccf79e0aceb50c39e90f884ede4264da58098ad9 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 7 May 2024 17:02:43 -0400 Subject: [PATCH 02/47] Fixes --- ci/build_wheel.sh | 9 ++++++++- python/pylibcugraph/pyproject.toml | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 1ef3d8920c7..f23f6426613 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -17,9 +17,16 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" echo "${version}" > VERSION +# For testing, will be removed when the package is released +git clone -b main https://github.com/rapidsai/rapids-build-backend.git +pushd rapids-build-backend +sed -e 's/^version =.*/version = "0.0.2"/' -i pyproject.toml +python -m pip wheel . --no-deps +popd + cd "${package_dir}" -python -m pip wheel . -w dist -vvv --no-deps --disable-pip-version-check +PIP_FIND_LINKS="$PWD/rapids-build-backend" python -m pip wheel . -w dist -vvv --no-deps --disable-pip-version-check # pure-python packages should be marked as pure, and not have auditwheel run on them. if [[ ${package_name} == "nx-cugraph" ]] || \ diff --git a/python/pylibcugraph/pyproject.toml b/python/pylibcugraph/pyproject.toml index 235027cd2d7..c6da88b19a2 100644 --- a/python/pylibcugraph/pyproject.toml +++ b/python/pylibcugraph/pyproject.toml @@ -9,7 +9,7 @@ requires = [ "setuptools>=61.0.0", "wheel", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. -build-backend = "scikit_build_core.build" +build-backend = "rapids_build_backend.build" [tool.pytest.ini_options] testpaths = ["pylibcugraph/tests"] From f65d62af49c6ff916b93ec43bd1cd9f90cc090bf Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 7 May 2024 17:09:59 -0400 Subject: [PATCH 03/47] Fix order --- ci/build_wheel.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index f23f6426613..30c37a86395 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -17,6 +17,8 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" echo "${version}" > VERSION +cd "${package_dir}" + # For testing, will be removed when the package is released git clone -b main https://github.com/rapidsai/rapids-build-backend.git pushd rapids-build-backend @@ -24,8 +26,6 @@ sed -e 's/^version =.*/version = "0.0.2"/' -i pyproject.toml python -m pip wheel . --no-deps popd -cd "${package_dir}" - PIP_FIND_LINKS="$PWD/rapids-build-backend" python -m pip wheel . -w dist -vvv --no-deps --disable-pip-version-check # pure-python packages should be marked as pure, and not have auditwheel run on them. From f88e01ad3832175f9c8f423fd18da476ff4323a6 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 7 May 2024 17:26:29 -0400 Subject: [PATCH 04/47] Install in devcontainers --- .github/workflows/pr.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c04e0e879d2..08e1cb6a366 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -195,6 +195,14 @@ jobs: node_type: cpu32 extra-repo-deploy-key: CUGRAPH_OPS_SSH_PRIVATE_DEPLOY_KEY build_command: | + # For testing, will be removed when the package is released + git clone -b main https://github.com/rapidsai/rapids-build-backend.git + pushd rapids-build-backend + sed -e 's/^version =.*/version = "0.0.2"/' -i pyproject.toml + python -m pip install . + popd + export PIP_FIND_LINKS="file://${PWD}/rapids-build-backend" + sccache -z; build-all --verbose -j$(nproc --ignore=1); sccache -s; From c7af46668266c4b0461016dd0e073d254a123394 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 7 May 2024 17:35:40 -0400 Subject: [PATCH 05/47] Fix cugraph-pyg build backend --- python/cugraph-pyg/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/cugraph-pyg/pyproject.toml b/python/cugraph-pyg/pyproject.toml index c73657f8a48..4a04163ff00 100644 --- a/python/cugraph-pyg/pyproject.toml +++ b/python/cugraph-pyg/pyproject.toml @@ -61,7 +61,7 @@ include = [ ] [tool.rapids-build-backend] -build-backend = "scikit_build_core.build" +build-backend = "setuptools.build_meta" requires = [] commit-file = "cugraph_pyg/GIT_COMMIT" dependencies-file = "../../dependencies.yaml" From 9b86fbe73b842f0b8cabf3b6926a1dadf7abb3dc Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 7 May 2024 17:43:51 -0400 Subject: [PATCH 06/47] Fix cugraph-service build backend --- python/cugraph-service/client/pyproject.toml | 2 +- python/cugraph-service/server/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/cugraph-service/client/pyproject.toml b/python/cugraph-service/client/pyproject.toml index f4b666025be..5e6ac9eb477 100644 --- a/python/cugraph-service/client/pyproject.toml +++ b/python/cugraph-service/client/pyproject.toml @@ -46,7 +46,7 @@ include = [ ] [tool.rapids-build-backend] -build-backend = "scikit_build_core.build" +build-backend = "setuptools.build_meta" requires = [] commit-file = "cugraph_service_client/GIT_COMMIT" dependencies-file = "../../../dependencies.yaml" diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml index c45806517cb..0973b3477ee 100644 --- a/python/cugraph-service/server/pyproject.toml +++ b/python/cugraph-service/server/pyproject.toml @@ -71,7 +71,7 @@ include = [ ] [tool.rapids-build-backend] -build-backend = "scikit_build_core.build" +build-backend = "setuptools.build_meta" requires = [] commit-file = "cugraph_service_server/GIT_COMMIT" dependencies-file = "../../../dependencies.yaml" From 3c09573d8dfdc27e6c32fa2306ec78a36f50411c Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Wed, 8 May 2024 08:41:59 -0400 Subject: [PATCH 07/47] Fix conda recipes --- conda/recipes/cugraph-dgl/meta.yaml | 7 +++++++ conda/recipes/cugraph-equivariant/meta.yaml | 7 +++++++ conda/recipes/cugraph-pyg/meta.yaml | 7 +++++++ conda/recipes/cugraph-service/meta.yaml | 14 ++++++++++++++ conda/recipes/cugraph/meta.yaml | 7 +++++++ conda/recipes/libcugraph/meta.yaml | 7 +++++++ conda/recipes/nx-cugraph/meta.yaml | 9 ++++++++- conda/recipes/pylibcugraph/meta.yaml | 7 +++++++ 8 files changed, 64 insertions(+), 1 deletion(-) diff --git a/conda/recipes/cugraph-dgl/meta.yaml b/conda/recipes/cugraph-dgl/meta.yaml index 5e28e69a0d7..5cf3242d17b 100644 --- a/conda/recipes/cugraph-dgl/meta.yaml +++ b/conda/recipes/cugraph-dgl/meta.yaml @@ -21,6 +21,13 @@ build: requirements: host: - python + # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. + #- rapids-build-backend + - tomli + - tomli-w + - packaging + - rapids-dependency-file-generator + # TODO: Remove above dependencies after rapids-build-backend packages exist run: - cugraph ={{ version }} - dgl >=1.1.0.cu* diff --git a/conda/recipes/cugraph-equivariant/meta.yaml b/conda/recipes/cugraph-equivariant/meta.yaml index a952812f845..55ece8d4eeb 100644 --- a/conda/recipes/cugraph-equivariant/meta.yaml +++ b/conda/recipes/cugraph-equivariant/meta.yaml @@ -21,6 +21,13 @@ build: requirements: host: - python + # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. + #- rapids-build-backend + - tomli + - tomli-w + - packaging + - rapids-dependency-file-generator + # TODO: Remove above dependencies after rapids-build-backend packages exist run: - pylibcugraphops ={{ minor_version }} - python diff --git a/conda/recipes/cugraph-pyg/meta.yaml b/conda/recipes/cugraph-pyg/meta.yaml index 818616c2f5b..66cf9b63540 100644 --- a/conda/recipes/cugraph-pyg/meta.yaml +++ b/conda/recipes/cugraph-pyg/meta.yaml @@ -25,6 +25,13 @@ requirements: - cython >=3.0.0 - python - scikit-build-core >=0.7.0 + # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. + #- rapids-build-backend + - tomli + - tomli-w + - packaging + - rapids-dependency-file-generator + # TODO: Remove above dependencies after rapids-build-backend packages exist run: - rapids-dask-dependency ={{ minor_version }} - numba >=0.57 diff --git a/conda/recipes/cugraph-service/meta.yaml b/conda/recipes/cugraph-service/meta.yaml index 8698d4f6985..e6bb80c5c5d 100644 --- a/conda/recipes/cugraph-service/meta.yaml +++ b/conda/recipes/cugraph-service/meta.yaml @@ -29,6 +29,13 @@ outputs: host: - pip - python + # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. + #- rapids-build-backend + - tomli + - tomli-w + - packaging + - rapids-dependency-file-generator + # TODO: Remove above dependencies after rapids-build-backend packages exist run: - python - thriftpy2 >=0.4.15 @@ -52,6 +59,13 @@ outputs: - python - setuptools - wheel + # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. + #- rapids-build-backend + - tomli + - tomli-w + - packaging + - rapids-dependency-file-generator + # TODO: Remove above dependencies after rapids-build-backend packages exist run: - {{ pin_subpackage('cugraph-service-client', exact=True) }} - cudf ={{ minor_version }} diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml index b66e43e16a3..8e50bb262ba 100644 --- a/conda/recipes/cugraph/meta.yaml +++ b/conda/recipes/cugraph/meta.yaml @@ -70,6 +70,13 @@ requirements: - rmm ={{ minor_version }} - scikit-build-core >=0.7.0 - setuptools + # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. + #- rapids-build-backend + - tomli + - tomli-w + - packaging + - rapids-dependency-file-generator + # TODO: Remove above dependencies after rapids-build-backend packages exist run: - aiohttp - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml index a4bb361aa6b..32064bbd761 100644 --- a/conda/recipes/libcugraph/meta.yaml +++ b/conda/recipes/libcugraph/meta.yaml @@ -75,6 +75,13 @@ requirements: - librmm ={{ minor_version }} - nccl {{ nccl_version }} - ucx-proc=*=gpu + # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. + #- rapids-build-backend + - tomli + - tomli-w + - packaging + - rapids-dependency-file-generator + # TODO: Remove above dependencies after rapids-build-backend packages exist outputs: - name: libcugraph diff --git a/conda/recipes/nx-cugraph/meta.yaml b/conda/recipes/nx-cugraph/meta.yaml index cdb7bc13c23..2245f937cc3 100644 --- a/conda/recipes/nx-cugraph/meta.yaml +++ b/conda/recipes/nx-cugraph/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. {% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') + environ.get('VERSION_SUFFIX', '') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} @@ -21,6 +21,13 @@ build: requirements: host: - python + # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. + #- rapids-build-backend + - tomli + - tomli-w + - packaging + - rapids-dependency-file-generator + # TODO: Remove above dependencies after rapids-build-backend packages exist run: - pylibcugraph ={{ version }} - networkx >=3.0 diff --git a/conda/recipes/pylibcugraph/meta.yaml b/conda/recipes/pylibcugraph/meta.yaml index 314d8c7ea8b..2fad9280b85 100644 --- a/conda/recipes/pylibcugraph/meta.yaml +++ b/conda/recipes/pylibcugraph/meta.yaml @@ -67,6 +67,13 @@ requirements: - python - scikit-build-core >=0.7.0 - setuptools + # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. + #- rapids-build-backend + - tomli + - tomli-w + - packaging + - rapids-dependency-file-generator + # TODO: Remove above dependencies after rapids-build-backend packages exist run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} From 1858d2034ce46dc7bee1d6be93625f177fc6f8a2 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Wed, 8 May 2024 09:40:05 -0400 Subject: [PATCH 08/47] Don't require CUDA for nx-cugraph --- python/nx-cugraph/pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/python/nx-cugraph/pyproject.toml b/python/nx-cugraph/pyproject.toml index 01861a10725..33ae1864c3c 100644 --- a/python/nx-cugraph/pyproject.toml +++ b/python/nx-cugraph/pyproject.toml @@ -84,6 +84,7 @@ include = [ build-backend = "setuptools.build_meta" commit-file = "_nx_cugraph/GIT_COMMIT" dependencies-file = "../../dependencies.yaml" +require-cuda = false [tool.black] line-length = 88 From 12a4d9d906bc2283cf1b1989e828da16aedfb425 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Thu, 9 May 2024 14:18:40 -0400 Subject: [PATCH 09/47] Use published packages for rapids-build-backend --- .github/workflows/pr.yaml | 8 -------- build.sh | 7 ------- ci/build_wheel.sh | 9 +-------- conda/recipes/cugraph-dgl/meta.yaml | 8 +------- conda/recipes/cugraph-equivariant/meta.yaml | 8 +------- conda/recipes/cugraph-pyg/meta.yaml | 8 +------- conda/recipes/cugraph-service/meta.yaml | 8 +------- conda/recipes/cugraph/meta.yaml | 8 +------- conda/recipes/libcugraph/meta.yaml | 8 +------- conda/recipes/nx-cugraph/meta.yaml | 8 +------- conda/recipes/pylibcugraph/meta.yaml | 8 +------- dependencies.yaml | 2 +- 12 files changed, 10 insertions(+), 80 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 08e1cb6a366..c04e0e879d2 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -195,14 +195,6 @@ jobs: node_type: cpu32 extra-repo-deploy-key: CUGRAPH_OPS_SSH_PRIVATE_DEPLOY_KEY build_command: | - # For testing, will be removed when the package is released - git clone -b main https://github.com/rapidsai/rapids-build-backend.git - pushd rapids-build-backend - sed -e 's/^version =.*/version = "0.0.2"/' -i pyproject.toml - python -m pip install . - popd - export PIP_FIND_LINKS="file://${PWD}/rapids-build-backend" - sccache -z; build-all --verbose -j$(nproc --ignore=1); sccache -s; diff --git a/build.sh b/build.sh index 8377e8b6cec..bd716943216 100755 --- a/build.sh +++ b/build.sh @@ -313,13 +313,6 @@ if buildDefault || hasArg libcugraph_etl || hasArg all; then fi fi -# For testing, will be removed when the package is released -git clone -b main https://github.com/rapidsai/rapids-build-backend.git -pushd rapids-build-backend -sed -e 's/^version =.*/version = "0.0.2"/' -i pyproject.toml -python -m pip install . -popd - # Build, and install pylibcugraph if buildDefault || hasArg pylibcugraph || hasArg all; then if hasArg --clean; then diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 30c37a86395..1ef3d8920c7 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -19,14 +19,7 @@ echo "${version}" > VERSION cd "${package_dir}" -# For testing, will be removed when the package is released -git clone -b main https://github.com/rapidsai/rapids-build-backend.git -pushd rapids-build-backend -sed -e 's/^version =.*/version = "0.0.2"/' -i pyproject.toml -python -m pip wheel . --no-deps -popd - -PIP_FIND_LINKS="$PWD/rapids-build-backend" python -m pip wheel . -w dist -vvv --no-deps --disable-pip-version-check +python -m pip wheel . -w dist -vvv --no-deps --disable-pip-version-check # pure-python packages should be marked as pure, and not have auditwheel run on them. if [[ ${package_name} == "nx-cugraph" ]] || \ diff --git a/conda/recipes/cugraph-dgl/meta.yaml b/conda/recipes/cugraph-dgl/meta.yaml index 5cf3242d17b..3c505eff6bc 100644 --- a/conda/recipes/cugraph-dgl/meta.yaml +++ b/conda/recipes/cugraph-dgl/meta.yaml @@ -21,13 +21,7 @@ build: requirements: host: - python - # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. - #- rapids-build-backend - - tomli - - tomli-w - - packaging - - rapids-dependency-file-generator - # TODO: Remove above dependencies after rapids-build-backend packages exist + - rapids-build-backend run: - cugraph ={{ version }} - dgl >=1.1.0.cu* diff --git a/conda/recipes/cugraph-equivariant/meta.yaml b/conda/recipes/cugraph-equivariant/meta.yaml index 55ece8d4eeb..6a010d23020 100644 --- a/conda/recipes/cugraph-equivariant/meta.yaml +++ b/conda/recipes/cugraph-equivariant/meta.yaml @@ -21,13 +21,7 @@ build: requirements: host: - python - # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. - #- rapids-build-backend - - tomli - - tomli-w - - packaging - - rapids-dependency-file-generator - # TODO: Remove above dependencies after rapids-build-backend packages exist + - rapids-build-backend run: - pylibcugraphops ={{ minor_version }} - python diff --git a/conda/recipes/cugraph-pyg/meta.yaml b/conda/recipes/cugraph-pyg/meta.yaml index 66cf9b63540..756e6216ab7 100644 --- a/conda/recipes/cugraph-pyg/meta.yaml +++ b/conda/recipes/cugraph-pyg/meta.yaml @@ -25,13 +25,7 @@ requirements: - cython >=3.0.0 - python - scikit-build-core >=0.7.0 - # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. - #- rapids-build-backend - - tomli - - tomli-w - - packaging - - rapids-dependency-file-generator - # TODO: Remove above dependencies after rapids-build-backend packages exist + - rapids-build-backend run: - rapids-dask-dependency ={{ minor_version }} - numba >=0.57 diff --git a/conda/recipes/cugraph-service/meta.yaml b/conda/recipes/cugraph-service/meta.yaml index e6bb80c5c5d..e5990bd13df 100644 --- a/conda/recipes/cugraph-service/meta.yaml +++ b/conda/recipes/cugraph-service/meta.yaml @@ -59,13 +59,7 @@ outputs: - python - setuptools - wheel - # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. - #- rapids-build-backend - - tomli - - tomli-w - - packaging - - rapids-dependency-file-generator - # TODO: Remove above dependencies after rapids-build-backend packages exist + - rapids-build-backend run: - {{ pin_subpackage('cugraph-service-client', exact=True) }} - cudf ={{ minor_version }} diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml index 8e50bb262ba..ac8cb5a141b 100644 --- a/conda/recipes/cugraph/meta.yaml +++ b/conda/recipes/cugraph/meta.yaml @@ -70,13 +70,7 @@ requirements: - rmm ={{ minor_version }} - scikit-build-core >=0.7.0 - setuptools - # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. - #- rapids-build-backend - - tomli - - tomli-w - - packaging - - rapids-dependency-file-generator - # TODO: Remove above dependencies after rapids-build-backend packages exist + - rapids-build-backend run: - aiohttp - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml index 32064bbd761..6267023d7bf 100644 --- a/conda/recipes/libcugraph/meta.yaml +++ b/conda/recipes/libcugraph/meta.yaml @@ -75,13 +75,7 @@ requirements: - librmm ={{ minor_version }} - nccl {{ nccl_version }} - ucx-proc=*=gpu - # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. - #- rapids-build-backend - - tomli - - tomli-w - - packaging - - rapids-dependency-file-generator - # TODO: Remove above dependencies after rapids-build-backend packages exist + - rapids-build-backend outputs: - name: libcugraph diff --git a/conda/recipes/nx-cugraph/meta.yaml b/conda/recipes/nx-cugraph/meta.yaml index 2245f937cc3..0cc4a838643 100644 --- a/conda/recipes/nx-cugraph/meta.yaml +++ b/conda/recipes/nx-cugraph/meta.yaml @@ -21,13 +21,7 @@ build: requirements: host: - python - # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. - #- rapids-build-backend - - tomli - - tomli-w - - packaging - - rapids-dependency-file-generator - # TODO: Remove above dependencies after rapids-build-backend packages exist + - rapids-build-backend run: - pylibcugraph ={{ version }} - networkx >=3.0 diff --git a/conda/recipes/pylibcugraph/meta.yaml b/conda/recipes/pylibcugraph/meta.yaml index 2fad9280b85..629d9f6eb41 100644 --- a/conda/recipes/pylibcugraph/meta.yaml +++ b/conda/recipes/pylibcugraph/meta.yaml @@ -67,13 +67,7 @@ requirements: - python - scikit-build-core >=0.7.0 - setuptools - # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. - #- rapids-build-backend - - tomli - - tomli-w - - packaging - - rapids-dependency-file-generator - # TODO: Remove above dependencies after rapids-build-backend packages exist + - rapids-build-backend run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} diff --git a/dependencies.yaml b/dependencies.yaml index 515fe2ece1d..18e41f2a1d2 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -438,7 +438,7 @@ dependencies: - python>=3.9,<3.12 python_build_wheel: common: - - output_types: [pyproject] # TODO: Enable requirements once packages are available + - output_types: [pyproject, requirements] packages: - rapids-build-backend - output_types: [conda, pyproject, requirements] From d50a2a5ecd4620a2a73437478b797f25c00b62d0 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 14 May 2024 13:19:54 -0400 Subject: [PATCH 10/47] Fix dependencies and _version --- conda/environments/all_cuda-118_arch-x86_64.yaml | 1 + conda/environments/all_cuda-122_arch-x86_64.yaml | 1 + dependencies.yaml | 4 +--- python/cugraph-dgl/pyproject.toml | 2 +- python/cugraph-equivariant/pyproject.toml | 2 +- python/cugraph-pyg/pyproject.toml | 2 +- python/cugraph-service/client/pyproject.toml | 2 +- python/cugraph-service/server/pyproject.toml | 2 +- python/cugraph/cugraph/_version.py | 14 +++++++------- python/cugraph/pyproject.toml | 2 +- python/nx-cugraph/pyproject.toml | 2 +- python/pylibcugraph/pyproject.toml | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 659a2b911fb..9852c7fe0c9 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -57,6 +57,7 @@ dependencies: - pytest-xdist - python-louvain - raft-dask==24.6.* +- rapids-build-backend>=0.1.1,<0.2.0.dev0 - rapids-dask-dependency==24.6.* - recommonmark - requests diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 377e4151f9b..de37cd1dd94 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -62,6 +62,7 @@ dependencies: - pytest-xdist - python-louvain - raft-dask==24.6.* +- rapids-build-backend>=0.1.1,<0.2.0.dev0 - rapids-dask-dependency==24.6.* - recommonmark - requests diff --git a/dependencies.yaml b/dependencies.yaml index 18e41f2a1d2..411ecbf526f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -438,11 +438,9 @@ dependencies: - python>=3.9,<3.12 python_build_wheel: common: - - output_types: [pyproject, requirements] - packages: - - rapids-build-backend - output_types: [conda, pyproject, requirements] packages: + - rapids-build-backend>=0.1.1,<0.2.0.dev0 - setuptools>=61.0.0 - wheel python_build_cythonize: diff --git a/python/cugraph-dgl/pyproject.toml b/python/cugraph-dgl/pyproject.toml index 85c17173730..53d22ccbbcb 100644 --- a/python/cugraph-dgl/pyproject.toml +++ b/python/cugraph-dgl/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend", + "rapids-build-backend>=0.1.1,<0.2.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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-equivariant/pyproject.toml b/python/cugraph-equivariant/pyproject.toml index b37a16f2a85..e3bf5dcc30f 100644 --- a/python/cugraph-equivariant/pyproject.toml +++ b/python/cugraph-equivariant/pyproject.toml @@ -13,7 +13,7 @@ [build-system] requires = [ - "rapids-build-backend", + "rapids-build-backend>=0.1.1,<0.2.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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 4a04163ff00..45c69575e15 100644 --- a/python/cugraph-pyg/pyproject.toml +++ b/python/cugraph-pyg/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend", + "rapids-build-backend>=0.1.1,<0.2.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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/client/pyproject.toml b/python/cugraph-service/client/pyproject.toml index 5e6ac9eb477..a9e7122b9bd 100644 --- a/python/cugraph-service/client/pyproject.toml +++ b/python/cugraph-service/client/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend", + "rapids-build-backend>=0.1.1,<0.2.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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 0973b3477ee..b5cdcccf0a9 100644 --- a/python/cugraph-service/server/pyproject.toml +++ b/python/cugraph-service/server/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend", + "rapids-build-backend>=0.1.1,<0.2.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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/cugraph/_version.py b/python/cugraph/cugraph/_version.py index 07552d62b9d..a38243dea3d 100644 --- a/python/cugraph/cugraph/_version.py +++ b/python/cugraph/cugraph/_version.py @@ -15,17 +15,17 @@ import importlib.resources -# Read VERSION file from the module that is symlinked to VERSION file -# in the root of the repo at build time or copied to the moudle at -# installation. VERSION is a separate file that allows CI build-time scripts -# to update version info (including commit hashes) without modifying -# source files. __version__ = ( - importlib.resources.files("cugraph").joinpath("VERSION").read_text().strip() + importlib.resources.files(__package__).joinpath("VERSION").read_text().strip() ) try: __git_commit__ = ( - importlib.resources.files("cugraph").joinpath("GIT_COMMIT").read_text().strip() + importlib.resources.files(__package__) + .joinpath("GIT_COMMIT") + .read_text() + .strip() ) except FileNotFoundError: __git_commit__ = "" + +__all__ = ["__version__", "__git_commit__"] diff --git a/python/cugraph/pyproject.toml b/python/cugraph/pyproject.toml index 967ad78b6cf..f33e08bebd2 100644 --- a/python/cugraph/pyproject.toml +++ b/python/cugraph/pyproject.toml @@ -4,7 +4,7 @@ requires = [ "cython>=3.0.0", - "rapids-build-backend", + "rapids-build-backend>=0.1.1,<0.2.0.dev0", "scikit-build-core[pyproject]>=0.7.0", "setuptools>=61.0.0", "wheel", diff --git a/python/nx-cugraph/pyproject.toml b/python/nx-cugraph/pyproject.toml index 33ae1864c3c..640d1f255da 100644 --- a/python/nx-cugraph/pyproject.toml +++ b/python/nx-cugraph/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend", + "rapids-build-backend>=0.1.1,<0.2.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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 c6da88b19a2..a8797151620 100644 --- a/python/pylibcugraph/pyproject.toml +++ b/python/pylibcugraph/pyproject.toml @@ -4,7 +4,7 @@ requires = [ "cython>=3.0.0", - "rapids-build-backend", + "rapids-build-backend>=0.1.1,<0.2.0.dev0", "scikit-build-core[pyproject]>=0.7.0", "setuptools>=61.0.0", "wheel", From 09190df33b4b4c3e1532e4f30870449825929f4e Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 14 May 2024 13:22:26 -0400 Subject: [PATCH 11/47] _version.py --- python/cugraph-dgl/cugraph_dgl/_version.py | 11 ++++------- .../cugraph_equivariant/_version.py | 18 +++++++----------- python/cugraph-pyg/cugraph_pyg/_version.py | 11 ++++------- .../client/cugraph_service_client/_version.py | 14 ++++---------- .../server/cugraph_service_server/_version.py | 14 ++++---------- python/nx-cugraph/_nx_cugraph/_version.py | 13 ++++++------- python/pylibcugraph/pylibcugraph/_version.py | 11 ++++------- 7 files changed, 33 insertions(+), 59 deletions(-) diff --git a/python/cugraph-dgl/cugraph_dgl/_version.py b/python/cugraph-dgl/cugraph_dgl/_version.py index 855d1a191f8..a38243dea3d 100644 --- a/python/cugraph-dgl/cugraph_dgl/_version.py +++ b/python/cugraph-dgl/cugraph_dgl/_version.py @@ -15,20 +15,17 @@ import importlib.resources -# Read VERSION file from the module that is symlinked to VERSION file -# in the root of the repo at build time or copied to the moudle at -# installation. VERSION is a separate file that allows CI build-time scripts -# to update version info (including commit hashes) without modifying -# source files. __version__ = ( - importlib.resources.files("cugraph_dgl").joinpath("VERSION").read_text().strip() + importlib.resources.files(__package__).joinpath("VERSION").read_text().strip() ) try: __git_commit__ = ( - importlib.resources.files("cugraph_dgl") + importlib.resources.files(__package__) .joinpath("GIT_COMMIT") .read_text() .strip() ) except FileNotFoundError: __git_commit__ = "" + +__all__ = ["__version__", "__git_commit__"] diff --git a/python/cugraph-equivariant/cugraph_equivariant/_version.py b/python/cugraph-equivariant/cugraph_equivariant/_version.py index 33341235967..a38243dea3d 100644 --- a/python/cugraph-equivariant/cugraph_equivariant/_version.py +++ b/python/cugraph-equivariant/cugraph_equivariant/_version.py @@ -1,4 +1,5 @@ -# Copyright (c) 2024, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -10,26 +11,21 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# import importlib.resources -# Read VERSION file from the module that is symlinked to VERSION file -# in the root of the repo at build time or copied to the module at -# installation. VERSION is a separate file that allows CI build-time scripts -# to update version info (including commit hashes) without modifying -# source files. __version__ = ( - importlib.resources.files("cugraph_equivariant") - .joinpath("VERSION") - .read_text() - .strip() + importlib.resources.files(__package__).joinpath("VERSION").read_text().strip() ) try: __git_commit__ = ( - importlib.resources.files("cugraph_equivariant") + importlib.resources.files(__package__) .joinpath("GIT_COMMIT") .read_text() .strip() ) except FileNotFoundError: __git_commit__ = "" + +__all__ = ["__version__", "__git_commit__"] diff --git a/python/cugraph-pyg/cugraph_pyg/_version.py b/python/cugraph-pyg/cugraph_pyg/_version.py index 74dcf1527d3..a38243dea3d 100644 --- a/python/cugraph-pyg/cugraph_pyg/_version.py +++ b/python/cugraph-pyg/cugraph_pyg/_version.py @@ -15,20 +15,17 @@ import importlib.resources -# Read VERSION file from the module that is symlinked to VERSION file -# in the root of the repo at build time or copied to the moudle at -# installation. VERSION is a separate file that allows CI build-time scripts -# to update version info (including commit hashes) without modifying -# source files. __version__ = ( - importlib.resources.files("cugraph_pyg").joinpath("VERSION").read_text().strip() + importlib.resources.files(__package__).joinpath("VERSION").read_text().strip() ) try: __git_commit__ = ( - importlib.resources.files("cugraph_pyg") + importlib.resources.files(__package__) .joinpath("GIT_COMMIT") .read_text() .strip() ) except FileNotFoundError: __git_commit__ = "" + +__all__ = ["__version__", "__git_commit__"] diff --git a/python/cugraph-service/client/cugraph_service_client/_version.py b/python/cugraph-service/client/cugraph_service_client/_version.py index a5e82464168..a38243dea3d 100644 --- a/python/cugraph-service/client/cugraph_service_client/_version.py +++ b/python/cugraph-service/client/cugraph_service_client/_version.py @@ -15,23 +15,17 @@ import importlib.resources -# Read VERSION file from the module that is symlinked to VERSION file -# in the root of the repo at build time or copied to the moudle at -# installation. VERSION is a separate file that allows CI build-time scripts -# to update version info (including commit hashes) without modifying -# source files. __version__ = ( - importlib.resources.files("cugraph_service_client") - .joinpath("VERSION") - .read_text() - .strip() + importlib.resources.files(__package__).joinpath("VERSION").read_text().strip() ) try: __git_commit__ = ( - importlib.resources.files("cugraph_service_client") + importlib.resources.files(__package__) .joinpath("GIT_COMMIT") .read_text() .strip() ) except FileNotFoundError: __git_commit__ = "" + +__all__ = ["__version__", "__git_commit__"] diff --git a/python/cugraph-service/server/cugraph_service_server/_version.py b/python/cugraph-service/server/cugraph_service_server/_version.py index 05987c58545..a38243dea3d 100644 --- a/python/cugraph-service/server/cugraph_service_server/_version.py +++ b/python/cugraph-service/server/cugraph_service_server/_version.py @@ -15,23 +15,17 @@ import importlib.resources -# Read VERSION file from the module that is symlinked to VERSION file -# in the root of the repo at build time or copied to the moudle at -# installation. VERSION is a separate file that allows CI build-time scripts -# to update version info (including commit hashes) without modifying -# source files. __version__ = ( - importlib.resources.files("cugraph_service_server") - .joinpath("VERSION") - .read_text() - .strip() + importlib.resources.files(__package__).joinpath("VERSION").read_text().strip() ) try: __git_commit__ = ( - importlib.resources.files("cugraph_service_server") + importlib.resources.files(__package__) .joinpath("GIT_COMMIT") .read_text() .strip() ) except FileNotFoundError: __git_commit__ = "" + +__all__ = ["__version__", "__git_commit__"] diff --git a/python/nx-cugraph/_nx_cugraph/_version.py b/python/nx-cugraph/_nx_cugraph/_version.py index 91f98396559..a38243dea3d 100644 --- a/python/nx-cugraph/_nx_cugraph/_version.py +++ b/python/nx-cugraph/_nx_cugraph/_version.py @@ -11,22 +11,21 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# + import importlib.resources -# Read VERSION file from the module that is symlinked to VERSION file -# in the root of the repo at build time or copied to the module at -# installation. VERSION is a separate file that allows CI build-time scripts -# to update version info (including commit hashes) without modifying -# source files. __version__ = ( - importlib.resources.files("_nx_cugraph").joinpath("VERSION").read_text().strip() + importlib.resources.files(__package__).joinpath("VERSION").read_text().strip() ) try: __git_commit__ = ( - importlib.resources.files("_nx_cugraph") + importlib.resources.files(__package__) .joinpath("GIT_COMMIT") .read_text() .strip() ) except FileNotFoundError: __git_commit__ = "" + +__all__ = ["__version__", "__git_commit__"] diff --git a/python/pylibcugraph/pylibcugraph/_version.py b/python/pylibcugraph/pylibcugraph/_version.py index 7c62bed03c9..a38243dea3d 100644 --- a/python/pylibcugraph/pylibcugraph/_version.py +++ b/python/pylibcugraph/pylibcugraph/_version.py @@ -15,20 +15,17 @@ import importlib.resources -# Read VERSION file from the module that is symlinked to VERSION file -# in the root of the repo at build time or copied to the moudle at -# installation. VERSION is a separate file that allows CI build-time scripts -# to update version info (including commit hashes) without modifying -# source files. __version__ = ( - importlib.resources.files("pylibcugraph").joinpath("VERSION").read_text().strip() + importlib.resources.files(__package__).joinpath("VERSION").read_text().strip() ) try: __git_commit__ = ( - importlib.resources.files("pylibcugraph") + importlib.resources.files(__package__) .joinpath("GIT_COMMIT") .read_text() .strip() ) except FileNotFoundError: __git_commit__ = "" + +__all__ = ["__version__", "__git_commit__"] From 2f3bfa70816882afe028ceebd1ff95269c253e65 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Wed, 15 May 2024 16:32:25 -0400 Subject: [PATCH 12/47] Update for RBB 0.2.0 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-122_arch-x86_64.yaml | 2 +- dependencies.yaml | 2 +- python/cugraph-dgl/pyproject.toml | 3 +-- python/cugraph-equivariant/pyproject.toml | 3 +-- python/cugraph-pyg/pyproject.toml | 3 +-- python/cugraph-service/client/pyproject.toml | 3 +-- python/cugraph-service/server/pyproject.toml | 3 +-- python/cugraph/pyproject.toml | 3 +-- python/nx-cugraph/pyproject.toml | 4 ++-- python/pylibcugraph/pyproject.toml | 3 +-- 11 files changed, 12 insertions(+), 19 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 9852c7fe0c9..9849e75882f 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -57,7 +57,7 @@ dependencies: - pytest-xdist - python-louvain - raft-dask==24.6.* -- rapids-build-backend>=0.1.1,<0.2.0.dev0 +- rapids-build-backend>=0.2.0,<0.3.0.dev0 - rapids-dask-dependency==24.6.* - recommonmark - requests diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index de37cd1dd94..aae02f082be 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -62,7 +62,7 @@ dependencies: - pytest-xdist - python-louvain - raft-dask==24.6.* -- rapids-build-backend>=0.1.1,<0.2.0.dev0 +- rapids-build-backend>=0.2.0,<0.3.0.dev0 - rapids-dask-dependency==24.6.* - recommonmark - requests diff --git a/dependencies.yaml b/dependencies.yaml index 411ecbf526f..7c580f329ae 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -440,7 +440,7 @@ dependencies: common: - output_types: [conda, pyproject, requirements] packages: - - rapids-build-backend>=0.1.1,<0.2.0.dev0 + - rapids-build-backend>=0.2.0,<0.3.0.dev0 - setuptools>=61.0.0 - wheel python_build_cythonize: diff --git a/python/cugraph-dgl/pyproject.toml b/python/cugraph-dgl/pyproject.toml index 53d22ccbbcb..dcf836f91d6 100644 --- a/python/cugraph-dgl/pyproject.toml +++ b/python/cugraph-dgl/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.1.1,<0.2.0.dev0", + "rapids-build-backend>=0.2.0,<0.3.0.dev0", "setuptools>=61.0.0", "wheel", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. @@ -57,5 +57,4 @@ include = [ [tool.rapids-build-backend] build-backend = "setuptools.build_meta" requires = [] -commit-file = "cugraph_dgl/GIT_COMMIT" dependencies-file = "../../dependencies.yaml" diff --git a/python/cugraph-equivariant/pyproject.toml b/python/cugraph-equivariant/pyproject.toml index e3bf5dcc30f..11caa7e2108 100644 --- a/python/cugraph-equivariant/pyproject.toml +++ b/python/cugraph-equivariant/pyproject.toml @@ -13,7 +13,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.1.1,<0.2.0.dev0", + "rapids-build-backend>=0.2.0,<0.3.0.dev0", "setuptools>=61.0.0", "wheel", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. @@ -68,5 +68,4 @@ include = [ [tool.rapids-build-backend] build-backend = "setuptools.build_meta" requires = [] -commit-file = "cugraph_equivariant/GIT_COMMIT" dependencies-file = "../../dependencies.yaml" diff --git a/python/cugraph-pyg/pyproject.toml b/python/cugraph-pyg/pyproject.toml index 45c69575e15..41bc106b351 100644 --- a/python/cugraph-pyg/pyproject.toml +++ b/python/cugraph-pyg/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.1.1,<0.2.0.dev0", + "rapids-build-backend>=0.2.0,<0.3.0.dev0", "setuptools>=61.0.0", "wheel", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. @@ -63,5 +63,4 @@ include = [ [tool.rapids-build-backend] build-backend = "setuptools.build_meta" requires = [] -commit-file = "cugraph_pyg/GIT_COMMIT" dependencies-file = "../../dependencies.yaml" diff --git a/python/cugraph-service/client/pyproject.toml b/python/cugraph-service/client/pyproject.toml index a9e7122b9bd..c0feb08278c 100644 --- a/python/cugraph-service/client/pyproject.toml +++ b/python/cugraph-service/client/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.1.1,<0.2.0.dev0", + "rapids-build-backend>=0.2.0,<0.3.0.dev0", "setuptools>=61.0.0", "wheel", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`. @@ -48,5 +48,4 @@ include = [ [tool.rapids-build-backend] build-backend = "setuptools.build_meta" requires = [] -commit-file = "cugraph_service_client/GIT_COMMIT" dependencies-file = "../../../dependencies.yaml" diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml index b5cdcccf0a9..7f1be917fde 100644 --- a/python/cugraph-service/server/pyproject.toml +++ b/python/cugraph-service/server/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.1.1,<0.2.0.dev0", + "rapids-build-backend>=0.2.0,<0.3.0.dev0", "setuptools>=61.0.0", "wheel", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`. @@ -73,5 +73,4 @@ include = [ [tool.rapids-build-backend] build-backend = "setuptools.build_meta" requires = [] -commit-file = "cugraph_service_server/GIT_COMMIT" dependencies-file = "../../../dependencies.yaml" diff --git a/python/cugraph/pyproject.toml b/python/cugraph/pyproject.toml index f33e08bebd2..ed6cf0159b8 100644 --- a/python/cugraph/pyproject.toml +++ b/python/cugraph/pyproject.toml @@ -4,7 +4,7 @@ requires = [ "cython>=3.0.0", - "rapids-build-backend>=0.1.1,<0.2.0.dev0", + "rapids-build-backend>=0.2.0,<0.3.0.dev0", "scikit-build-core[pyproject]>=0.7.0", "setuptools>=61.0.0", "wheel", @@ -77,5 +77,4 @@ requires = [ "cmake>=3.26.4", "ninja", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. -commit-file = "cugraph/GIT_COMMIT" dependencies-file = "../../dependencies.yaml" diff --git a/python/nx-cugraph/pyproject.toml b/python/nx-cugraph/pyproject.toml index 640d1f255da..d1c5ff7835b 100644 --- a/python/nx-cugraph/pyproject.toml +++ b/python/nx-cugraph/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.1.1,<0.2.0.dev0", + "rapids-build-backend>=0.2.0,<0.3.0.dev0", "setuptools>=61.0.0", "wheel", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. @@ -82,7 +82,7 @@ include = [ [tool.rapids-build-backend] build-backend = "setuptools.build_meta" -commit-file = "_nx_cugraph/GIT_COMMIT" +commit-files = ["_nx_cugraph/GIT_COMMIT"] dependencies-file = "../../dependencies.yaml" require-cuda = false diff --git a/python/pylibcugraph/pyproject.toml b/python/pylibcugraph/pyproject.toml index a8797151620..a85a39be6f3 100644 --- a/python/pylibcugraph/pyproject.toml +++ b/python/pylibcugraph/pyproject.toml @@ -4,7 +4,7 @@ requires = [ "cython>=3.0.0", - "rapids-build-backend>=0.1.1,<0.2.0.dev0", + "rapids-build-backend>=0.2.0,<0.3.0.dev0", "scikit-build-core[pyproject]>=0.7.0", "setuptools>=61.0.0", "wheel", @@ -64,7 +64,6 @@ regex = "(?P.*)" [tool.rapids-build-backend] build-backend = "scikit_build_core.build" -commit-file = "pylibcugraph/GIT_COMMIT" dependencies-file = "../../dependencies.yaml" requires = [ "cmake>=3.26.4", From 926afc198e99f7ca70279756d1db039f70e48f65 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Wed, 15 May 2024 17:47:20 -0400 Subject: [PATCH 13/47] Disable CUDA in service --- python/cugraph-service/client/pyproject.toml | 1 + python/cugraph-service/server/pyproject.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/python/cugraph-service/client/pyproject.toml b/python/cugraph-service/client/pyproject.toml index c0feb08278c..60027885d7b 100644 --- a/python/cugraph-service/client/pyproject.toml +++ b/python/cugraph-service/client/pyproject.toml @@ -49,3 +49,4 @@ include = [ build-backend = "setuptools.build_meta" requires = [] dependencies-file = "../../../dependencies.yaml" +disable-cuda = true diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml index 7f1be917fde..5c444a44ff9 100644 --- a/python/cugraph-service/server/pyproject.toml +++ b/python/cugraph-service/server/pyproject.toml @@ -74,3 +74,4 @@ include = [ build-backend = "setuptools.build_meta" requires = [] dependencies-file = "../../../dependencies.yaml" +disable-cuda = true From 91d0ceee0c364059e3def2ab8f52e3c3d50d0c46 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Thu, 16 May 2024 09:59:35 -0400 Subject: [PATCH 14/47] Update RBB version --- conda/recipes/cugraph-dgl/meta.yaml | 2 +- conda/recipes/cugraph-equivariant/meta.yaml | 2 +- conda/recipes/cugraph-pyg/meta.yaml | 2 +- conda/recipes/cugraph-service/meta.yaml | 10 ++-------- conda/recipes/cugraph/meta.yaml | 2 +- conda/recipes/libcugraph/meta.yaml | 2 +- conda/recipes/nx-cugraph/meta.yaml | 2 +- conda/recipes/pylibcugraph/meta.yaml | 2 +- 8 files changed, 9 insertions(+), 15 deletions(-) diff --git a/conda/recipes/cugraph-dgl/meta.yaml b/conda/recipes/cugraph-dgl/meta.yaml index 3c505eff6bc..85981643f9a 100644 --- a/conda/recipes/cugraph-dgl/meta.yaml +++ b/conda/recipes/cugraph-dgl/meta.yaml @@ -21,7 +21,7 @@ build: requirements: host: - python - - rapids-build-backend + - rapids-build-backend>=0.2.0,<0.3.0.dev0 run: - cugraph ={{ version }} - dgl >=1.1.0.cu* diff --git a/conda/recipes/cugraph-equivariant/meta.yaml b/conda/recipes/cugraph-equivariant/meta.yaml index 6a010d23020..e59e10c608c 100644 --- a/conda/recipes/cugraph-equivariant/meta.yaml +++ b/conda/recipes/cugraph-equivariant/meta.yaml @@ -21,7 +21,7 @@ build: requirements: host: - python - - rapids-build-backend + - rapids-build-backend>=0.2.0,<0.3.0.dev0 run: - pylibcugraphops ={{ minor_version }} - python diff --git a/conda/recipes/cugraph-pyg/meta.yaml b/conda/recipes/cugraph-pyg/meta.yaml index 756e6216ab7..9c7f802b863 100644 --- a/conda/recipes/cugraph-pyg/meta.yaml +++ b/conda/recipes/cugraph-pyg/meta.yaml @@ -25,7 +25,7 @@ requirements: - cython >=3.0.0 - python - scikit-build-core >=0.7.0 - - rapids-build-backend + - rapids-build-backend>=0.2.0,<0.3.0.dev0 run: - rapids-dask-dependency ={{ minor_version }} - numba >=0.57 diff --git a/conda/recipes/cugraph-service/meta.yaml b/conda/recipes/cugraph-service/meta.yaml index e5990bd13df..fb039eaa6cd 100644 --- a/conda/recipes/cugraph-service/meta.yaml +++ b/conda/recipes/cugraph-service/meta.yaml @@ -29,13 +29,7 @@ outputs: host: - pip - python - # TODO: Add rapids-build-backend once the package exists. Then we can remove dependencies up to the next TODO. - #- rapids-build-backend - - tomli - - tomli-w - - packaging - - rapids-dependency-file-generator - # TODO: Remove above dependencies after rapids-build-backend packages exist + - rapids-build-backend>=0.2.0,<0.3.0.dev0 run: - python - thriftpy2 >=0.4.15 @@ -59,7 +53,7 @@ outputs: - python - setuptools - wheel - - rapids-build-backend + - rapids-build-backend>=0.2.0,<0.3.0.dev0 run: - {{ pin_subpackage('cugraph-service-client', exact=True) }} - cudf ={{ minor_version }} diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml index ac8cb5a141b..dfaeaa0c487 100644 --- a/conda/recipes/cugraph/meta.yaml +++ b/conda/recipes/cugraph/meta.yaml @@ -70,7 +70,7 @@ requirements: - rmm ={{ minor_version }} - scikit-build-core >=0.7.0 - setuptools - - rapids-build-backend + - rapids-build-backend>=0.2.0,<0.3.0.dev0 run: - aiohttp - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml index 6267023d7bf..94574c0a9bc 100644 --- a/conda/recipes/libcugraph/meta.yaml +++ b/conda/recipes/libcugraph/meta.yaml @@ -75,7 +75,7 @@ requirements: - librmm ={{ minor_version }} - nccl {{ nccl_version }} - ucx-proc=*=gpu - - rapids-build-backend + - rapids-build-backend>=0.2.0,<0.3.0.dev0 outputs: - name: libcugraph diff --git a/conda/recipes/nx-cugraph/meta.yaml b/conda/recipes/nx-cugraph/meta.yaml index 0cc4a838643..7db752a11af 100644 --- a/conda/recipes/nx-cugraph/meta.yaml +++ b/conda/recipes/nx-cugraph/meta.yaml @@ -21,7 +21,7 @@ build: requirements: host: - python - - rapids-build-backend + - rapids-build-backend>=0.2.0,<0.3.0.dev0 run: - pylibcugraph ={{ version }} - networkx >=3.0 diff --git a/conda/recipes/pylibcugraph/meta.yaml b/conda/recipes/pylibcugraph/meta.yaml index 629d9f6eb41..38b75d6cb55 100644 --- a/conda/recipes/pylibcugraph/meta.yaml +++ b/conda/recipes/pylibcugraph/meta.yaml @@ -67,7 +67,7 @@ requirements: - python - scikit-build-core >=0.7.0 - setuptools - - rapids-build-backend + - rapids-build-backend>=0.2.0,<0.3.0.dev0 run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} From c635ea5e6bb1bbb2cdf6aa4a8f946d3fe7223c9e Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Thu, 16 May 2024 10:52:27 -0400 Subject: [PATCH 15/47] disable-cuda --- python/nx-cugraph/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/nx-cugraph/pyproject.toml b/python/nx-cugraph/pyproject.toml index d1c5ff7835b..9b778f62713 100644 --- a/python/nx-cugraph/pyproject.toml +++ b/python/nx-cugraph/pyproject.toml @@ -84,7 +84,7 @@ include = [ build-backend = "setuptools.build_meta" commit-files = ["_nx_cugraph/GIT_COMMIT"] dependencies-file = "../../dependencies.yaml" -require-cuda = false +disable-cuda = true [tool.black] line-length = 88 From 0cffeb4bef170a9c9e9cb572fc438c95776622e5 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Thu, 16 May 2024 11:53:05 -0400 Subject: [PATCH 16/47] Fix cugraph-equivariant --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-122_arch-x86_64.yaml | 2 +- dependencies.yaml | 4 ++-- python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml | 2 +- python/cugraph-dgl/pyproject.toml | 1 + python/cugraph-equivariant/pyproject.toml | 2 ++ python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml | 2 +- python/cugraph-pyg/pyproject.toml | 1 + 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 9849e75882f..13691639d58 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -47,7 +47,7 @@ dependencies: - pandas - pre-commit - pydata-sphinx-theme -- pylibcugraphops==24.6.* +- pylibcugraphops==24.6.*,>=0.0.0a0 - pylibraft==24.6.* - pylibwholegraph==24.6.* - pytest diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index aae02f082be..3f265bcb390 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -52,7 +52,7 @@ dependencies: - pandas - pre-commit - pydata-sphinx-theme -- pylibcugraphops==24.6.* +- pylibcugraphops==24.6.*,>=0.0.0a0 - pylibraft==24.6.* - pylibwholegraph==24.6.* - pytest diff --git a/dependencies.yaml b/dependencies.yaml index 7c580f329ae..9631d63cdad 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -712,7 +712,7 @@ dependencies: common: - output_types: conda packages: - - &pylibcugraphops_conda pylibcugraphops==24.6.* + - &pylibcugraphops_conda pylibcugraphops==24.6.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -727,7 +727,7 @@ dependencies: - matrix: {cuda: "11.*"} packages: - pylibcugraphops-cu11==24.6.*,>=0.0.0a0 - - {matrix: null, packages: null} + - {matrix: null, packages: [*pylibcugraphops_conda]} depends_on_cupy: common: diff --git a/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml b/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml index bc8bf776a1e..28fd77e1017 100644 --- a/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml +++ b/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml @@ -13,7 +13,7 @@ dependencies: - dgl>=1.1.0.cu* - pandas - pre-commit -- pylibcugraphops==24.6.* +- pylibcugraphops==24.6.*,>=0.0.0a0 - pytest - pytest-benchmark - pytest-cov diff --git a/python/cugraph-dgl/pyproject.toml b/python/cugraph-dgl/pyproject.toml index dcf836f91d6..a908fbe248d 100644 --- a/python/cugraph-dgl/pyproject.toml +++ b/python/cugraph-dgl/pyproject.toml @@ -27,6 +27,7 @@ dependencies = [ "cugraph==24.6.*", "numba>=0.57", "numpy>=1.23,<2.0a0", + "pylibcugraphops==24.6.*,>=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] diff --git a/python/cugraph-equivariant/pyproject.toml b/python/cugraph-equivariant/pyproject.toml index 11caa7e2108..31412be7f80 100644 --- a/python/cugraph-equivariant/pyproject.toml +++ b/python/cugraph-equivariant/pyproject.toml @@ -37,6 +37,7 @@ classifiers = [ "Programming Language :: Python :: 3.11", ] dependencies = [ + "pylibcugraphops==24.6.*,>=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.urls] @@ -69,3 +70,4 @@ include = [ build-backend = "setuptools.build_meta" requires = [] dependencies-file = "../../dependencies.yaml" +disable-cuda = true diff --git a/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml b/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml index 94e9f1decbd..d289a550104 100644 --- a/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml +++ b/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml @@ -13,7 +13,7 @@ dependencies: - pandas - pre-commit - pyg>=2.4.0 -- pylibcugraphops==24.6.* +- pylibcugraphops==24.6.*,>=0.0.0a0 - pytest - pytest-benchmark - pytest-cov diff --git a/python/cugraph-pyg/pyproject.toml b/python/cugraph-pyg/pyproject.toml index 41bc106b351..58acb49cd77 100644 --- a/python/cugraph-pyg/pyproject.toml +++ b/python/cugraph-pyg/pyproject.toml @@ -32,6 +32,7 @@ dependencies = [ "cugraph==24.6.*", "numba>=0.57", "numpy>=1.23,<2.0a0", + "pylibcugraphops==24.6.*,>=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.urls] From 13b9233779105b97327c26c700c6caebb9071347 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Thu, 16 May 2024 13:26:31 -0400 Subject: [PATCH 17/47] Remove disable-cuda, fix dependencies --- .../all_cuda-118_arch-x86_64.yaml | 10 +++---- .../all_cuda-122_arch-x86_64.yaml | 10 +++---- dependencies.yaml | 26 +++++++++---------- python/cugraph-equivariant/pyproject.toml | 1 - python/cugraph-service/client/pyproject.toml | 1 - python/cugraph-service/server/pyproject.toml | 5 +++- python/cugraph/pyproject.toml | 9 +++++++ python/nx-cugraph/pyproject.toml | 3 ++- python/pylibcugraph/pyproject.toml | 5 ++++ 9 files changed, 43 insertions(+), 27 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 13691639d58..93a3d4d0677 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -16,12 +16,12 @@ dependencies: - cuda-nvtx - cuda-version=11.8 - cudatoolkit -- cudf==24.6.* +- cudf==24.6.*,>=0.0.0a0 - cupy>=12.0.0 - cxx-compiler - cython>=3.0.0 - dask-cuda==24.6.* -- dask-cudf==24.6.* +- dask-cudf==24.6.*,>=0.0.0a0 - doxygen - fsspec>=0.6.0 - gcc_linux-64=11.* @@ -48,7 +48,7 @@ dependencies: - pre-commit - pydata-sphinx-theme - pylibcugraphops==24.6.*,>=0.0.0a0 -- pylibraft==24.6.* +- pylibraft==24.6.*,>=0.0.0a0 - pylibwholegraph==24.6.* - pytest - pytest-benchmark @@ -56,12 +56,12 @@ dependencies: - pytest-mpl - pytest-xdist - python-louvain -- raft-dask==24.6.* +- raft-dask==24.6.*,>=0.0.0a0 - rapids-build-backend>=0.2.0,<0.3.0.dev0 - rapids-dask-dependency==24.6.* - recommonmark - requests -- rmm==24.6.* +- rmm==24.6.*,>=0.0.0a0 - scikit-build-core>=0.7.0 - scikit-learn>=0.23.1 - scipy diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 3f265bcb390..aeefa1914ea 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -18,12 +18,12 @@ dependencies: - cuda-nvtx-dev - cuda-profiler-api - cuda-version=12.2 -- cudf==24.6.* +- cudf==24.6.*,>=0.0.0a0 - cupy>=12.0.0 - cxx-compiler - cython>=3.0.0 - dask-cuda==24.6.* -- dask-cudf==24.6.* +- dask-cudf==24.6.*,>=0.0.0a0 - doxygen - fsspec>=0.6.0 - gcc_linux-64=11.* @@ -53,7 +53,7 @@ dependencies: - pre-commit - pydata-sphinx-theme - pylibcugraphops==24.6.*,>=0.0.0a0 -- pylibraft==24.6.* +- pylibraft==24.6.*,>=0.0.0a0 - pylibwholegraph==24.6.* - pytest - pytest-benchmark @@ -61,12 +61,12 @@ dependencies: - pytest-mpl - pytest-xdist - python-louvain -- raft-dask==24.6.* +- raft-dask==24.6.*,>=0.0.0a0 - rapids-build-backend>=0.2.0,<0.3.0.dev0 - rapids-dask-dependency==24.6.* - recommonmark - requests -- rmm==24.6.* +- rmm==24.6.*,>=0.0.0a0 - scikit-build-core>=0.7.0 - scikit-learn>=0.23.1 - scipy diff --git a/dependencies.yaml b/dependencies.yaml index 9631d63cdad..d116fc2c18c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -586,7 +586,7 @@ dependencies: common: - output_types: conda packages: - - &rmm_conda rmm==24.6.* + - &rmm_conda rmm==24.6.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -601,13 +601,13 @@ dependencies: - matrix: {cuda: "11.*"} packages: - rmm-cu11==24.6.*,>=0.0.0a0 - - {matrix: null, packages: null} + - {matrix: null, packages: [*rmm_conda]} depends_on_cudf: common: - output_types: conda packages: - - &cudf_conda cudf==24.6.* + - &cudf_conda cudf==24.6.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -622,13 +622,13 @@ dependencies: - matrix: {cuda: "11.*"} packages: - cudf-cu11==24.6.*,>=0.0.0a0 - - {matrix: null, packages: null} + - {matrix: null, packages: [*cudf_conda]} depends_on_dask_cudf: common: - output_types: conda packages: - - &dask_cudf_conda dask-cudf==24.6.* + - &dask_cudf_conda dask-cudf==24.6.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -643,13 +643,13 @@ dependencies: - matrix: {cuda: "11.*"} packages: - dask-cudf-cu11==24.6.*,>=0.0.0a0 - - {matrix: null, packages: null} + - {matrix: null, packages: [*dask_cudf_conda]} depends_on_pylibraft: common: - output_types: conda packages: - - &pylibraft_conda pylibraft==24.6.* + - &pylibraft_conda pylibraft==24.6.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -664,13 +664,13 @@ dependencies: - matrix: {cuda: "11.*"} packages: - pylibraft-cu11==24.6.*,>=0.0.0a0 - - {matrix: null, packages: null} + - {matrix: null, packages: [*pylibraft_conda]} depends_on_raft_dask: common: - output_types: conda packages: - - &raft_dask_conda raft-dask==24.6.* + - &raft_dask_conda raft-dask==24.6.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -685,13 +685,13 @@ dependencies: - matrix: {cuda: "11.*"} packages: - raft-dask-cu11==24.6.*,>=0.0.0a0 - - {matrix: null, packages: null} + - {matrix: null, packages: [*raft_dask_conda]} depends_on_pylibcugraph: common: - output_types: conda packages: - - &pylibcugraph_conda pylibcugraph==24.6.* + - &pylibcugraph_conda pylibcugraph==24.6.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -706,7 +706,7 @@ dependencies: - matrix: {cuda: "11.*"} packages: - pylibcugraph-cu11==24.6.*,>=0.0.0a0 - - {matrix: null, packages: null} + - {matrix: null, packages: [*pylibcugraph_conda]} depends_on_pylibcugraphops: common: @@ -743,4 +743,4 @@ dependencies: - matrix: {cuda: "11.*"} packages: &cupy_packages_cu11 - cupy-cuda11x>=12.0.0 - - {matrix: null, packages: null} + - {matrix: null, packages: *cupy_packages_cu11} diff --git a/python/cugraph-equivariant/pyproject.toml b/python/cugraph-equivariant/pyproject.toml index 31412be7f80..d7a86b9953c 100644 --- a/python/cugraph-equivariant/pyproject.toml +++ b/python/cugraph-equivariant/pyproject.toml @@ -70,4 +70,3 @@ include = [ build-backend = "setuptools.build_meta" requires = [] dependencies-file = "../../dependencies.yaml" -disable-cuda = true diff --git a/python/cugraph-service/client/pyproject.toml b/python/cugraph-service/client/pyproject.toml index 60027885d7b..c0feb08278c 100644 --- a/python/cugraph-service/client/pyproject.toml +++ b/python/cugraph-service/client/pyproject.toml @@ -49,4 +49,3 @@ include = [ build-backend = "setuptools.build_meta" requires = [] dependencies-file = "../../../dependencies.yaml" -disable-cuda = true diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml index 5c444a44ff9..cc2e337fd9c 100644 --- a/python/cugraph-service/server/pyproject.toml +++ b/python/cugraph-service/server/pyproject.toml @@ -20,12 +20,16 @@ authors = [ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ + "cudf==24.6.*,>=0.0.0a0", "cugraph-service-client==24.6.*", "cugraph==24.6.*", + "cupy-cuda11x>=12.0.0", "dask-cuda==24.6.*", + "dask-cudf==24.6.*,>=0.0.0a0", "numba>=0.57", "numpy>=1.23,<2.0a0", "rapids-dask-dependency==24.6.*", + "rmm==24.6.*,>=0.0.0a0", "thriftpy2", "ucx-py==0.38.*", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`. @@ -74,4 +78,3 @@ include = [ build-backend = "setuptools.build_meta" requires = [] dependencies-file = "../../../dependencies.yaml" -disable-cuda = true diff --git a/python/cugraph/pyproject.toml b/python/cugraph/pyproject.toml index ed6cf0159b8..d3b6845926d 100644 --- a/python/cugraph/pyproject.toml +++ b/python/cugraph/pyproject.toml @@ -25,11 +25,17 @@ authors = [ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ + "cudf==24.6.*,>=0.0.0a0", + "cupy-cuda11x>=12.0.0", "dask-cuda==24.6.*", + "dask-cudf==24.6.*,>=0.0.0a0", "fsspec[http]>=0.6.0", "numba>=0.57", "numpy>=1.23,<2.0a0", + "pylibcugraph==24.6.*,>=0.0.0a0", + "raft-dask==24.6.*,>=0.0.0a0", "rapids-dask-dependency==24.6.*", + "rmm==24.6.*,>=0.0.0a0", "ucx-py==0.38.*", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ @@ -76,5 +82,8 @@ build-backend = "scikit_build_core.build" requires = [ "cmake>=3.26.4", "ninja", + "pylibcugraph==24.6.*,>=0.0.0a0", + "pylibraft==24.6.*,>=0.0.0a0", + "rmm==24.6.*,>=0.0.0a0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. dependencies-file = "../../dependencies.yaml" diff --git a/python/nx-cugraph/pyproject.toml b/python/nx-cugraph/pyproject.toml index 9b778f62713..4374e8aa4d7 100644 --- a/python/nx-cugraph/pyproject.toml +++ b/python/nx-cugraph/pyproject.toml @@ -32,8 +32,10 @@ classifiers = [ "Topic :: Software Development :: Libraries :: Python Modules", ] dependencies = [ + "cupy-cuda11x>=12.0.0", "networkx>=3.0", "numpy>=1.23,<2.0a0", + "pylibcugraph==24.6.*,>=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] @@ -84,7 +86,6 @@ include = [ build-backend = "setuptools.build_meta" commit-files = ["_nx_cugraph/GIT_COMMIT"] dependencies-file = "../../dependencies.yaml" -disable-cuda = true [tool.black] line-length = 88 diff --git a/python/pylibcugraph/pyproject.toml b/python/pylibcugraph/pyproject.toml index a85a39be6f3..7cdd7ecdd90 100644 --- a/python/pylibcugraph/pyproject.toml +++ b/python/pylibcugraph/pyproject.toml @@ -25,6 +25,8 @@ authors = [ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ + "pylibraft==24.6.*,>=0.0.0a0", + "rmm==24.6.*,>=0.0.0a0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers", @@ -36,6 +38,7 @@ classifiers = [ [project.optional-dependencies] test = [ + "cudf==24.6.*,>=0.0.0a0", "numpy>=1.23,<2.0a0", "pandas", "pytest", @@ -68,4 +71,6 @@ dependencies-file = "../../dependencies.yaml" requires = [ "cmake>=3.26.4", "ninja", + "pylibraft==24.6.*,>=0.0.0a0", + "rmm==24.6.*,>=0.0.0a0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. From 623949258ab7e39b7d2e7dab87db8fac3f1fd8ab Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 17 May 2024 15:03:42 -0400 Subject: [PATCH 18/47] Pass disable-cuda in conda recipes --- build.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index bd716943216..ff625c55140 100755 --- a/build.sh +++ b/build.sh @@ -338,8 +338,8 @@ if hasArg cugraph-service || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-service else - python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/cugraph-service/client - python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/cugraph-service/server + python ${PYTHON_ARGS_FOR_INSTALL} --config-setting disable-cuda=true ${REPODIR}/python/cugraph-service/client + python ${PYTHON_ARGS_FOR_INSTALL} --config-setting disable-cuda=true ${REPODIR}/python/cugraph-service/server fi fi @@ -348,7 +348,7 @@ if hasArg cugraph-pyg || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-pyg else - python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/cugraph-pyg + python ${PYTHON_ARGS_FOR_INSTALL} --config-setting disable-cuda=true ${REPODIR}/python/cugraph-pyg fi fi @@ -357,7 +357,7 @@ if hasArg cugraph-dgl || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-dgl else - python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/cugraph-dgl + python ${PYTHON_ARGS_FOR_INSTALL} --config-setting disable-cuda=true ${REPODIR}/python/cugraph-dgl fi fi @@ -366,7 +366,7 @@ if hasArg cugraph-equivariant || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-equivariant else - python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/cugraph-equivariant + python ${PYTHON_ARGS_FOR_INSTALL} --config-setting disable-cuda=true ${REPODIR}/python/cugraph-equivariant fi fi @@ -375,7 +375,7 @@ if hasArg nx-cugraph || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/nx-cugraph else - python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/nx-cugraph + python ${PYTHON_ARGS_FOR_INSTALL} --config-setting disable-cuda=true ${REPODIR}/python/nx-cugraph fi fi From 326fbd3b0a186a6048dc8986963723ab13d01e60 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 17 May 2024 16:03:12 -0400 Subject: [PATCH 19/47] Fix service build scripts --- .../recipes/cugraph-service/install_cugraph-service-client.sh | 4 ++-- .../recipes/cugraph-service/install_cugraph-service-server.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conda/recipes/cugraph-service/install_cugraph-service-client.sh b/conda/recipes/cugraph-service/install_cugraph-service-client.sh index 318e9800a76..02c514b9cd4 100644 --- a/conda/recipes/cugraph-service/install_cugraph-service-client.sh +++ b/conda/recipes/cugraph-service/install_cugraph-service-client.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # This assumes the script is executed from the root of the repo directory @@ -13,6 +13,6 @@ cd "${SRC_DIR}/python/cugraph-service/client" mkdir -p pip_cache -$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache . -vv +$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache --config-setting disable-cuda=true . -vv #./build.sh cugraph-service diff --git a/conda/recipes/cugraph-service/install_cugraph-service-server.sh b/conda/recipes/cugraph-service/install_cugraph-service-server.sh index 2dcae7c379b..2561919851f 100644 --- a/conda/recipes/cugraph-service/install_cugraph-service-server.sh +++ b/conda/recipes/cugraph-service/install_cugraph-service-server.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # This assumes the script is executed from the root of the repo directory @@ -13,6 +13,6 @@ cd "${SRC_DIR}/python/cugraph-service/server" mkdir -p pip_cache -$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache . -vv +$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache --config-setting disable-cuda=true . -vv #./build.sh cugraph-service From 17e76c79dae751f9ab07fb005bd63b2726d16b04 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 17 May 2024 17:02:34 -0400 Subject: [PATCH 20/47] More alpha specifiers --- .../all_cuda-118_arch-x86_64.yaml | 16 ++++++------- .../all_cuda-122_arch-x86_64.yaml | 16 ++++++------- dependencies.yaml | 24 +++++++++---------- .../conda/cugraph_dgl_dev_cuda-118.yaml | 2 +- python/cugraph-dgl/pyproject.toml | 2 +- .../conda/cugraph_pyg_dev_cuda-118.yaml | 2 +- python/cugraph-pyg/pyproject.toml | 2 +- python/cugraph-service/server/pyproject.toml | 8 +++---- python/cugraph/pyproject.toml | 4 ++-- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 93a3d4d0677..0c668a80ada 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -20,18 +20,18 @@ dependencies: - cupy>=12.0.0 - cxx-compiler - cython>=3.0.0 -- dask-cuda==24.6.* +- dask-cuda==24.6.*,>=0.0.0a0 - dask-cudf==24.6.*,>=0.0.0a0 - doxygen - fsspec>=0.6.0 - gcc_linux-64=11.* - graphviz - ipython -- libcudf==24.6.* -- libcugraphops==24.6.* -- libraft-headers==24.6.* -- libraft==24.6.* -- librmm==24.6.* +- libcudf==24.6.*,>=0.0.0a0 +- libcugraphops==24.6.*,>=0.0.0a0 +- libraft-headers==24.6.*,>=0.0.0a0 +- libraft==24.6.*,>=0.0.0a0 +- librmm==24.6.*,>=0.0.0a0 - nbsphinx - nccl>=2.9.9 - networkx>=2.5.1 @@ -49,7 +49,7 @@ dependencies: - pydata-sphinx-theme - pylibcugraphops==24.6.*,>=0.0.0a0 - pylibraft==24.6.*,>=0.0.0a0 -- pylibwholegraph==24.6.* +- pylibwholegraph==24.6.*,>=0.0.0a0 - pytest - pytest-benchmark - pytest-cov @@ -58,7 +58,7 @@ dependencies: - python-louvain - raft-dask==24.6.*,>=0.0.0a0 - rapids-build-backend>=0.2.0,<0.3.0.dev0 -- rapids-dask-dependency==24.6.* +- rapids-dask-dependency==24.6.*,>=0.0.0a0 - recommonmark - requests - rmm==24.6.*,>=0.0.0a0 diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index aeefa1914ea..3ef4403b438 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -22,7 +22,7 @@ dependencies: - cupy>=12.0.0 - cxx-compiler - cython>=3.0.0 -- dask-cuda==24.6.* +- dask-cuda==24.6.*,>=0.0.0a0 - dask-cudf==24.6.*,>=0.0.0a0 - doxygen - fsspec>=0.6.0 @@ -30,14 +30,14 @@ dependencies: - graphviz - ipython - libcublas-dev -- libcudf==24.6.* -- libcugraphops==24.6.* +- libcudf==24.6.*,>=0.0.0a0 +- libcugraphops==24.6.*,>=0.0.0a0 - libcurand-dev - libcusolver-dev - libcusparse-dev -- libraft-headers==24.6.* -- libraft==24.6.* -- librmm==24.6.* +- libraft-headers==24.6.*,>=0.0.0a0 +- libraft==24.6.*,>=0.0.0a0 +- librmm==24.6.*,>=0.0.0a0 - nbsphinx - nccl>=2.9.9 - networkx>=2.5.1 @@ -54,7 +54,7 @@ dependencies: - pydata-sphinx-theme - pylibcugraphops==24.6.*,>=0.0.0a0 - pylibraft==24.6.*,>=0.0.0a0 -- pylibwholegraph==24.6.* +- pylibwholegraph==24.6.*,>=0.0.0a0 - pytest - pytest-benchmark - pytest-cov @@ -63,7 +63,7 @@ dependencies: - python-louvain - raft-dask==24.6.*,>=0.0.0a0 - rapids-build-backend>=0.2.0,<0.3.0.dev0 -- rapids-dask-dependency==24.6.* +- rapids-dask-dependency==24.6.*,>=0.0.0a0 - recommonmark - requests - rmm==24.6.*,>=0.0.0a0 diff --git a/dependencies.yaml b/dependencies.yaml index 37ba3999068..4b02b097750 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -368,11 +368,11 @@ dependencies: packages: - c-compiler - cxx-compiler - - libcudf==24.6.* - - libcugraphops==24.6.* - - libraft-headers==24.6.* - - libraft==24.6.* - - librmm==24.6.* + - libcudf==24.6.*,>=0.0.0a0 + - libcugraphops==24.6.*,>=0.0.0a0 + - libraft-headers==24.6.*,>=0.0.0a0 + - libraft==24.6.*,>=0.0.0a0 + - librmm==24.6.*,>=0.0.0a0 - openmpi # Required for building cpp-mgtests (multi-GPU tests) specific: - output_types: [conda] @@ -458,8 +458,8 @@ dependencies: common: - output_types: [conda, pyproject] packages: - - &dask rapids-dask-dependency==24.6.* - - &dask_cuda dask-cuda==24.6.* + - &dask rapids-dask-dependency==24.6.*,>=0.0.0a0 + - &dask_cuda dask-cuda==24.6.*,>=0.0.0a0 - &numba numba>=0.57 - &numpy numpy>=1.23,<2.0a0 - &ucx_py ucx-py==0.38.* @@ -489,7 +489,7 @@ dependencies: - *numpy - output_types: [pyproject] packages: - - &cugraph cugraph==24.6.* + - &cugraph cugraph==24.6.*,>=0.0.0a0 python_run_cugraph_pyg: common: - output_types: [conda, pyproject] @@ -517,7 +517,7 @@ dependencies: - output_types: pyproject packages: - *cugraph - - cugraph-service-client==24.6.* + - cugraph-service-client==24.6.*,>=0.0.0a0 test_cpp: common: - output_types: conda @@ -552,7 +552,7 @@ dependencies: - scikit-learn>=0.23.1 - output_types: [conda] packages: - - pylibwholegraph==24.6.* + - pylibwholegraph==24.6.*,>=0.0.0a0 test_python_pylibcugraph: common: - output_types: [conda, pyproject] @@ -569,7 +569,7 @@ dependencies: common: - output_types: [conda] packages: - - cugraph==24.6.* + - cugraph==24.6.*,>=0.0.0a0 - pytorch>=2.0 - pytorch-cuda==11.8 - dgl>=1.1.0.cu* @@ -577,7 +577,7 @@ dependencies: common: - output_types: [conda] packages: - - cugraph==24.6.* + - cugraph==24.6.*,>=0.0.0a0 - pytorch>=2.0 - pytorch-cuda==11.8 - pyg>=2.5,<2.6 diff --git a/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml b/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml index 28fd77e1017..d79cadb3069 100644 --- a/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml +++ b/python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml @@ -9,7 +9,7 @@ channels: - conda-forge - nvidia dependencies: -- cugraph==24.6.* +- cugraph==24.6.*,>=0.0.0a0 - dgl>=1.1.0.cu* - pandas - pre-commit diff --git a/python/cugraph-dgl/pyproject.toml b/python/cugraph-dgl/pyproject.toml index a908fbe248d..0269c7413f5 100644 --- a/python/cugraph-dgl/pyproject.toml +++ b/python/cugraph-dgl/pyproject.toml @@ -24,7 +24,7 @@ classifiers = [ "Programming Language :: Python", ] dependencies = [ - "cugraph==24.6.*", + "cugraph==24.6.*,>=0.0.0a0", "numba>=0.57", "numpy>=1.23,<2.0a0", "pylibcugraphops==24.6.*,>=0.0.0a0", diff --git a/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml b/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml index ab4a4c6e2e0..d4b0254d9c6 100644 --- a/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml +++ b/python/cugraph-pyg/conda/cugraph_pyg_dev_cuda-118.yaml @@ -9,7 +9,7 @@ channels: - conda-forge - nvidia dependencies: -- cugraph==24.6.* +- cugraph==24.6.*,>=0.0.0a0 - pandas - pre-commit - pyg>=2.5,<2.6 diff --git a/python/cugraph-pyg/pyproject.toml b/python/cugraph-pyg/pyproject.toml index 58acb49cd77..beb3a688dcd 100644 --- a/python/cugraph-pyg/pyproject.toml +++ b/python/cugraph-pyg/pyproject.toml @@ -29,7 +29,7 @@ classifiers = [ "Programming Language :: Python :: 3.11", ] dependencies = [ - "cugraph==24.6.*", + "cugraph==24.6.*,>=0.0.0a0", "numba>=0.57", "numpy>=1.23,<2.0a0", "pylibcugraphops==24.6.*,>=0.0.0a0", diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml index cc2e337fd9c..0a20c5b474d 100644 --- a/python/cugraph-service/server/pyproject.toml +++ b/python/cugraph-service/server/pyproject.toml @@ -21,14 +21,14 @@ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ "cudf==24.6.*,>=0.0.0a0", - "cugraph-service-client==24.6.*", - "cugraph==24.6.*", + "cugraph-service-client==24.6.*,>=0.0.0a0", + "cugraph==24.6.*,>=0.0.0a0", "cupy-cuda11x>=12.0.0", - "dask-cuda==24.6.*", + "dask-cuda==24.6.*,>=0.0.0a0", "dask-cudf==24.6.*,>=0.0.0a0", "numba>=0.57", "numpy>=1.23,<2.0a0", - "rapids-dask-dependency==24.6.*", + "rapids-dask-dependency==24.6.*,>=0.0.0a0", "rmm==24.6.*,>=0.0.0a0", "thriftpy2", "ucx-py==0.38.*", diff --git a/python/cugraph/pyproject.toml b/python/cugraph/pyproject.toml index d3b6845926d..c5d7f63b467 100644 --- a/python/cugraph/pyproject.toml +++ b/python/cugraph/pyproject.toml @@ -27,14 +27,14 @@ requires-python = ">=3.9" dependencies = [ "cudf==24.6.*,>=0.0.0a0", "cupy-cuda11x>=12.0.0", - "dask-cuda==24.6.*", + "dask-cuda==24.6.*,>=0.0.0a0", "dask-cudf==24.6.*,>=0.0.0a0", "fsspec[http]>=0.6.0", "numba>=0.57", "numpy>=1.23,<2.0a0", "pylibcugraph==24.6.*,>=0.0.0a0", "raft-dask==24.6.*,>=0.0.0a0", - "rapids-dask-dependency==24.6.*", + "rapids-dask-dependency==24.6.*,>=0.0.0a0", "rmm==24.6.*,>=0.0.0a0", "ucx-py==0.38.*", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. From 6de512f48d4f8865adfbf662853cfb612a21668e Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 17 May 2024 17:53:44 -0400 Subject: [PATCH 21/47] Alpha specifier for ucx-py --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-122_arch-x86_64.yaml | 2 +- dependencies.yaml | 2 +- python/cugraph-service/server/pyproject.toml | 2 +- python/cugraph/pyproject.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 0c668a80ada..1504fa9df13 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -71,7 +71,7 @@ dependencies: - sphinx<6 - sphinxcontrib-websupport - ucx-proc=*=gpu -- ucx-py==0.38.* +- ucx-py==0.38.*,>=0.0.0a0 - wget - wheel name: all_cuda-118_arch-x86_64 diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 3ef4403b438..12ce14f5b91 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -76,7 +76,7 @@ dependencies: - sphinx<6 - sphinxcontrib-websupport - ucx-proc=*=gpu -- ucx-py==0.38.* +- ucx-py==0.38.*,>=0.0.0a0 - wget - wheel name: all_cuda-122_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index 4b02b097750..3d10c6156d5 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -462,7 +462,7 @@ dependencies: - &dask_cuda dask-cuda==24.6.*,>=0.0.0a0 - &numba numba>=0.57 - &numpy numpy>=1.23,<2.0a0 - - &ucx_py ucx-py==0.38.* + - &ucx_py ucx-py==0.38.*,>=0.0.0a0 - output_types: conda packages: - aiohttp diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml index 0a20c5b474d..31b144e95f4 100644 --- a/python/cugraph-service/server/pyproject.toml +++ b/python/cugraph-service/server/pyproject.toml @@ -31,7 +31,7 @@ dependencies = [ "rapids-dask-dependency==24.6.*,>=0.0.0a0", "rmm==24.6.*,>=0.0.0a0", "thriftpy2", - "ucx-py==0.38.*", + "ucx-py==0.38.*,>=0.0.0a0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers", diff --git a/python/cugraph/pyproject.toml b/python/cugraph/pyproject.toml index c5d7f63b467..d3c6efafe71 100644 --- a/python/cugraph/pyproject.toml +++ b/python/cugraph/pyproject.toml @@ -36,7 +36,7 @@ dependencies = [ "raft-dask==24.6.*,>=0.0.0a0", "rapids-dask-dependency==24.6.*,>=0.0.0a0", "rmm==24.6.*,>=0.0.0a0", - "ucx-py==0.38.*", + "ucx-py==0.38.*,>=0.0.0a0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers", From 2c7e51af4622d76be4f83a19a92aa901c23508e9 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 17 May 2024 19:06:49 -0400 Subject: [PATCH 22/47] Add -cu suffix to ucx-py --- dependencies.yaml | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 3d10c6156d5..8011eb55443 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -462,7 +462,6 @@ dependencies: - &dask_cuda dask-cuda==24.6.*,>=0.0.0a0 - &numba numba>=0.57 - &numpy numpy>=1.23,<2.0a0 - - &ucx_py ucx-py==0.38.*,>=0.0.0a0 - output_types: conda packages: - aiohttp @@ -470,11 +469,26 @@ dependencies: - requests - nccl>=2.9.9 - ucx-proc=*=gpu + - &ucx_py ucx-py==0.38.*,>=0.0.0a0 - output_types: pyproject packages: # cudf uses fsspec but is protocol independent. cugraph # dataset APIs require [http] extras for use with cudf. - fsspec[http]>=0.6.0 + specific: + - output_types: pyproject + matrices: + - matrix: + cuda: "11.*" + packages: + - &ucx_py_cu11 ucx-py-cu11==0.38.*,>=0.0.0a0 + - matrix: + cuda: "12.*" + packages: + - &ucx_py_cu12 ucx-py-cu12==0.38.*,>=0.0.0a0 + - matrix: + packages: + - *ucx_py python_run_nx_cugraph: common: - output_types: [conda, pyproject] @@ -513,11 +527,27 @@ dependencies: - *numba - *numpy - *thrift - - *ucx_py - output_types: pyproject packages: - *cugraph - cugraph-service-client==24.6.*,>=0.0.0a0 + - output_types: conda + packages: + - *ucx_py + specific: + - output_types: pyproject + matrices: + - matrix: + cuda: "11.*" + packages: + - *ucx_py_cu11 + - matrix: + cuda: "12.*" + packages: + - *ucx_py_cu12 + - matrix: + packages: + - *ucx_py test_cpp: common: - output_types: conda From 0e8ccc709afc5d69994e032363c927b23cb5a6fe Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Mon, 20 May 2024 08:55:19 -0400 Subject: [PATCH 23/47] Fix dependency on cugrpah --- dependencies.yaml | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 8011eb55443..516060df901 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -501,18 +501,40 @@ dependencies: packages: - *numba - *numpy + specific: - output_types: [pyproject] - packages: - - &cugraph cugraph==24.6.*,>=0.0.0a0 + matrices: + - matrix: + cuda: "12.x" + packages: + - cugraph-cu12==24.6.*,>=0.0.0a0 + - matrix: + cuda: "11.x" + packages: + - cugraph-cu11==24.6.*,>=0.0.0a0 + - matrix: + packages: + - &cugraph cugraph==24.6.*,>=0.0.0a0 python_run_cugraph_pyg: common: - output_types: [conda, pyproject] packages: - *numba - *numpy + specific: - output_types: [pyproject] - packages: - - *cugraph + matrices: + - matrix: + cuda: "12.x" + packages: + - cugraph-cu12==24.6.*,>=0.0.0a0 + - matrix: + cuda: "11.x" + packages: + - cugraph-cu11==24.6.*,>=0.0.0a0 + - matrix: + packages: + - *cugraph python_run_cugraph_service_client: common: - output_types: [conda, pyproject] From 102d17655a8a0bedfb27352b70dab79bed761788 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Mon, 20 May 2024 11:24:08 -0400 Subject: [PATCH 24/47] Fix dependencies --- dependencies.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 516060df901..2143d71a3d8 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -505,13 +505,13 @@ dependencies: - output_types: [pyproject] matrices: - matrix: - cuda: "12.x" + cuda: "11.*" packages: - - cugraph-cu12==24.6.*,>=0.0.0a0 + - &cugraph_cu11 cugraph-cu11==24.6.*,>=0.0.0a0 - matrix: - cuda: "11.x" + cuda: "12.*" packages: - - cugraph-cu11==24.6.*,>=0.0.0a0 + - &cugraph_cu12 cugraph-cu12==24.6.*,>=0.0.0a0 - matrix: packages: - &cugraph cugraph==24.6.*,>=0.0.0a0 @@ -525,13 +525,13 @@ dependencies: - output_types: [pyproject] matrices: - matrix: - cuda: "12.x" + cuda: "11.*" packages: - - cugraph-cu12==24.6.*,>=0.0.0a0 + - *cugraph_cu11 - matrix: - cuda: "11.x" + cuda: "12.*" packages: - - cugraph-cu11==24.6.*,>=0.0.0a0 + - *cugraph_cu12 - matrix: packages: - *cugraph From db06c005e99841fd31d711b701e7c5dad9b43fd2 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 21 May 2024 10:16:54 -0400 Subject: [PATCH 25/47] Add alpha specs to update-version.sh --- ci/release/update-version.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 9a7324fb330..4efb41755ff 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -74,19 +74,19 @@ DEPENDENCIES=( ) for DEP in "${DEPENDENCIES[@]}"; do for FILE in dependencies.yaml conda/environments/*.yaml python/cugraph-{pyg,dgl}/conda/*.yaml; do - sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g" "${FILE}" - sed_runner "/-.* ucx-py==/ s/==.*/==${NEXT_UCX_PY_VERSION}.*/g" "${FILE}" + sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0/g" "${FILE}" + sed_runner "/-.* ucx-py==/ s/==.*/==${NEXT_UCX_PY_VERSION}.*,>=0.0.0a0/g" "${FILE}" done for FILE in python/**/pyproject.toml python/**/**/pyproject.toml; do - sed_runner "/\"${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*\"/==${NEXT_SHORT_TAG_PEP440}.*\"/g" "${FILE}" - sed_runner "/\"ucx-py==/ s/==.*\"/==${NEXT_UCX_PY_VERSION}.*\"/g" "${FILE}" + sed_runner "/\"${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*\"/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0\"/g" "${FILE}" + sed_runner "/\"ucx-py==/ s/==.*\"/==${NEXT_UCX_PY_VERSION}.*,>=0.0.0a0\"/g" "${FILE}" done done # ucx-py version -sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*\"/}" conda/recipes/cugraph/conda_build_config.yaml -sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*\"/}" conda/recipes/cugraph-service/conda_build_config.yaml -sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*\"/}" conda/recipes/pylibcugraph/conda_build_config.yaml +sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*,>=0.0.0a0\"/}" conda/recipes/cugraph/conda_build_config.yaml +sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*,>=0.0.0a0\"/}" conda/recipes/cugraph-service/conda_build_config.yaml +sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*,>=0.0.0a0\"/}" conda/recipes/pylibcugraph/conda_build_config.yaml # CI files for FILE in .github/workflows/*.yaml; do From 1c3d3ef84215840ffc6b21bb176a479615485726 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Wed, 22 May 2024 17:16:49 -0400 Subject: [PATCH 26/47] disable-cuda --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index ff625c55140..251fe2867d8 100755 --- a/build.sh +++ b/build.sh @@ -319,7 +319,7 @@ if buildDefault || hasArg pylibcugraph || hasArg all; then cleanPythonDir ${REPODIR}/python/pylibcugraph else SKBUILD_CMAKE_ARGS="${SKBUILD_EXTRA_CMAKE_ARGS};-DUSE_CUGRAPH_OPS=${BUILD_WITH_CUGRAPHOPS}" \ - python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/pylibcugraph + python ${PYTHON_ARGS_FOR_INSTALL} --config-setting disable-cuda=true ${REPODIR}/python/pylibcugraph fi fi @@ -329,7 +329,7 @@ if buildDefault || hasArg cugraph || hasArg all; then cleanPythonDir ${REPODIR}/python/cugraph else SKBUILD_CMAKE_ARGS="${SKBUILD_EXTRA_CMAKE_ARGS};-DUSE_CUGRAPH_OPS=${BUILD_WITH_CUGRAPHOPS}" \ - python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/cugraph + python ${PYTHON_ARGS_FOR_INSTALL} --config-setting disable-cuda=true ${REPODIR}/python/cugraph fi fi From c3bbf0ad4cceed11ccdb6711b378c0249b4124c9 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Thu, 23 May 2024 13:27:10 -0400 Subject: [PATCH 27/47] Update to RBB version 0.3.0 --- build.sh | 16 ++++++++-------- 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-equivariant/meta.yaml | 2 +- conda/recipes/cugraph-pyg/meta.yaml | 2 +- .../install_cugraph-service-client.sh | 2 +- .../install_cugraph-service-server.sh | 2 +- conda/recipes/cugraph-service/meta.yaml | 4 ++-- conda/recipes/cugraph/meta.yaml | 2 +- conda/recipes/libcugraph/meta.yaml | 2 +- conda/recipes/nx-cugraph/meta.yaml | 2 +- conda/recipes/pylibcugraph/meta.yaml | 2 +- dependencies.yaml | 2 +- python/cugraph-dgl/pyproject.toml | 2 +- python/cugraph-equivariant/pyproject.toml | 2 +- python/cugraph-pyg/pyproject.toml | 2 +- python/cugraph-service/client/pyproject.toml | 2 +- python/cugraph-service/server/pyproject.toml | 2 +- python/cugraph/pyproject.toml | 2 +- python/nx-cugraph/pyproject.toml | 2 +- python/pylibcugraph/pyproject.toml | 2 +- 22 files changed, 30 insertions(+), 30 deletions(-) diff --git a/build.sh b/build.sh index 251fe2867d8..f0b1fd27b11 100755 --- a/build.sh +++ b/build.sh @@ -319,7 +319,7 @@ if buildDefault || hasArg pylibcugraph || hasArg all; then cleanPythonDir ${REPODIR}/python/pylibcugraph else SKBUILD_CMAKE_ARGS="${SKBUILD_EXTRA_CMAKE_ARGS};-DUSE_CUGRAPH_OPS=${BUILD_WITH_CUGRAPHOPS}" \ - python ${PYTHON_ARGS_FOR_INSTALL} --config-setting disable-cuda=true ${REPODIR}/python/pylibcugraph + python ${PYTHON_ARGS_FOR_INSTALL} --config-setting rapidsai.disable-cuda=true ${REPODIR}/python/pylibcugraph fi fi @@ -329,7 +329,7 @@ if buildDefault || hasArg cugraph || hasArg all; then cleanPythonDir ${REPODIR}/python/cugraph else SKBUILD_CMAKE_ARGS="${SKBUILD_EXTRA_CMAKE_ARGS};-DUSE_CUGRAPH_OPS=${BUILD_WITH_CUGRAPHOPS}" \ - python ${PYTHON_ARGS_FOR_INSTALL} --config-setting disable-cuda=true ${REPODIR}/python/cugraph + python ${PYTHON_ARGS_FOR_INSTALL} --config-setting rapidsai.disable-cuda=true ${REPODIR}/python/cugraph fi fi @@ -338,8 +338,8 @@ if hasArg cugraph-service || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-service else - python ${PYTHON_ARGS_FOR_INSTALL} --config-setting disable-cuda=true ${REPODIR}/python/cugraph-service/client - python ${PYTHON_ARGS_FOR_INSTALL} --config-setting disable-cuda=true ${REPODIR}/python/cugraph-service/server + python ${PYTHON_ARGS_FOR_INSTALL} --config-setting rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-service/client + python ${PYTHON_ARGS_FOR_INSTALL} --config-setting rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-service/server fi fi @@ -348,7 +348,7 @@ if hasArg cugraph-pyg || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-pyg else - python ${PYTHON_ARGS_FOR_INSTALL} --config-setting disable-cuda=true ${REPODIR}/python/cugraph-pyg + python ${PYTHON_ARGS_FOR_INSTALL} --config-setting rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-pyg fi fi @@ -357,7 +357,7 @@ if hasArg cugraph-dgl || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-dgl else - python ${PYTHON_ARGS_FOR_INSTALL} --config-setting disable-cuda=true ${REPODIR}/python/cugraph-dgl + python ${PYTHON_ARGS_FOR_INSTALL} --config-setting rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-dgl fi fi @@ -366,7 +366,7 @@ if hasArg cugraph-equivariant || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-equivariant else - python ${PYTHON_ARGS_FOR_INSTALL} --config-setting disable-cuda=true ${REPODIR}/python/cugraph-equivariant + python ${PYTHON_ARGS_FOR_INSTALL} --config-setting rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-equivariant fi fi @@ -375,7 +375,7 @@ if hasArg nx-cugraph || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/nx-cugraph else - python ${PYTHON_ARGS_FOR_INSTALL} --config-setting disable-cuda=true ${REPODIR}/python/nx-cugraph + python ${PYTHON_ARGS_FOR_INSTALL} --config-setting rapidsai.disable-cuda=true ${REPODIR}/python/nx-cugraph fi fi diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 8eb2545280b..7f0e6d29bb7 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -57,7 +57,7 @@ dependencies: - pytest-xdist - python-louvain - raft-dask==24.8.*,>=0.0.0a0 -- rapids-build-backend>=0.2.0,<0.3.0.dev0 +- rapids-build-backend>=0.3.0,<0.4.0.dev0 - rapids-dask-dependency==24.8.*,>=0.0.0a0 - recommonmark - requests diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 4ba7b2e0268..78ccba0c3ec 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -62,7 +62,7 @@ dependencies: - pytest-xdist - python-louvain - raft-dask==24.8.*,>=0.0.0a0 -- rapids-build-backend>=0.2.0,<0.3.0.dev0 +- rapids-build-backend>=0.3.0,<0.4.0.dev0 - rapids-dask-dependency==24.8.*,>=0.0.0a0 - recommonmark - requests diff --git a/conda/recipes/cugraph-dgl/meta.yaml b/conda/recipes/cugraph-dgl/meta.yaml index 85981643f9a..507efe1f77a 100644 --- a/conda/recipes/cugraph-dgl/meta.yaml +++ b/conda/recipes/cugraph-dgl/meta.yaml @@ -21,7 +21,7 @@ build: requirements: host: - python - - rapids-build-backend>=0.2.0,<0.3.0.dev0 + - rapids-build-backend>=0.3.0,<0.4.0.dev0 run: - cugraph ={{ version }} - dgl >=1.1.0.cu* diff --git a/conda/recipes/cugraph-equivariant/meta.yaml b/conda/recipes/cugraph-equivariant/meta.yaml index e59e10c608c..9f7fec49747 100644 --- a/conda/recipes/cugraph-equivariant/meta.yaml +++ b/conda/recipes/cugraph-equivariant/meta.yaml @@ -21,7 +21,7 @@ build: requirements: host: - python - - rapids-build-backend>=0.2.0,<0.3.0.dev0 + - rapids-build-backend>=0.3.0,<0.4.0.dev0 run: - pylibcugraphops ={{ minor_version }} - python diff --git a/conda/recipes/cugraph-pyg/meta.yaml b/conda/recipes/cugraph-pyg/meta.yaml index 5a4c8534dce..e71a5d50c19 100644 --- a/conda/recipes/cugraph-pyg/meta.yaml +++ b/conda/recipes/cugraph-pyg/meta.yaml @@ -25,7 +25,7 @@ requirements: - cython >=3.0.0 - python - scikit-build-core >=0.7.0 - - rapids-build-backend>=0.2.0,<0.3.0.dev0 + - rapids-build-backend>=0.3.0,<0.4.0.dev0 run: - rapids-dask-dependency ={{ minor_version }} - numba >=0.57 diff --git a/conda/recipes/cugraph-service/install_cugraph-service-client.sh b/conda/recipes/cugraph-service/install_cugraph-service-client.sh index 02c514b9cd4..2b5f694209a 100644 --- a/conda/recipes/cugraph-service/install_cugraph-service-client.sh +++ b/conda/recipes/cugraph-service/install_cugraph-service-client.sh @@ -13,6 +13,6 @@ cd "${SRC_DIR}/python/cugraph-service/client" mkdir -p pip_cache -$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache --config-setting disable-cuda=true . -vv +$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache --config-setting rapidsai.disable-cuda=true . -vv #./build.sh cugraph-service diff --git a/conda/recipes/cugraph-service/install_cugraph-service-server.sh b/conda/recipes/cugraph-service/install_cugraph-service-server.sh index 2561919851f..ca658e3647f 100644 --- a/conda/recipes/cugraph-service/install_cugraph-service-server.sh +++ b/conda/recipes/cugraph-service/install_cugraph-service-server.sh @@ -13,6 +13,6 @@ cd "${SRC_DIR}/python/cugraph-service/server" mkdir -p pip_cache -$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache --config-setting disable-cuda=true . -vv +$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache --config-setting rapidsai.disable-cuda=true . -vv #./build.sh cugraph-service diff --git a/conda/recipes/cugraph-service/meta.yaml b/conda/recipes/cugraph-service/meta.yaml index fb039eaa6cd..f1bd982b279 100644 --- a/conda/recipes/cugraph-service/meta.yaml +++ b/conda/recipes/cugraph-service/meta.yaml @@ -29,7 +29,7 @@ outputs: host: - pip - python - - rapids-build-backend>=0.2.0,<0.3.0.dev0 + - rapids-build-backend>=0.3.0,<0.4.0.dev0 run: - python - thriftpy2 >=0.4.15 @@ -53,7 +53,7 @@ outputs: - python - setuptools - wheel - - rapids-build-backend>=0.2.0,<0.3.0.dev0 + - rapids-build-backend>=0.3.0,<0.4.0.dev0 run: - {{ pin_subpackage('cugraph-service-client', exact=True) }} - cudf ={{ minor_version }} diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml index dfaeaa0c487..c2dca3abbd7 100644 --- a/conda/recipes/cugraph/meta.yaml +++ b/conda/recipes/cugraph/meta.yaml @@ -70,7 +70,7 @@ requirements: - rmm ={{ minor_version }} - scikit-build-core >=0.7.0 - setuptools - - rapids-build-backend>=0.2.0,<0.3.0.dev0 + - rapids-build-backend>=0.3.0,<0.4.0.dev0 run: - aiohttp - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml index 94574c0a9bc..222a94844dc 100644 --- a/conda/recipes/libcugraph/meta.yaml +++ b/conda/recipes/libcugraph/meta.yaml @@ -75,7 +75,7 @@ requirements: - librmm ={{ minor_version }} - nccl {{ nccl_version }} - ucx-proc=*=gpu - - rapids-build-backend>=0.2.0,<0.3.0.dev0 + - rapids-build-backend>=0.3.0,<0.4.0.dev0 outputs: - name: libcugraph diff --git a/conda/recipes/nx-cugraph/meta.yaml b/conda/recipes/nx-cugraph/meta.yaml index 7db752a11af..6f406b10be4 100644 --- a/conda/recipes/nx-cugraph/meta.yaml +++ b/conda/recipes/nx-cugraph/meta.yaml @@ -21,7 +21,7 @@ build: requirements: host: - python - - rapids-build-backend>=0.2.0,<0.3.0.dev0 + - rapids-build-backend>=0.3.0,<0.4.0.dev0 run: - pylibcugraph ={{ version }} - networkx >=3.0 diff --git a/conda/recipes/pylibcugraph/meta.yaml b/conda/recipes/pylibcugraph/meta.yaml index 38b75d6cb55..e439c9eec5b 100644 --- a/conda/recipes/pylibcugraph/meta.yaml +++ b/conda/recipes/pylibcugraph/meta.yaml @@ -67,7 +67,7 @@ requirements: - python - scikit-build-core >=0.7.0 - setuptools - - rapids-build-backend>=0.2.0,<0.3.0.dev0 + - rapids-build-backend>=0.3.0,<0.4.0.dev0 run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} diff --git a/dependencies.yaml b/dependencies.yaml index 64ed5962644..8eb1399866c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -440,7 +440,7 @@ dependencies: common: - output_types: [conda, pyproject, requirements] packages: - - rapids-build-backend>=0.2.0,<0.3.0.dev0 + - rapids-build-backend>=0.3.0,<0.4.0.dev0 - setuptools>=61.0.0 - wheel python_build_cythonize: diff --git a/python/cugraph-dgl/pyproject.toml b/python/cugraph-dgl/pyproject.toml index a3b853083bb..28ff66711a4 100644 --- a/python/cugraph-dgl/pyproject.toml +++ b/python/cugraph-dgl/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.2.0,<0.3.0.dev0", + "rapids-build-backend>=0.3.0,<0.4.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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-equivariant/pyproject.toml b/python/cugraph-equivariant/pyproject.toml index f8cb978d1dd..7c468867f6b 100644 --- a/python/cugraph-equivariant/pyproject.toml +++ b/python/cugraph-equivariant/pyproject.toml @@ -13,7 +13,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.2.0,<0.3.0.dev0", + "rapids-build-backend>=0.3.0,<0.4.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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 395dc00ead4..8ec60b4b770 100644 --- a/python/cugraph-pyg/pyproject.toml +++ b/python/cugraph-pyg/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.2.0,<0.3.0.dev0", + "rapids-build-backend>=0.3.0,<0.4.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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/client/pyproject.toml b/python/cugraph-service/client/pyproject.toml index c0feb08278c..96ad8103379 100644 --- a/python/cugraph-service/client/pyproject.toml +++ b/python/cugraph-service/client/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.2.0,<0.3.0.dev0", + "rapids-build-backend>=0.3.0,<0.4.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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 dddf1c9e9c1..b9d68ddeceb 100644 --- a/python/cugraph-service/server/pyproject.toml +++ b/python/cugraph-service/server/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.2.0,<0.3.0.dev0", + "rapids-build-backend>=0.3.0,<0.4.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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/pyproject.toml b/python/cugraph/pyproject.toml index e61425a5148..bdd4f3c9f1e 100644 --- a/python/cugraph/pyproject.toml +++ b/python/cugraph/pyproject.toml @@ -4,7 +4,7 @@ requires = [ "cython>=3.0.0", - "rapids-build-backend>=0.2.0,<0.3.0.dev0", + "rapids-build-backend>=0.3.0,<0.4.0.dev0", "scikit-build-core[pyproject]>=0.7.0", "setuptools>=61.0.0", "wheel", diff --git a/python/nx-cugraph/pyproject.toml b/python/nx-cugraph/pyproject.toml index be814410083..85f2a6cd82c 100644 --- a/python/nx-cugraph/pyproject.toml +++ b/python/nx-cugraph/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.2.0,<0.3.0.dev0", + "rapids-build-backend>=0.3.0,<0.4.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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 1dd8125ac85..15957a4894e 100644 --- a/python/pylibcugraph/pyproject.toml +++ b/python/pylibcugraph/pyproject.toml @@ -4,7 +4,7 @@ requires = [ "cython>=3.0.0", - "rapids-build-backend>=0.2.0,<0.3.0.dev0", + "rapids-build-backend>=0.3.0,<0.4.0.dev0", "scikit-build-core[pyproject]>=0.7.0", "setuptools>=61.0.0", "wheel", From 43f9a2f9bb4879be4a88045b415a987e47bd2ff6 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Thu, 23 May 2024 15:33:05 -0400 Subject: [PATCH 28/47] Pipe rapids-generate-version directly to VERSION --- ci/build_wheel.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 1ef3d8920c7..7e1ed66f2b9 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -10,12 +10,9 @@ underscore_package_name=$(echo "${package_name}" | tr "-" "_") source rapids-configure-sccache source rapids-date-string -version=$(rapids-generate-version) -git_commit=$(git rev-parse HEAD) - RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" -echo "${version}" > VERSION +rapids-generate-version > VERSION cd "${package_dir}" From ee1c6113775f1b79279002943bd97291e0dff0a5 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Thu, 23 May 2024 15:53:05 -0400 Subject: [PATCH 29/47] Remove git_commit --- ci/build_python.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/build_python.sh b/ci/build_python.sh index 25793a4c47a..69e6d515d0f 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -16,7 +16,6 @@ rapids-print-env CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) version=$(rapids-generate-version) -git_commit=$(git rev-parse HEAD) export RAPIDS_PACKAGE_VERSION=${version} echo "${version}" > VERSION From 8e41322c9e5597172b962aed03356762a8386609 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 24 May 2024 18:03:45 -0400 Subject: [PATCH 30/47] s/--config-setting/--config-settings/ --- build.sh | 16 ++++++++-------- .../install_cugraph-service-client.sh | 2 +- .../install_cugraph-service-server.sh | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.sh b/build.sh index f0b1fd27b11..788cbbf7a8c 100755 --- a/build.sh +++ b/build.sh @@ -319,7 +319,7 @@ if buildDefault || hasArg pylibcugraph || hasArg all; then cleanPythonDir ${REPODIR}/python/pylibcugraph else SKBUILD_CMAKE_ARGS="${SKBUILD_EXTRA_CMAKE_ARGS};-DUSE_CUGRAPH_OPS=${BUILD_WITH_CUGRAPHOPS}" \ - python ${PYTHON_ARGS_FOR_INSTALL} --config-setting rapidsai.disable-cuda=true ${REPODIR}/python/pylibcugraph + python ${PYTHON_ARGS_FOR_INSTALL} --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/pylibcugraph fi fi @@ -329,7 +329,7 @@ if buildDefault || hasArg cugraph || hasArg all; then cleanPythonDir ${REPODIR}/python/cugraph else SKBUILD_CMAKE_ARGS="${SKBUILD_EXTRA_CMAKE_ARGS};-DUSE_CUGRAPH_OPS=${BUILD_WITH_CUGRAPHOPS}" \ - python ${PYTHON_ARGS_FOR_INSTALL} --config-setting rapidsai.disable-cuda=true ${REPODIR}/python/cugraph + python ${PYTHON_ARGS_FOR_INSTALL} --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/cugraph fi fi @@ -338,8 +338,8 @@ if hasArg cugraph-service || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-service else - python ${PYTHON_ARGS_FOR_INSTALL} --config-setting rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-service/client - python ${PYTHON_ARGS_FOR_INSTALL} --config-setting rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-service/server + python ${PYTHON_ARGS_FOR_INSTALL} --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-service/client + python ${PYTHON_ARGS_FOR_INSTALL} --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-service/server fi fi @@ -348,7 +348,7 @@ if hasArg cugraph-pyg || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-pyg else - python ${PYTHON_ARGS_FOR_INSTALL} --config-setting rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-pyg + python ${PYTHON_ARGS_FOR_INSTALL} --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-pyg fi fi @@ -357,7 +357,7 @@ if hasArg cugraph-dgl || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-dgl else - python ${PYTHON_ARGS_FOR_INSTALL} --config-setting rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-dgl + python ${PYTHON_ARGS_FOR_INSTALL} --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-dgl fi fi @@ -366,7 +366,7 @@ if hasArg cugraph-equivariant || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-equivariant else - python ${PYTHON_ARGS_FOR_INSTALL} --config-setting rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-equivariant + python ${PYTHON_ARGS_FOR_INSTALL} --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-equivariant fi fi @@ -375,7 +375,7 @@ if hasArg nx-cugraph || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/nx-cugraph else - python ${PYTHON_ARGS_FOR_INSTALL} --config-setting rapidsai.disable-cuda=true ${REPODIR}/python/nx-cugraph + python ${PYTHON_ARGS_FOR_INSTALL} --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/nx-cugraph fi fi diff --git a/conda/recipes/cugraph-service/install_cugraph-service-client.sh b/conda/recipes/cugraph-service/install_cugraph-service-client.sh index 2b5f694209a..c588a6206cc 100644 --- a/conda/recipes/cugraph-service/install_cugraph-service-client.sh +++ b/conda/recipes/cugraph-service/install_cugraph-service-client.sh @@ -13,6 +13,6 @@ cd "${SRC_DIR}/python/cugraph-service/client" mkdir -p pip_cache -$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache --config-setting rapidsai.disable-cuda=true . -vv +$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache --config-settings rapidsai.disable-cuda=true . -vv #./build.sh cugraph-service diff --git a/conda/recipes/cugraph-service/install_cugraph-service-server.sh b/conda/recipes/cugraph-service/install_cugraph-service-server.sh index ca658e3647f..65c544354e8 100644 --- a/conda/recipes/cugraph-service/install_cugraph-service-server.sh +++ b/conda/recipes/cugraph-service/install_cugraph-service-server.sh @@ -13,6 +13,6 @@ cd "${SRC_DIR}/python/cugraph-service/server" mkdir -p pip_cache -$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache --config-setting rapidsai.disable-cuda=true . -vv +$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache --config-settings rapidsai.disable-cuda=true . -vv #./build.sh cugraph-service From 5a7df8f60bc9f2364a01256665d67814292dce6f Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Wed, 29 May 2024 18:19:41 -0400 Subject: [PATCH 31/47] Reorder _version exports --- python/cugraph-dgl/cugraph_dgl/_version.py | 2 +- python/cugraph-equivariant/cugraph_equivariant/_version.py | 2 +- python/cugraph-pyg/cugraph_pyg/_version.py | 2 +- .../cugraph-service/client/cugraph_service_client/_version.py | 2 +- .../cugraph-service/server/cugraph_service_server/_version.py | 2 +- python/cugraph/cugraph/_version.py | 2 +- python/nx-cugraph/_nx_cugraph/_version.py | 2 +- python/pylibcugraph/pylibcugraph/_version.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/python/cugraph-dgl/cugraph_dgl/_version.py b/python/cugraph-dgl/cugraph_dgl/_version.py index a38243dea3d..e8adcc31430 100644 --- a/python/cugraph-dgl/cugraph_dgl/_version.py +++ b/python/cugraph-dgl/cugraph_dgl/_version.py @@ -28,4 +28,4 @@ except FileNotFoundError: __git_commit__ = "" -__all__ = ["__version__", "__git_commit__"] +__all__ = ["__git_commit__", "__version__"] diff --git a/python/cugraph-equivariant/cugraph_equivariant/_version.py b/python/cugraph-equivariant/cugraph_equivariant/_version.py index a38243dea3d..e8adcc31430 100644 --- a/python/cugraph-equivariant/cugraph_equivariant/_version.py +++ b/python/cugraph-equivariant/cugraph_equivariant/_version.py @@ -28,4 +28,4 @@ except FileNotFoundError: __git_commit__ = "" -__all__ = ["__version__", "__git_commit__"] +__all__ = ["__git_commit__", "__version__"] diff --git a/python/cugraph-pyg/cugraph_pyg/_version.py b/python/cugraph-pyg/cugraph_pyg/_version.py index a38243dea3d..e8adcc31430 100644 --- a/python/cugraph-pyg/cugraph_pyg/_version.py +++ b/python/cugraph-pyg/cugraph_pyg/_version.py @@ -28,4 +28,4 @@ except FileNotFoundError: __git_commit__ = "" -__all__ = ["__version__", "__git_commit__"] +__all__ = ["__git_commit__", "__version__"] diff --git a/python/cugraph-service/client/cugraph_service_client/_version.py b/python/cugraph-service/client/cugraph_service_client/_version.py index a38243dea3d..e8adcc31430 100644 --- a/python/cugraph-service/client/cugraph_service_client/_version.py +++ b/python/cugraph-service/client/cugraph_service_client/_version.py @@ -28,4 +28,4 @@ except FileNotFoundError: __git_commit__ = "" -__all__ = ["__version__", "__git_commit__"] +__all__ = ["__git_commit__", "__version__"] diff --git a/python/cugraph-service/server/cugraph_service_server/_version.py b/python/cugraph-service/server/cugraph_service_server/_version.py index a38243dea3d..e8adcc31430 100644 --- a/python/cugraph-service/server/cugraph_service_server/_version.py +++ b/python/cugraph-service/server/cugraph_service_server/_version.py @@ -28,4 +28,4 @@ except FileNotFoundError: __git_commit__ = "" -__all__ = ["__version__", "__git_commit__"] +__all__ = ["__git_commit__", "__version__"] diff --git a/python/cugraph/cugraph/_version.py b/python/cugraph/cugraph/_version.py index a38243dea3d..e8adcc31430 100644 --- a/python/cugraph/cugraph/_version.py +++ b/python/cugraph/cugraph/_version.py @@ -28,4 +28,4 @@ except FileNotFoundError: __git_commit__ = "" -__all__ = ["__version__", "__git_commit__"] +__all__ = ["__git_commit__", "__version__"] diff --git a/python/nx-cugraph/_nx_cugraph/_version.py b/python/nx-cugraph/_nx_cugraph/_version.py index a38243dea3d..e8adcc31430 100644 --- a/python/nx-cugraph/_nx_cugraph/_version.py +++ b/python/nx-cugraph/_nx_cugraph/_version.py @@ -28,4 +28,4 @@ except FileNotFoundError: __git_commit__ = "" -__all__ = ["__version__", "__git_commit__"] +__all__ = ["__git_commit__", "__version__"] diff --git a/python/pylibcugraph/pylibcugraph/_version.py b/python/pylibcugraph/pylibcugraph/_version.py index a38243dea3d..e8adcc31430 100644 --- a/python/pylibcugraph/pylibcugraph/_version.py +++ b/python/pylibcugraph/pylibcugraph/_version.py @@ -28,4 +28,4 @@ except FileNotFoundError: __git_commit__ = "" -__all__ = ["__version__", "__git_commit__"] +__all__ = ["__git_commit__", "__version__"] From 7cca1fc74ca22c0e059097f4ffab6cfa3fd97298 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Wed, 29 May 2024 18:31:07 -0400 Subject: [PATCH 32/47] Add version tests --- python/cugraph-dgl/tests/test_version.py | 12 ++++++++++++ .../cugraph_equivariant/tests/test_version.py | 12 ++++++++++++ .../cugraph-pyg/cugraph_pyg/tests/test_version.py | 12 ++++++++++++ python/cugraph-service/tests/test_version.py | 15 +++++++++++++++ python/cugraph/cugraph/tests/test_version.py | 12 ++++++++++++ .../nx-cugraph/nx_cugraph/tests/test_version.py | 15 +++++++++++++++ .../pylibcugraph/tests/test_version.py | 12 ++++++++++++ 7 files changed, 90 insertions(+) create mode 100644 python/cugraph-dgl/tests/test_version.py create mode 100644 python/cugraph-equivariant/cugraph_equivariant/tests/test_version.py create mode 100644 python/cugraph-pyg/cugraph_pyg/tests/test_version.py create mode 100644 python/cugraph-service/tests/test_version.py create mode 100644 python/cugraph/cugraph/tests/test_version.py create mode 100644 python/nx-cugraph/nx_cugraph/tests/test_version.py create mode 100644 python/pylibcugraph/pylibcugraph/tests/test_version.py diff --git a/python/cugraph-dgl/tests/test_version.py b/python/cugraph-dgl/tests/test_version.py new file mode 100644 index 00000000000..343e4fb2675 --- /dev/null +++ b/python/cugraph-dgl/tests/test_version.py @@ -0,0 +1,12 @@ +# Copyright (c) 2024, NVIDIA CORPORATION. + +import cugraph_dgl + + +def test_version_constants_are_populated(): + # __git_commit__ will only be non-empty in a built distribution + assert isinstance(cugraph_dgl.__git_commit__, str) + + # __version__ should always be non-empty + assert isinstance(cugraph_dgl.__version__, str) + assert len(cugraph_dgl.__version__) > 0 diff --git a/python/cugraph-equivariant/cugraph_equivariant/tests/test_version.py b/python/cugraph-equivariant/cugraph_equivariant/tests/test_version.py new file mode 100644 index 00000000000..e8b484fe16c --- /dev/null +++ b/python/cugraph-equivariant/cugraph_equivariant/tests/test_version.py @@ -0,0 +1,12 @@ +# Copyright (c) 2024, NVIDIA CORPORATION. + +import cugraph_equivariant + + +def test_version_constants_are_populated(): + # __git_commit__ will only be non-empty in a built distribution + assert isinstance(cugraph_equivariant.__git_commit__, str) + + # __version__ should always be non-empty + assert isinstance(cugraph_equivariant.__version__, str) + assert len(cugraph_equivariant.__version__) > 0 diff --git a/python/cugraph-pyg/cugraph_pyg/tests/test_version.py b/python/cugraph-pyg/cugraph_pyg/tests/test_version.py new file mode 100644 index 00000000000..4ea0f9875f5 --- /dev/null +++ b/python/cugraph-pyg/cugraph_pyg/tests/test_version.py @@ -0,0 +1,12 @@ +# Copyright (c) 2024, NVIDIA CORPORATION. + +import cugraph_pyg + + +def test_version_constants_are_populated(): + # __git_commit__ will only be non-empty in a built distribution + assert isinstance(cugraph_pyg.__git_commit__, str) + + # __version__ should always be non-empty + assert isinstance(cugraph_pyg.__version__, str) + assert len(cugraph_pyg.__version__) > 0 diff --git a/python/cugraph-service/tests/test_version.py b/python/cugraph-service/tests/test_version.py new file mode 100644 index 00000000000..24a78317bfc --- /dev/null +++ b/python/cugraph-service/tests/test_version.py @@ -0,0 +1,15 @@ +# Copyright (c) 2024, NVIDIA CORPORATION. + +import cugraph_service_client +import cugraph_service_server +import pytest + + +@pytest.mark.parametrize("mod", [cugraph_service_client, cugraph_service_server]) +def test_version_constants_are_populated(mod): + # __git_commit__ will only be non-empty in a built distribution + assert isinstance(mod.__git_commit__, str) + + # __version__ should always be non-empty + assert isinstance(mod.__version__, str) + assert len(mod.__version__) > 0 diff --git a/python/cugraph/cugraph/tests/test_version.py b/python/cugraph/cugraph/tests/test_version.py new file mode 100644 index 00000000000..a90f178784c --- /dev/null +++ b/python/cugraph/cugraph/tests/test_version.py @@ -0,0 +1,12 @@ +# Copyright (c) 2024, NVIDIA CORPORATION. + +import cugraph + + +def test_version_constants_are_populated(): + # __git_commit__ will only be non-empty in a built distribution + assert isinstance(cugraph.__git_commit__, str) + + # __version__ should always be non-empty + assert isinstance(cugraph.__version__, str) + assert len(cugraph.__version__) > 0 diff --git a/python/nx-cugraph/nx_cugraph/tests/test_version.py b/python/nx-cugraph/nx_cugraph/tests/test_version.py new file mode 100644 index 00000000000..e15ae0aa2f8 --- /dev/null +++ b/python/nx-cugraph/nx_cugraph/tests/test_version.py @@ -0,0 +1,15 @@ +# Copyright (c) 2024, NVIDIA CORPORATION. + +import nx_cugraph +import _nx_cugraph +import pytest + + +@pytest.mark.parametrize("mod", [nx_cugraph, _nx_cugraph]) +def test_version_constants_are_populated(mod): + # __git_commit__ will only be non-empty in a built distribution + assert isinstance(mod.__git_commit__, str) + + # __version__ should always be non-empty + assert isinstance(mod.__version__, str) + assert len(mod.__version__) > 0 diff --git a/python/pylibcugraph/pylibcugraph/tests/test_version.py b/python/pylibcugraph/pylibcugraph/tests/test_version.py new file mode 100644 index 00000000000..aac8eb9ec9e --- /dev/null +++ b/python/pylibcugraph/pylibcugraph/tests/test_version.py @@ -0,0 +1,12 @@ +# Copyright (c) 2024, NVIDIA CORPORATION. + +import pylibcugraph + + +def test_version_constants_are_populated(): + # __git_commit__ will only be non-empty in a built distribution + assert isinstance(pylibcugraph.__git_commit__, str) + + # __version__ should always be non-empty + assert isinstance(pylibcugraph.__version__, str) + assert len(pylibcugraph.__version__) > 0 From 5e2dcc3a9603520efa4a0649017c492f5a6730bb Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Thu, 30 May 2024 10:20:13 -0400 Subject: [PATCH 33/47] Only nx_cugraph has version attributes --- python/nx-cugraph/nx_cugraph/tests/test_version.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/python/nx-cugraph/nx_cugraph/tests/test_version.py b/python/nx-cugraph/nx_cugraph/tests/test_version.py index e15ae0aa2f8..c45702b6001 100644 --- a/python/nx-cugraph/nx_cugraph/tests/test_version.py +++ b/python/nx-cugraph/nx_cugraph/tests/test_version.py @@ -1,15 +1,12 @@ # Copyright (c) 2024, NVIDIA CORPORATION. import nx_cugraph -import _nx_cugraph -import pytest -@pytest.mark.parametrize("mod", [nx_cugraph, _nx_cugraph]) -def test_version_constants_are_populated(mod): +def test_version_constants_are_populated(): # __git_commit__ will only be non-empty in a built distribution - assert isinstance(mod.__git_commit__, str) + assert isinstance(nx_cugraph.__git_commit__, str) # __version__ should always be non-empty - assert isinstance(mod.__version__, str) - assert len(mod.__version__) > 0 + assert isinstance(nx_cugraph.__version__, str) + assert len(nx_cugraph.__version__) > 0 From 0061608c1b8ca6a8a9a8f3182d055b4960b65b1f Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Thu, 30 May 2024 10:29:46 -0400 Subject: [PATCH 34/47] Update DFG hook --- .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 8e73b2e729f..9a7efd480d8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -42,7 +42,7 @@ repos: types_or: [c, c++, cuda] args: ["-fallback-style=none", "-style=file", "-i"] - repo: https://github.com/rapidsai/dependency-file-generator - rev: v1.13.4 + rev: v1.13.11 hooks: - id: rapids-dependency-file-generator args: ["--clean"] From c783ebec5f34d4c0196ca79e83f0b9b7ccda49e4 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 4 Jun 2024 08:43:48 -0700 Subject: [PATCH 35/47] more alpha specs, rapids-dependency-file-generator --file-key --- ci/build_cpp.sh | 4 +--- ci/build_docs.sh | 2 +- ci/build_python.sh | 5 ++--- ci/build_wheel.sh | 1 - ci/check_style.sh | 2 +- ci/test_cpp.sh | 2 +- ci/test_notebooks.sh | 2 +- ci/test_python.sh | 2 +- dependencies.yaml | 8 ++++---- python/cugraph-dgl/pyproject.toml | 3 +-- python/cugraph-equivariant/pyproject.toml | 1 - python/cugraph-pyg/pyproject.toml | 3 +-- python/cugraph-service/server/pyproject.toml | 1 - python/cugraph/pyproject.toml | 2 +- 14 files changed, 15 insertions(+), 23 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 132231e4a64..859977d76d5 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -13,10 +13,8 @@ export CMAKE_GENERATOR=Ninja rapids-print-env -version=$(rapids-generate-version) - rapids-logger "Begin cpp build" -RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/libcugraph +RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild conda/recipes/libcugraph rapids-upload-conda-to-s3 cpp diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 089558bd452..661f82ca883 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -8,7 +8,7 @@ rapids-logger "Create test conda environment" rapids-dependency-file-generator \ --output conda \ - --file_key docs \ + --file-key docs \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml rapids-mamba-retry env create --yes -f env.yaml -n docs diff --git a/ci/build_python.sh b/ci/build_python.sh index 69e6d515d0f..1ebc38b058b 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -15,9 +15,8 @@ rapids-print-env CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) -version=$(rapids-generate-version) -export RAPIDS_PACKAGE_VERSION=${version} -echo "${version}" > VERSION +rapids-generate-version > ./VERSION +export RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-logger "Begin py build" diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 7c180416bcf..c4471f69798 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -5,7 +5,6 @@ set -euo pipefail package_name=$1 package_dir=$2 -underscore_package_name=$(echo "${package_name}" | tr "-" "_") source rapids-configure-sccache source rapids-date-string diff --git a/ci/check_style.sh b/ci/check_style.sh index af4ccb2baba..b81b36ddb45 100755 --- a/ci/check_style.sh +++ b/ci/check_style.sh @@ -8,7 +8,7 @@ rapids-logger "Create checks conda environment" rapids-dependency-file-generator \ --output conda \ - --file_key checks \ + --file-key checks \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml rapids-mamba-retry env create --yes -f env.yaml -n checks diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index ce7425d67bf..a5f7feed39d 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -11,7 +11,7 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ rapids-logger "Generate C++ testing dependencies" rapids-dependency-file-generator \ --output conda \ - --file_key test_cpp \ + --file-key test_cpp \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee env.yaml rapids-mamba-retry env create --yes -f env.yaml -n test diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh index 29e65e5f4c1..31ec56074f0 100755 --- a/ci/test_notebooks.sh +++ b/ci/test_notebooks.sh @@ -8,7 +8,7 @@ set -Eeuo pipefail rapids-logger "Generate notebook testing dependencies" rapids-dependency-file-generator \ --output conda \ - --file_key test_notebooks \ + --file-key test_notebooks \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml rapids-mamba-retry env create --yes -f env.yaml -n test diff --git a/ci/test_python.sh b/ci/test_python.sh index fdcf88d692a..c63cf1d6d75 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -11,7 +11,7 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../ rapids-logger "Generate Python testing dependencies" rapids-dependency-file-generator \ --output conda \ - --file_key test_python \ + --file-key test_python \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml rapids-mamba-retry env create --yes -f env.yaml -n test diff --git a/dependencies.yaml b/dependencies.yaml index 2f34652c0ba..6e272bc048c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -620,7 +620,7 @@ dependencies: - scikit-learn>=0.23.1 - output_types: [conda] packages: - - pylibwholegraph==24.8.*,>=0.0.0a0 + - &pylibwholegraph_conda pylibwholegraph==24.8.*,>=0.0.0a0 test_python_pylibcugraph: common: - output_types: [conda, pyproject] @@ -655,7 +655,7 @@ dependencies: common: - output_types: conda packages: - - &pylibwholegraph_conda pylibwholegraph==24.8.* + - *pylibwholegraph_conda - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -666,10 +666,10 @@ dependencies: matrices: - matrix: {cuda: "12.*"} packages: - - pylibwholegraph-cu12==24.8.* + - pylibwholegraph-cu12==24.8.*,>=0.0.0a0 - matrix: {cuda: "11.*"} packages: - - pylibwholegraph-cu11==24.8.* + - pylibwholegraph-cu11==24.8.*,>=0.0.0a0 - {matrix: null, packages: [*pylibwholegraph_conda]} depends_on_rmm: diff --git a/python/cugraph-dgl/pyproject.toml b/python/cugraph-dgl/pyproject.toml index 26efc679ed2..3bf54dcc0e8 100644 --- a/python/cugraph-dgl/pyproject.toml +++ b/python/cugraph-dgl/pyproject.toml @@ -33,7 +33,7 @@ dependencies = [ [project.optional-dependencies] test = [ "pandas", - "pylibwholegraph==24.8.*", + "pylibwholegraph==24.8.*,>=0.0.0a0", "pytest", "pytest-benchmark", "pytest-cov", @@ -58,5 +58,4 @@ include = [ [tool.rapids-build-backend] build-backend = "setuptools.build_meta" -requires = [] dependencies-file = "../../dependencies.yaml" diff --git a/python/cugraph-equivariant/pyproject.toml b/python/cugraph-equivariant/pyproject.toml index 7c468867f6b..f7866d199da 100644 --- a/python/cugraph-equivariant/pyproject.toml +++ b/python/cugraph-equivariant/pyproject.toml @@ -68,5 +68,4 @@ include = [ [tool.rapids-build-backend] build-backend = "setuptools.build_meta" -requires = [] dependencies-file = "../../dependencies.yaml" diff --git a/python/cugraph-pyg/pyproject.toml b/python/cugraph-pyg/pyproject.toml index 6ef0d099027..a57f38b4a1c 100644 --- a/python/cugraph-pyg/pyproject.toml +++ b/python/cugraph-pyg/pyproject.toml @@ -42,7 +42,7 @@ Documentation = "https://docs.rapids.ai/api/cugraph/stable/" [project.optional-dependencies] test = [ "pandas", - "pylibwholegraph==24.8.*", + "pylibwholegraph==24.8.*,>=0.0.0a0", "pytest", "pytest-benchmark", "pytest-cov", @@ -64,5 +64,4 @@ include = [ [tool.rapids-build-backend] build-backend = "setuptools.build_meta" -requires = [] dependencies-file = "../../dependencies.yaml" diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml index b9d68ddeceb..4544a853a72 100644 --- a/python/cugraph-service/server/pyproject.toml +++ b/python/cugraph-service/server/pyproject.toml @@ -76,5 +76,4 @@ include = [ [tool.rapids-build-backend] build-backend = "setuptools.build_meta" -requires = [] dependencies-file = "../../../dependencies.yaml" diff --git a/python/cugraph/pyproject.toml b/python/cugraph/pyproject.toml index dc8506ef757..7dce15c4228 100644 --- a/python/cugraph/pyproject.toml +++ b/python/cugraph/pyproject.toml @@ -49,7 +49,7 @@ test = [ "networkx>=2.5.1", "numpy>=1.23,<2.0a0", "pandas", - "pylibwholegraph==24.8.*", + "pylibwholegraph==24.8.*,>=0.0.0a0", "pytest", "pytest-benchmark", "pytest-cov", From 190b460362d77a0cea194bccbb2ed784f66b3bee Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 5 Jun 2024 07:00:11 -0700 Subject: [PATCH 36/47] remove alpha specs from conda_build_config.yaml --- ci/release/update-version.sh | 6 +++--- python/cugraph-service/client/pyproject.toml | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index eee90b393b9..ce2488ad0bf 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -84,9 +84,9 @@ for DEP in "${DEPENDENCIES[@]}"; do done # ucx-py version -sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*,>=0.0.0a0\"/}" conda/recipes/cugraph/conda_build_config.yaml -sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*,>=0.0.0a0\"/}" conda/recipes/cugraph-service/conda_build_config.yaml -sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*,>=0.0.0a0\"/}" conda/recipes/pylibcugraph/conda_build_config.yaml +sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*\"/}" conda/recipes/cugraph/conda_build_config.yaml +sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*\"/}" conda/recipes/cugraph-service/conda_build_config.yaml +sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*\"/}" conda/recipes/pylibcugraph/conda_build_config.yaml # CI files for FILE in .github/workflows/*.yaml; do diff --git a/python/cugraph-service/client/pyproject.toml b/python/cugraph-service/client/pyproject.toml index 96ad8103379..dd331e80b22 100644 --- a/python/cugraph-service/client/pyproject.toml +++ b/python/cugraph-service/client/pyproject.toml @@ -47,5 +47,4 @@ include = [ [tool.rapids-build-backend] build-backend = "setuptools.build_meta" -requires = [] dependencies-file = "../../../dependencies.yaml" From 462a53639deb4c7ff09bf5a38dc35b0ba10c565f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 14 Jun 2024 09:41:09 -0700 Subject: [PATCH 37/47] use rapids-build-backend 0.3.1 --- 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-equivariant/meta.yaml | 2 +- conda/recipes/cugraph-pyg/meta.yaml | 2 +- conda/recipes/cugraph-service/meta.yaml | 4 ++-- conda/recipes/cugraph/meta.yaml | 2 +- conda/recipes/libcugraph/meta.yaml | 2 +- conda/recipes/nx-cugraph/meta.yaml | 2 +- conda/recipes/pylibcugraph/meta.yaml | 2 +- dependencies.yaml | 2 +- python/cugraph-dgl/pyproject.toml | 2 +- python/cugraph-equivariant/pyproject.toml | 2 +- python/cugraph-pyg/pyproject.toml | 2 +- python/cugraph-service/client/pyproject.toml | 2 +- python/cugraph-service/server/pyproject.toml | 2 +- python/cugraph/pyproject.toml | 2 +- python/nx-cugraph/pyproject.toml | 2 +- python/pylibcugraph/pyproject.toml | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 7f0e6d29bb7..31e7b9d898a 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -57,7 +57,7 @@ dependencies: - pytest-xdist - python-louvain - raft-dask==24.8.*,>=0.0.0a0 -- rapids-build-backend>=0.3.0,<0.4.0.dev0 +- rapids-build-backend>=0.3.1,<0.4.0.dev0 - rapids-dask-dependency==24.8.*,>=0.0.0a0 - recommonmark - requests diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 78ccba0c3ec..c29187b1752 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -62,7 +62,7 @@ dependencies: - pytest-xdist - python-louvain - raft-dask==24.8.*,>=0.0.0a0 -- rapids-build-backend>=0.3.0,<0.4.0.dev0 +- rapids-build-backend>=0.3.1,<0.4.0.dev0 - rapids-dask-dependency==24.8.*,>=0.0.0a0 - recommonmark - requests diff --git a/conda/recipes/cugraph-dgl/meta.yaml b/conda/recipes/cugraph-dgl/meta.yaml index 507efe1f77a..ca4fdb7f2fc 100644 --- a/conda/recipes/cugraph-dgl/meta.yaml +++ b/conda/recipes/cugraph-dgl/meta.yaml @@ -21,7 +21,7 @@ build: requirements: host: - python - - rapids-build-backend>=0.3.0,<0.4.0.dev0 + - rapids-build-backend>=0.3.1,<0.4.0.dev0 run: - cugraph ={{ version }} - dgl >=1.1.0.cu* diff --git a/conda/recipes/cugraph-equivariant/meta.yaml b/conda/recipes/cugraph-equivariant/meta.yaml index 9f7fec49747..3b56c1d6b08 100644 --- a/conda/recipes/cugraph-equivariant/meta.yaml +++ b/conda/recipes/cugraph-equivariant/meta.yaml @@ -21,7 +21,7 @@ build: requirements: host: - python - - rapids-build-backend>=0.3.0,<0.4.0.dev0 + - rapids-build-backend>=0.3.1,<0.4.0.dev0 run: - pylibcugraphops ={{ minor_version }} - python diff --git a/conda/recipes/cugraph-pyg/meta.yaml b/conda/recipes/cugraph-pyg/meta.yaml index ff5c472762d..9833a78d88b 100644 --- a/conda/recipes/cugraph-pyg/meta.yaml +++ b/conda/recipes/cugraph-pyg/meta.yaml @@ -25,7 +25,7 @@ requirements: - cython >=3.0.0 - python - scikit-build-core >=0.7.0 - - rapids-build-backend>=0.3.0,<0.4.0.dev0 + - rapids-build-backend>=0.3.1,<0.4.0.dev0 run: - rapids-dask-dependency ={{ minor_version }} - numba >=0.57 diff --git a/conda/recipes/cugraph-service/meta.yaml b/conda/recipes/cugraph-service/meta.yaml index f1bd982b279..79b2837eb53 100644 --- a/conda/recipes/cugraph-service/meta.yaml +++ b/conda/recipes/cugraph-service/meta.yaml @@ -29,7 +29,7 @@ outputs: host: - pip - python - - rapids-build-backend>=0.3.0,<0.4.0.dev0 + - rapids-build-backend>=0.3.1,<0.4.0.dev0 run: - python - thriftpy2 >=0.4.15 @@ -53,7 +53,7 @@ outputs: - python - setuptools - wheel - - rapids-build-backend>=0.3.0,<0.4.0.dev0 + - rapids-build-backend>=0.3.1,<0.4.0.dev0 run: - {{ pin_subpackage('cugraph-service-client', exact=True) }} - cudf ={{ minor_version }} diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml index 51986a3e4c8..fccc3a208d6 100644 --- a/conda/recipes/cugraph/meta.yaml +++ b/conda/recipes/cugraph/meta.yaml @@ -69,7 +69,7 @@ requirements: - raft-dask ={{ minor_version }} - rmm ={{ minor_version }} - scikit-build-core >=0.7.0 - - rapids-build-backend>=0.3.0,<0.4.0.dev0 + - rapids-build-backend>=0.3.1,<0.4.0.dev0 run: - aiohttp - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml index 222a94844dc..8df575f0b96 100644 --- a/conda/recipes/libcugraph/meta.yaml +++ b/conda/recipes/libcugraph/meta.yaml @@ -75,7 +75,7 @@ requirements: - librmm ={{ minor_version }} - nccl {{ nccl_version }} - ucx-proc=*=gpu - - rapids-build-backend>=0.3.0,<0.4.0.dev0 + - rapids-build-backend>=0.3.1,<0.4.0.dev0 outputs: - name: libcugraph diff --git a/conda/recipes/nx-cugraph/meta.yaml b/conda/recipes/nx-cugraph/meta.yaml index 6f406b10be4..3b2d6067f9d 100644 --- a/conda/recipes/nx-cugraph/meta.yaml +++ b/conda/recipes/nx-cugraph/meta.yaml @@ -21,7 +21,7 @@ build: requirements: host: - python - - rapids-build-backend>=0.3.0,<0.4.0.dev0 + - rapids-build-backend>=0.3.1,<0.4.0.dev0 run: - pylibcugraph ={{ version }} - networkx >=3.0 diff --git a/conda/recipes/pylibcugraph/meta.yaml b/conda/recipes/pylibcugraph/meta.yaml index f9a4a9ccc56..57ec1e7418f 100644 --- a/conda/recipes/pylibcugraph/meta.yaml +++ b/conda/recipes/pylibcugraph/meta.yaml @@ -66,7 +66,7 @@ requirements: - pylibraft ={{ minor_version }} - python - scikit-build-core >=0.7.0 - - rapids-build-backend>=0.3.0,<0.4.0.dev0 + - rapids-build-backend>=0.3.1,<0.4.0.dev0 run: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} {% if cuda_major == "11" %} diff --git a/dependencies.yaml b/dependencies.yaml index 6e272bc048c..a6cb9050e91 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -452,7 +452,7 @@ dependencies: common: - output_types: [conda, pyproject, requirements] packages: - - rapids-build-backend>=0.3.0,<0.4.0.dev0 + - rapids-build-backend>=0.3.1,<0.4.0.dev0 python_build_wheel: common: - output_types: [conda, pyproject, requirements] diff --git a/python/cugraph-dgl/pyproject.toml b/python/cugraph-dgl/pyproject.toml index 3bf54dcc0e8..46c2cd46b0b 100644 --- a/python/cugraph-dgl/pyproject.toml +++ b/python/cugraph-dgl/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.3.0,<0.4.0.dev0", + "rapids-build-backend>=0.3.1,<0.4.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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-equivariant/pyproject.toml b/python/cugraph-equivariant/pyproject.toml index f7866d199da..f9c992e3fb9 100644 --- a/python/cugraph-equivariant/pyproject.toml +++ b/python/cugraph-equivariant/pyproject.toml @@ -13,7 +13,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.3.0,<0.4.0.dev0", + "rapids-build-backend>=0.3.1,<0.4.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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 a57f38b4a1c..0db31a9c79e 100644 --- a/python/cugraph-pyg/pyproject.toml +++ b/python/cugraph-pyg/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.3.0,<0.4.0.dev0", + "rapids-build-backend>=0.3.1,<0.4.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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/client/pyproject.toml b/python/cugraph-service/client/pyproject.toml index dd331e80b22..9fb54f831d9 100644 --- a/python/cugraph-service/client/pyproject.toml +++ b/python/cugraph-service/client/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.3.0,<0.4.0.dev0", + "rapids-build-backend>=0.3.1,<0.4.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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 4544a853a72..53d3b12b447 100644 --- a/python/cugraph-service/server/pyproject.toml +++ b/python/cugraph-service/server/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.3.0,<0.4.0.dev0", + "rapids-build-backend>=0.3.1,<0.4.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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/pyproject.toml b/python/cugraph/pyproject.toml index 7dce15c4228..e8785e53fd1 100644 --- a/python/cugraph/pyproject.toml +++ b/python/cugraph/pyproject.toml @@ -4,7 +4,7 @@ requires = [ "cython>=3.0.0", - "rapids-build-backend>=0.3.0,<0.4.0.dev0", + "rapids-build-backend>=0.3.1,<0.4.0.dev0", "scikit-build-core[pyproject]>=0.7.0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. build-backend = "rapids_build_backend.build" diff --git a/python/nx-cugraph/pyproject.toml b/python/nx-cugraph/pyproject.toml index 41ba6af5f17..50881d5db90 100644 --- a/python/nx-cugraph/pyproject.toml +++ b/python/nx-cugraph/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "rapids-build-backend>=0.3.0,<0.4.0.dev0", + "rapids-build-backend>=0.3.1,<0.4.0.dev0", "setuptools>=61.0.0", "wheel", ] # 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 90f6a14b137..23b305ac406 100644 --- a/python/pylibcugraph/pyproject.toml +++ b/python/pylibcugraph/pyproject.toml @@ -4,7 +4,7 @@ requires = [ "cython>=3.0.0", - "rapids-build-backend>=0.3.0,<0.4.0.dev0", + "rapids-build-backend>=0.3.1,<0.4.0.dev0", "scikit-build-core[pyproject]>=0.7.0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. build-backend = "rapids_build_backend.build" From b7d2b833fc8e31b04c628eceba42ce571a2c4534 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 14 Jun 2024 10:00:54 -0700 Subject: [PATCH 38/47] cugraph-service-client and cugraph-service-server do not have wheel builds and are not built with CUDA suffixes --- build.sh | 4 ++-- .../recipes/cugraph-service/install_cugraph-service-client.sh | 2 +- .../recipes/cugraph-service/install_cugraph-service-server.sh | 2 +- python/cugraph-service/client/pyproject.toml | 1 + python/cugraph-service/server/pyproject.toml | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index a2642b848b2..3d3a53c90db 100755 --- a/build.sh +++ b/build.sh @@ -332,8 +332,8 @@ if hasArg cugraph-service || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-service else - python ${PYTHON_ARGS_FOR_INSTALL} --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-service/client - python ${PYTHON_ARGS_FOR_INSTALL} --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-service/server + python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/cugraph-service/client + python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/cugraph-service/server fi fi diff --git a/conda/recipes/cugraph-service/install_cugraph-service-client.sh b/conda/recipes/cugraph-service/install_cugraph-service-client.sh index c588a6206cc..17e691e348a 100644 --- a/conda/recipes/cugraph-service/install_cugraph-service-client.sh +++ b/conda/recipes/cugraph-service/install_cugraph-service-client.sh @@ -13,6 +13,6 @@ cd "${SRC_DIR}/python/cugraph-service/client" mkdir -p pip_cache -$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache --config-settings rapidsai.disable-cuda=true . -vv +$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache . -vv #./build.sh cugraph-service diff --git a/conda/recipes/cugraph-service/install_cugraph-service-server.sh b/conda/recipes/cugraph-service/install_cugraph-service-server.sh index 65c544354e8..f5708af3f2a 100644 --- a/conda/recipes/cugraph-service/install_cugraph-service-server.sh +++ b/conda/recipes/cugraph-service/install_cugraph-service-server.sh @@ -13,6 +13,6 @@ cd "${SRC_DIR}/python/cugraph-service/server" mkdir -p pip_cache -$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache --config-settings rapidsai.disable-cuda=true . -vv +$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache . -vv #./build.sh cugraph-service diff --git a/python/cugraph-service/client/pyproject.toml b/python/cugraph-service/client/pyproject.toml index 9fb54f831d9..4d20fd640db 100644 --- a/python/cugraph-service/client/pyproject.toml +++ b/python/cugraph-service/client/pyproject.toml @@ -48,3 +48,4 @@ include = [ [tool.rapids-build-backend] build-backend = "setuptools.build_meta" dependencies-file = "../../../dependencies.yaml" +disable-cuda = true diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml index 53d3b12b447..4f37cf25d79 100644 --- a/python/cugraph-service/server/pyproject.toml +++ b/python/cugraph-service/server/pyproject.toml @@ -77,3 +77,4 @@ include = [ [tool.rapids-build-backend] build-backend = "setuptools.build_meta" dependencies-file = "../../../dependencies.yaml" +disable-cuda = true From f015d1462b025c234a28f308dafc597f77bd5745 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 14 Jun 2024 10:06:46 -0700 Subject: [PATCH 39/47] revert disable-cuda change for cugraph-service-server --- build.sh | 14 +++++++------- python/cugraph-service/server/pyproject.toml | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index 3d3a53c90db..24ce8c08e8d 100755 --- a/build.sh +++ b/build.sh @@ -109,7 +109,7 @@ BUILD_CPP_MTMG_TESTS=OFF BUILD_ALL_GPU_ARCH=0 BUILD_WITH_CUGRAPHOPS=ON CMAKE_GENERATOR_OPTION="-G Ninja" -PYTHON_ARGS_FOR_INSTALL="-m pip install --no-build-isolation --no-deps" +PYTHON_ARGS_FOR_INSTALL="-m pip install --no-build-isolation --no-deps --config-settings rapidsai.disable-cuda=true" # Set defaults for vars that may not have been defined externally # FIXME: if PREFIX is not set, check CONDA_PREFIX, but there is no fallback @@ -313,7 +313,7 @@ if buildDefault || hasArg pylibcugraph || hasArg all; then cleanPythonDir ${REPODIR}/python/pylibcugraph else SKBUILD_CMAKE_ARGS="${SKBUILD_EXTRA_CMAKE_ARGS};-DUSE_CUGRAPH_OPS=${BUILD_WITH_CUGRAPHOPS}" \ - python ${PYTHON_ARGS_FOR_INSTALL} --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/pylibcugraph + python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/pylibcugraph fi fi @@ -323,7 +323,7 @@ if buildDefault || hasArg cugraph || hasArg all; then cleanPythonDir ${REPODIR}/python/cugraph else SKBUILD_CMAKE_ARGS="${SKBUILD_EXTRA_CMAKE_ARGS};-DUSE_CUGRAPH_OPS=${BUILD_WITH_CUGRAPHOPS}" \ - python ${PYTHON_ARGS_FOR_INSTALL} --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/cugraph + python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/cugraph fi fi @@ -342,7 +342,7 @@ if hasArg cugraph-pyg || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-pyg else - python ${PYTHON_ARGS_FOR_INSTALL} --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-pyg + python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/cugraph-pyg fi fi @@ -351,7 +351,7 @@ if hasArg cugraph-dgl || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-dgl else - python ${PYTHON_ARGS_FOR_INSTALL} --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-dgl + python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/cugraph-dgl fi fi @@ -360,7 +360,7 @@ if hasArg cugraph-equivariant || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-equivariant else - python ${PYTHON_ARGS_FOR_INSTALL} --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/cugraph-equivariant + python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/cugraph-equivariant fi fi @@ -369,7 +369,7 @@ if hasArg nx-cugraph || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/nx-cugraph else - python ${PYTHON_ARGS_FOR_INSTALL} --config-settings rapidsai.disable-cuda=true ${REPODIR}/python/nx-cugraph + python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/nx-cugraph fi fi diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml index 4f37cf25d79..53d3b12b447 100644 --- a/python/cugraph-service/server/pyproject.toml +++ b/python/cugraph-service/server/pyproject.toml @@ -77,4 +77,3 @@ include = [ [tool.rapids-build-backend] build-backend = "setuptools.build_meta" dependencies-file = "../../../dependencies.yaml" -disable-cuda = true From 175f6f285c25cab40b6abacf03702662724697a2 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 14 Jun 2024 10:53:03 -0700 Subject: [PATCH 40/47] pre-commit --- conda/recipes/cugraph-service/install_cugraph-service-client.sh | 2 +- conda/recipes/cugraph-service/install_cugraph-service-server.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/cugraph-service/install_cugraph-service-client.sh b/conda/recipes/cugraph-service/install_cugraph-service-client.sh index 17e691e348a..318e9800a76 100644 --- a/conda/recipes/cugraph-service/install_cugraph-service-client.sh +++ b/conda/recipes/cugraph-service/install_cugraph-service-client.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2022-2024, NVIDIA CORPORATION. +# Copyright (c) 2022-2023, NVIDIA CORPORATION. # This assumes the script is executed from the root of the repo directory diff --git a/conda/recipes/cugraph-service/install_cugraph-service-server.sh b/conda/recipes/cugraph-service/install_cugraph-service-server.sh index f5708af3f2a..2dcae7c379b 100644 --- a/conda/recipes/cugraph-service/install_cugraph-service-server.sh +++ b/conda/recipes/cugraph-service/install_cugraph-service-server.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2022-2024, NVIDIA CORPORATION. +# Copyright (c) 2022-2023, NVIDIA CORPORATION. # This assumes the script is executed from the root of the repo directory From d84b7e54f09e1322e252b9def3ca359c7426a300 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 24 Jun 2024 10:03:09 -0500 Subject: [PATCH 41/47] revert some unintentional changes --- python/nx-cugraph/_nx_cugraph/_version.py | 7 +++++-- python/pylibcugraph/pylibcugraph/_version.py | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/python/nx-cugraph/_nx_cugraph/_version.py b/python/nx-cugraph/_nx_cugraph/_version.py index e8adcc31430..3cf8b23da18 100644 --- a/python/nx-cugraph/_nx_cugraph/_version.py +++ b/python/nx-cugraph/_nx_cugraph/_version.py @@ -11,10 +11,13 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# - import importlib.resources +# Read VERSION file from the module that is symlinked to VERSION file +# in the root of the repo at build time or copied to the module at +# installation. VERSION is a separate file that allows CI build-time scripts +# to update version info (including commit hashes) without modifying +# source files. __version__ = ( importlib.resources.files(__package__).joinpath("VERSION").read_text().strip() ) diff --git a/python/pylibcugraph/pylibcugraph/_version.py b/python/pylibcugraph/pylibcugraph/_version.py index e8adcc31430..053b163116d 100644 --- a/python/pylibcugraph/pylibcugraph/_version.py +++ b/python/pylibcugraph/pylibcugraph/_version.py @@ -15,6 +15,11 @@ import importlib.resources +# Read VERSION file from the module that is symlinked to VERSION file +# in the root of the repo at build time or copied to the moudle at +# installation. VERSION is a separate file that allows CI build-time scripts +# to update version info (including commit hashes) without modifying +# source files. __version__ = ( importlib.resources.files(__package__).joinpath("VERSION").read_text().strip() ) From 97b7ba8d021a71461e8cac2ea90dbe7c10f2e50f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 24 Jun 2024 10:30:26 -0500 Subject: [PATCH 42/47] revert more unintentional changes --- python/cugraph-equivariant/cugraph_equivariant/_version.py | 6 +++++- python/cugraph-pyg/cugraph_pyg/_version.py | 5 +++++ .../client/cugraph_service_client/_version.py | 5 +++++ .../server/cugraph_service_server/_version.py | 5 +++++ python/cugraph/cugraph/_version.py | 5 +++++ 5 files changed, 25 insertions(+), 1 deletion(-) diff --git a/python/cugraph-equivariant/cugraph_equivariant/_version.py b/python/cugraph-equivariant/cugraph_equivariant/_version.py index e8adcc31430..940ebac74f7 100644 --- a/python/cugraph-equivariant/cugraph_equivariant/_version.py +++ b/python/cugraph-equivariant/cugraph_equivariant/_version.py @@ -11,10 +11,14 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# import importlib.resources +# Read VERSION file from the module that is symlinked to VERSION file +# in the root of the repo at build time or copied to the module at +# installation. VERSION is a separate file that allows CI build-time scripts +# to update version info (including commit hashes) without modifying +# source files. __version__ = ( importlib.resources.files(__package__).joinpath("VERSION").read_text().strip() ) diff --git a/python/cugraph-pyg/cugraph_pyg/_version.py b/python/cugraph-pyg/cugraph_pyg/_version.py index e8adcc31430..053b163116d 100644 --- a/python/cugraph-pyg/cugraph_pyg/_version.py +++ b/python/cugraph-pyg/cugraph_pyg/_version.py @@ -15,6 +15,11 @@ import importlib.resources +# Read VERSION file from the module that is symlinked to VERSION file +# in the root of the repo at build time or copied to the moudle at +# installation. VERSION is a separate file that allows CI build-time scripts +# to update version info (including commit hashes) without modifying +# source files. __version__ = ( importlib.resources.files(__package__).joinpath("VERSION").read_text().strip() ) diff --git a/python/cugraph-service/client/cugraph_service_client/_version.py b/python/cugraph-service/client/cugraph_service_client/_version.py index e8adcc31430..053b163116d 100644 --- a/python/cugraph-service/client/cugraph_service_client/_version.py +++ b/python/cugraph-service/client/cugraph_service_client/_version.py @@ -15,6 +15,11 @@ import importlib.resources +# Read VERSION file from the module that is symlinked to VERSION file +# in the root of the repo at build time or copied to the moudle at +# installation. VERSION is a separate file that allows CI build-time scripts +# to update version info (including commit hashes) without modifying +# source files. __version__ = ( importlib.resources.files(__package__).joinpath("VERSION").read_text().strip() ) diff --git a/python/cugraph-service/server/cugraph_service_server/_version.py b/python/cugraph-service/server/cugraph_service_server/_version.py index e8adcc31430..053b163116d 100644 --- a/python/cugraph-service/server/cugraph_service_server/_version.py +++ b/python/cugraph-service/server/cugraph_service_server/_version.py @@ -15,6 +15,11 @@ import importlib.resources +# Read VERSION file from the module that is symlinked to VERSION file +# in the root of the repo at build time or copied to the moudle at +# installation. VERSION is a separate file that allows CI build-time scripts +# to update version info (including commit hashes) without modifying +# source files. __version__ = ( importlib.resources.files(__package__).joinpath("VERSION").read_text().strip() ) diff --git a/python/cugraph/cugraph/_version.py b/python/cugraph/cugraph/_version.py index e8adcc31430..053b163116d 100644 --- a/python/cugraph/cugraph/_version.py +++ b/python/cugraph/cugraph/_version.py @@ -15,6 +15,11 @@ import importlib.resources +# Read VERSION file from the module that is symlinked to VERSION file +# in the root of the repo at build time or copied to the moudle at +# installation. VERSION is a separate file that allows CI build-time scripts +# to update version info (including commit hashes) without modifying +# source files. __version__ = ( importlib.resources.files(__package__).joinpath("VERSION").read_text().strip() ) From f47fe55d7cc9aca6a1ca64d74933c41060ce7ae3 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 26 Jun 2024 13:19:46 -0700 Subject: [PATCH 43/47] avoid dependency on nvcc for cugraph-service-server conda builds --- .../install_cugraph-service-server.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/conda/recipes/cugraph-service/install_cugraph-service-server.sh b/conda/recipes/cugraph-service/install_cugraph-service-server.sh index 2dcae7c379b..d200a291e72 100644 --- a/conda/recipes/cugraph-service/install_cugraph-service-server.sh +++ b/conda/recipes/cugraph-service/install_cugraph-service-server.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # This assumes the script is executed from the root of the repo directory @@ -13,6 +13,14 @@ cd "${SRC_DIR}/python/cugraph-service/server" mkdir -p pip_cache -$PYTHON -m pip install --no-build-isolation --no-index --no-deps --ignore-installed --cache-dir ./pip_cache . -vv +$PYTHON -m pip install \ + --no-build-isolation \ + --no-index \ + --no-deps \ + --ignore-installed \ + --cache-dir ./pip_cache \ + --config-settings rapidsai.disable-cuda=true \ + -vv \ + . #./build.sh cugraph-service From ccdf5600f35ce2c8c99f7dfc6a76bbf34cfd4a80 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 27 Jun 2024 15:06:56 -0700 Subject: [PATCH 44/47] extra-index-url cannot be used in pyproject.toml --- dependencies.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 313d8ead222..fdb6f278265 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -665,18 +665,25 @@ dependencies: - &pytorch_conda pytorch>=2.0,<2.2.0a0 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 - - --extra-index-url=https://download.pytorch.org/whl/cu121 - matrix: {cuda: "11.*"} packages: - *pytorch_pip - *tensordict - - --extra-index-url=https://download.pytorch.org/whl/cu118 - {matrix: null, packages: [*pytorch_pip, *tensordict]} depends_on_pylibwholegraph: From 65952dd68d4531950c244ac1d3a5ddf0b751bf5d Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Mon, 1 Jul 2024 11:55:54 -0400 Subject: [PATCH 45/47] Use verify-alpha-spec --- .pre-commit-config.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9a7efd480d8..e7fb2ac5048 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -40,14 +40,8 @@ repos: hooks: - id: clang-format types_or: [c, c++, cuda] - args: ["-fallback-style=none", "-style=file", "-i"] - - repo: https://github.com/rapidsai/dependency-file-generator - rev: v1.13.11 - hooks: - - id: rapids-dependency-file-generator - args: ["--clean"] - repo: https://github.com/rapidsai/pre-commit-hooks - rev: v0.0.3 + rev: v0.1.0 hooks: - id: verify-copyright files: | @@ -58,6 +52,13 @@ repos: [.]flake8[.]cython$| meta[.]yaml$| setup[.]cfg$ + - id: verify-alpha-spec + args: ["-fallback-style=none", "-style=file", "-i"] + - repo: https://github.com/rapidsai/dependency-file-generator + rev: v1.13.11 + hooks: + - id: rapids-dependency-file-generator + args: ["--clean"] - repo: local hooks: - id: nx-cugraph-meta-data-update From d36d68d4e8433c8fd7416282742a94633d50953d Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Mon, 1 Jul 2024 11:59:02 -0400 Subject: [PATCH 46/47] Oops --- .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 e7fb2ac5048..8dff6342507 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -40,6 +40,7 @@ repos: hooks: - id: clang-format types_or: [c, c++, cuda] + args: ["-fallback-style=none", "-style=file", "-i"] - repo: https://github.com/rapidsai/pre-commit-hooks rev: v0.1.0 hooks: @@ -53,7 +54,6 @@ repos: meta[.]yaml$| setup[.]cfg$ - id: verify-alpha-spec - args: ["-fallback-style=none", "-style=file", "-i"] - repo: https://github.com/rapidsai/dependency-file-generator rev: v1.13.11 hooks: From 9e75938ab81d818ae9caef280e398754079901b6 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Mon, 1 Jul 2024 12:04:19 -0400 Subject: [PATCH 47/47] Update version --- .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 8dff6342507..36c5fa84166 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -42,7 +42,7 @@ repos: types_or: [c, c++, cuda] args: ["-fallback-style=none", "-style=file", "-i"] - repo: https://github.com/rapidsai/pre-commit-hooks - rev: v0.1.0 + rev: v0.2.0 hooks: - id: verify-copyright files: |