From 2b0a3fd11569c2a4642468ced630ccd51790fcb1 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 13 Jan 2023 16:35:26 -0500 Subject: [PATCH 1/2] Build CUDA `11.8` and Python `3.10` Packages This PR updates `ucx-py` to build against branch [cuda-118](https://github.com/rapidsai/shared-action-workflows/compare/cuda-118) of the `shared-action-workflow` repository. That branch contains updates for CUDA `11.8` and Python `3.10` packages. It also includes some minor file renames. --- .github/workflows/build.yaml | 8 ++++---- .github/workflows/pr.yaml | 12 ++++++------ .github/workflows/test.yaml | 4 ++-- dependencies.yaml | 3 +++ 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ffa0fca71..dc5f8708f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,7 +28,7 @@ concurrency: jobs: conda-python-build: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-matrix-build.yaml@main + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-118 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -37,7 +37,7 @@ jobs: upload-conda: needs: [conda-python-build] secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@main + uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@cuda-118 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -45,7 +45,7 @@ jobs: sha: ${{ inputs.sha }} wheel-build: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@main + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-118 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -63,7 +63,7 @@ jobs: wheel-publish: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@main + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@cuda-118 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index b5a41633e..731465cb5 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -18,26 +18,26 @@ jobs: - wheel-build - wheel-tests secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@main + uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@cuda-118 checks: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@main + uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@cuda-118 conda-python-build: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-matrix-build.yaml@main + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-118 with: build_type: pull-request conda-python-tests: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@main + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-118 with: build_type: pull-request wheel-build: needs: checks secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@main + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@cuda-118 with: build_type: pull-request package-name: ucx_py @@ -48,7 +48,7 @@ jobs: wheel-tests: needs: wheel-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@main + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-118 with: build_type: pull-request package-name: ucx_py diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 174880fc3..57cdfc8b3 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,7 +16,7 @@ on: jobs: conda-python-tests: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@main + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-118 with: build_type: nightly branch: ${{ inputs.branch }} @@ -24,7 +24,7 @@ jobs: sha: ${{ inputs.sha }} wheel-tests: secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@main + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@cuda-118 with: build_type: nightly branch: ${{ inputs.branch }} diff --git a/dependencies.yaml b/dependencies.yaml index a7a68a19d..356ed4b2e 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -65,6 +65,9 @@ dependencies: py: "3.10" packages: - python=3.10 + - matrix: + packages: + - python>=3.8,<3.11 run: common: - output_types: [conda, requirements] From 090d9bdfab7efc1f0545723c6566987d185ff650 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 13 Jan 2023 16:44:54 -0500 Subject: [PATCH 2/2] add compilers to `ucx-py` recipe throughout the process of upgrading the RAPIDS libraries to `11.8`, I've noticed that the `11.8` images are missing a lot of packages that were previously available in the `11.5` images. these changes are from the upstream images, not RAPIDS' images. it seems that `gcc` is missing, which is causing build issues for `ucx-py`. this commit adds conda's `c` and `cxx` compilers to account for these new missing dependencies. --- conda/recipes/ucx-py/conda_build_config.yaml | 6 ++++++ conda/recipes/ucx-py/meta.yaml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/conda/recipes/ucx-py/conda_build_config.yaml b/conda/recipes/ucx-py/conda_build_config.yaml index f79fea73b..baddff53a 100644 --- a/conda/recipes/ucx-py/conda_build_config.yaml +++ b/conda/recipes/ucx-py/conda_build_config.yaml @@ -1,3 +1,9 @@ +c_compiler_version: + - 9 + +cxx_compiler_version: + - 9 + cython: - " >=0.29.14,<3.0.0a0" pynvml: diff --git a/conda/recipes/ucx-py/meta.yaml b/conda/recipes/ucx-py/meta.yaml index 887bfe2d2..2aee559e8 100644 --- a/conda/recipes/ucx-py/meta.yaml +++ b/conda/recipes/ucx-py/meta.yaml @@ -16,6 +16,9 @@ build: - {{ PYTHON }} -m pip install . -vv requirements: + build: + - {{ compiler('c') }} + - {{ compiler('cxx') }} host: - cython - pip