diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 7fb8d2f4..8e1bf937 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -24,9 +24,6 @@ on: RAPIDS_VER: required: true type: string - DASK_SQL_VER: - required: true - type: string BASE_TAG: required: true type: string @@ -52,7 +49,6 @@ jobs: LINUX_VER: ["${{ inputs.LINUX_VER }}"] PYTHON_VER: ["${{ inputs.PYTHON_VER }}"] RAPIDS_VER: ["${{ inputs.RAPIDS_VER }}"] - DASK_SQL_VER: ["${{ inputs.DASK_SQL_VER }}"] fail-fast: false runs-on: "linux-${{ matrix.ARCH }}-cpu4" steps: @@ -104,7 +100,6 @@ jobs: LINUX_VER=${{ inputs.LINUX_VER }} PYTHON_VER=${{ inputs.PYTHON_VER }} RAPIDS_VER=${{ inputs.RAPIDS_VER }} - DASK_SQL_VER=${{ inputs.DASK_SQL_VER }} tags: ${{ inputs.BASE_TAG }}-${{ matrix.ARCH }} - name: Build notebooks image uses: docker/build-push-action@v5 @@ -121,7 +116,6 @@ jobs: LINUX_VER=${{ inputs.LINUX_VER }} PYTHON_VER=${{ inputs.PYTHON_VER }} RAPIDS_VER=${{ inputs.RAPIDS_VER }} - DASK_SQL_VER=${{ inputs.DASK_SQL_VER }} tags: ${{ inputs.NOTEBOOKS_TAG }}-${{ matrix.ARCH }} - name: Build RAFT ANN Benchmarks GPU image uses: docker/build-push-action@v5 diff --git a/.github/workflows/build-test-publish-images.yml b/.github/workflows/build-test-publish-images.yml index 0d434a33..945aef39 100644 --- a/.github/workflows/build-test-publish-images.yml +++ b/.github/workflows/build-test-publish-images.yml @@ -133,7 +133,6 @@ jobs: LINUX_VER: ${{ matrix.LINUX_VER }} PYTHON_VER: ${{ matrix.PYTHON_VER }} RAPIDS_VER: ${{ needs.compute-matrix.outputs.RAPIDS_VER }} - DASK_SQL_VER: ${{ matrix.DASK_SQL_VER }} BASE_TAG: "rapidsai/${{ needs.compute-matrix.outputs.BASE_IMAGE_REPO }}:\ ${{ needs.compute-matrix.outputs.BASE_TAG_PREFIX }}\ diff --git a/.github/workflows/release-to-ngc.yml b/.github/workflows/release-to-ngc.yml index 8bbb9c70..e386b20f 100644 --- a/.github/workflows/release-to-ngc.yml +++ b/.github/workflows/release-to-ngc.yml @@ -20,7 +20,7 @@ jobs: id: generate-matrix run: | #!/bin/bash - matrix=$(yq 'del(.DASK_SQL_VER)' matrix.yaml | yq -o json | jq -c) + matrix=$(yq '.' matrix.yaml | yq -o json | jq -c) echo "matrix=${matrix}" | tee -a ${GITHUB_OUTPUT} copy-images: diff --git a/.github/workflows/update-dask-sql.yml b/.github/workflows/update-dask-sql.yml deleted file mode 100644 index 727e2eef..00000000 --- a/.github/workflows/update-dask-sql.yml +++ /dev/null @@ -1,66 +0,0 @@ -# Updates stable dask-sql version to use in images. -# Runs once daily. - -name: Check for new dask-sql version - -on: - schedule: - - cron: "0 0 * * *" # Daily “At 00:00” UTC - workflow_dispatch: - -jobs: - update-dask-sql: - runs-on: ubuntu-latest - container: - image: rapidsai/ci-conda:latest - if: github.repository == 'rapidsai/docker' - - steps: - - uses: actions/checkout@v4 - - - name: Get current dask-sql version - id: current_version - run: | - DASK_SQL_VER="$(yq -r '.DASK_SQL_VER.[0]' matrix.yaml)" - echo "DASK_SQL_VER=${DASK_SQL_VER}" | tee -a ${GITHUB_OUTPUT} - - - name: Get new dask-sql version - id: new_version - uses: jacobtomlinson/gha-anaconda-package-version@0.1.3 - with: - org: "conda-forge" - package: "dask-sql" - version_system: "SemVer" - - - name: Get current/new versions without patch - env: - FULL_VER: ${{ steps.current_version.outputs.DASK_SQL_VER }} - FULL_NEW_VER: ${{ steps.new_version.outputs.version }} - run: | - echo SHORT_VER=${FULL_VER%.*} >> $GITHUB_ENV - echo SHORT_NEW_VER=${FULL_NEW_VER%.*} >> $GITHUB_ENV - - - name: Find and replace full dask-sql version - uses: jacobtomlinson/gha-find-replace@v3 - with: - find: ${{ steps.current_version.outputs.DASK_SQL_VER }} - replace: ${{ steps.new_version.outputs.version }} - - - name: Find and replace short dask-sql version - uses: jacobtomlinson/gha-find-replace@v3 - with: - find: ${{ env.SHORT_VER }} - replace: ${{ env.SHORT_NEW_VER }} - - - name: Create pull request with changes - uses: peter-evans/create-pull-request@v6 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: Update `DASK_SQL_VERSION` to `${{ steps.new_version.outputs.version }}` - title: Update `DASK_SQL_VERSION` to `${{ steps.new_version.outputs.version }}` - author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> - branch: "upgrade-dask-sql" - body: | - A new stable dask-sql version has been detected. - - Updated all config files and READMEs to use `${{ steps.new_version.outputs.version }}`. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index af1d5474..9b7a9c9a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,4 +15,3 @@ To build just the `base` image with default arguments: `docker buildx build --pu - `CUDA_VER` - Version of CUDA to use. Should be `major.minor.patch` - `PYTHON_VER` - Version of Python to use. Should be `major.minor` - `RAPIDS_VER` - Version of RAPIDS to use. Should be `YY.MM` -- `DASK_SQL_VER` - Version of `dask-sql` to use. Should be `YYYY.M.P` diff --git a/Dockerfile b/Dockerfile index fec263c2..baecd8f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,6 @@ ARG LINUX_DISTRO_VER=22.04 ARG LINUX_VER=${LINUX_DISTRO}${LINUX_DISTRO_VER} ARG RAPIDS_VER=24.08 -ARG DASK_SQL_VER=2024.5.0 # Gather dependency information FROM rapidsai/ci-conda:latest AS dependencies @@ -15,7 +14,6 @@ ARG CUDA_VER ARG PYTHON_VER ARG RAPIDS_VER -ARG DASK_SQL_VER ARG RAPIDS_BRANCH="branch-${RAPIDS_VER}" @@ -41,7 +39,6 @@ ARG CUDA_VER ARG PYTHON_VER ARG RAPIDS_VER -ARG DASK_SQL_VER SHELL ["/bin/bash", "-euo", "pipefail", "-c"] @@ -56,7 +53,6 @@ COPY condarc /opt/conda/.condarc RUN <=2.32 - then - . + ["arm64"] - else - . - end | - $x + {ARCHES: .}; + $x + {ARCHES: ["amd64", "arm64"]}; def compute_ubuntu_version($x): if diff --git a/context/notebooks.sh b/context/notebooks.sh index 0d28015f..fbe3c742 100755 --- a/context/notebooks.sh +++ b/context/notebooks.sh @@ -3,7 +3,6 @@ # Clones repos with notebooks & compiles notebook test dependencies # Requires environment variables: # RAPIDS_BRANCH -# DASK_SQL_VER # CUDA_VER # PYTHON_VER @@ -41,6 +40,5 @@ done pushd "/dependencies" conda-merge ./*.yaml | - yq ".dependencies += [\"dask-sql==${DASK_SQL_VER%.*}.*\"]" | # Ensure dask-sql dependency is not altered yq '.channels = load("/condarc").channels' | # Use channels provided by CI, not repos tee /test_notebooks_dependencies.yaml diff --git a/dockerhub-readme.md b/dockerhub-readme.md index 90233bac..1d7695bd 100644 --- a/dockerhub-readme.md +++ b/dockerhub-readme.md @@ -22,7 +22,6 @@ RAPIDS Libraries included in the images: - `cuxfilter` - `cuCIM` - `xgboost` -- `dask-sql` ### Image Types diff --git a/matrix.yaml b/matrix.yaml index 59e62dd6..cd76af0a 100644 --- a/matrix.yaml +++ b/matrix.yaml @@ -6,5 +6,3 @@ PYTHON_VER: - "3.9" - "3.10" - "3.11" -DASK_SQL_VER: - - "2024.5.0"