From a0d3f7190aa7e936a2b176fc85e17205b48afe1b Mon Sep 17 00:00:00 2001 From: Ray Douglass Date: Thu, 18 Jan 2024 15:06:44 -0500 Subject: [PATCH 1/6] DOC v24.04 Updates [skip ci] --- .github/workflows/build.yaml | 6 +++--- .github/workflows/pr.yaml | 4 ++-- ci/conda-pack.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d0f22a46..feb4ba77 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,7 +28,7 @@ concurrency: jobs: build: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.04 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -37,7 +37,7 @@ jobs: upload-conda: needs: [build] secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.04 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -46,7 +46,7 @@ jobs: conda-pack: needs: [upload-conda] secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.04 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index ef9f2435..660bfb28 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -12,11 +12,11 @@ concurrency: jobs: build: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.04 with: build_type: pull-request pr-builder: needs: - build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.04 diff --git a/ci/conda-pack.sh b/ci/conda-pack.sh index 026ed3c2..66128f87 100755 --- a/ci/conda-pack.sh +++ b/ci/conda-pack.sh @@ -3,7 +3,7 @@ set -e -RAPIDS_VER="24.02" +RAPIDS_VER="24.04" VERSION_DESCRIPTOR="a" CONDA_USERNAME="rapidsai-nightly" From 0ce8a215fdc33cfa2fa82906e76e3d89de71b45e Mon Sep 17 00:00:00 2001 From: Jake Awe <50372925+AyodeAwe@users.noreply.github.com> Date: Wed, 21 Feb 2024 09:05:30 -0600 Subject: [PATCH 2/6] Update ops-bot.yaml (#699) --- .github/ops-bot.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ops-bot.yaml b/.github/ops-bot.yaml index 0a0ad189..0111aaa9 100644 --- a/.github/ops-bot.yaml +++ b/.github/ops-bot.yaml @@ -3,3 +3,4 @@ auto_merger: true branch_checker: true +forward_merger: true From 7437cb3bf1bf5b9055f5452a490f1b36d8838e42 Mon Sep 17 00:00:00 2001 From: Rick Ratzel <3039903+rlratzel@users.noreply.github.com> Date: Wed, 21 Feb 2024 12:57:49 -0600 Subject: [PATCH 3/6] Adds nx-cugraph to the rapids meta-package (#701) * Adds `nx-cugraph` to the `rapids` meta-package - unlike Accelerated Pandas, which is provided with `cudf`, Accelerated NetworkX is not provided with `cugraph` and must be installed separately. * `nx-cugraph` has a dependency on NetworkX and ensures a compatible version is installed. Because of this, the explicit install of `networkx` is removed from the `rapids` meta-package in favor of using the `networkx` version installed via `nx-cugraph`. Authors: - Rick Ratzel (https://github.com/rlratzel) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: https://github.com/rapidsai/integration/pull/701 --- conda/recipes/rapids/meta.yaml | 2 +- conda/recipes/versions.yaml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/conda/recipes/rapids/meta.yaml b/conda/recipes/rapids/meta.yaml index baa8534e..d7d77a3d 100644 --- a/conda/recipes/rapids/meta.yaml +++ b/conda/recipes/rapids/meta.yaml @@ -31,13 +31,13 @@ requirements: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} - cupy {{ cupy_version }} - nccl {{ nccl_version }} - - networkx {{ networkx_version }} - numba {{ numba_version }} - numpy {{ numpy_version }} - nvtx {{ nvtx_version }} - python - cudf ={{ major_minor_version }}.* - cugraph ={{ major_minor_version }}.* + - nx-cugraph ={{ major_minor_version }}.* - cuml ={{ major_minor_version }}.* - cucim ={{ major_minor_version }}.* - cuspatial ={{ major_minor_version }}.* diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 5da651c9..c95bbaa3 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -8,8 +8,6 @@ cupy_version: - '>=12.0.0' nccl_version: - '>=2.9.9,<3.0a0' -networkx_version: - - '>=2.5.1' numba_version: - '>=0.57' numpy_version: From 68082db8cc18d1b17ce032359f680cbf98dd9998 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 13 Mar 2024 08:42:39 -0500 Subject: [PATCH 4/6] Add upper bound to prevent usage of NumPy 2. (#703) NumPy 2 is expected to be released in the near future. For the RAPIDS 24.04 release, we will pin to `numpy>=1.23,<2.0a0`. This PR adds an upper bound to affected RAPIDS repositories. xref: https://github.com/rapidsai/build-planning/issues/29 Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: https://github.com/rapidsai/integration/pull/703 --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index c95bbaa3..9ac8b158 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -11,7 +11,7 @@ nccl_version: numba_version: - '>=0.57' numpy_version: - - '>=1.21' + - '>=1.23,<2.0a0' nvtx_version: - '>=0.2.1,<0.3' ucx_version: From 23c05188cb04c3ee7b86207661128ef1a3876405 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 14 Mar 2024 12:30:57 -0500 Subject: [PATCH 5/6] Align ucx version pinning with ucx-py/ucxx. (#704) As of https://github.com/rapidsai/ucx-py/pull/1032 and https://github.com/rapidsai/ucxx/pull/205, the `ucx` version pinning in RAPIDS has been updated. This PR aligns with those changes. Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Jake Awe (https://github.com/AyodeAwe) URL: https://github.com/rapidsai/integration/pull/704 --- conda/recipes/versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/versions.yaml b/conda/recipes/versions.yaml index 9ac8b158..4e2a52ce 100644 --- a/conda/recipes/versions.yaml +++ b/conda/recipes/versions.yaml @@ -15,4 +15,4 @@ numpy_version: nvtx_version: - '>=0.2.1,<0.3' ucx_version: - - '>=1.14.1' + - '>=1.15.0,<1.16.0' From 734a135cf83414a1cfb2445a0dfa14890ad3d10b Mon Sep 17 00:00:00 2001 From: Jake Awe <50372925+AyodeAwe@users.noreply.github.com> Date: Mon, 18 Mar 2024 13:57:43 -0500 Subject: [PATCH 6/6] Update script input name (#705) --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index feb4ba77..9a8815e3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -53,4 +53,4 @@ jobs: date: ${{ inputs.date }} sha: ${{ inputs.sha }} matrix_filter: map(select(.ARCH == "amd64")) - build_script: ci/conda-pack.sh + script: ci/conda-pack.sh