Skip to content

Commit

Permalink
reduce config duplication, update third-party actions (#101)
Browse files Browse the repository at this point in the history
* add Python 3.12, reduce config duplication, update third-party actions

* revert Python 3.12 changes

* remove RAPIDS_VER from dask_image build
  • Loading branch information
jameslamb authored Sep 9, 2024
1 parent e121aa8 commit 65c2149
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 40 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/update-gpuci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
if: github.repository == 'rapidsai/dask-build-environment'

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Parse current axis YAML
uses: the-coding-turtle/[email protected].1
uses: the-coding-turtle/[email protected].2
with:
file: ci/axis/dask.yaml

Expand Down Expand Up @@ -58,23 +58,23 @@ jobs:
regex: false

- name: Update old RAPIDS versions
uses: jacobtomlinson/gha-find-replace@v2
uses: jacobtomlinson/gha-find-replace@v3
with:
include: 'ci/**'
find: "${{ env.OLD_RAPIDS_VER }}"
replace: "${{ env.RAPIDS_VER }}"
regex: false

- name: Update new UCX-Py versions
uses: jacobtomlinson/gha-find-replace@v2
uses: jacobtomlinson/gha-find-replace@v3
with:
include: 'ci/**'
find: "${{ env.UCX_PY_VER }}"
replace: "${{ env.NEW_UCX_PY_VER }}"
regex: false

- name: Update old UCX-Py versions
uses: jacobtomlinson/gha-find-replace@v2
uses: jacobtomlinson/gha-find-replace@v3
with:
include: 'ci/**'
find: "${{ env.OLD_UCX_PY_VER }}"
Expand All @@ -83,7 +83,7 @@ jobs:

- name: Create pull request
if: ${{ env.RAPIDS_VER != env.NEW_RAPIDS_VER && env.UCX_PY_VER != env.NEW_UCX_PY_VER }}
uses: peter-evans/create-pull-request@v3
uses: peter-evans/create-pull-request@v6
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: "Update gpuCI `RAPIDS_VER` to `${{ env.NEW_RAPIDS_VER }}`, `UCX_PY_VER` to `${{ env.NEW_UCX_PY_VER }}`"
Expand Down
60 changes: 60 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
*.7zip
*.a
*.bak
*.bz
*.bz2
*.conda
*.core
*.coverage
*.css
*.csv
*.dat
*.db
dist/
*.dll
*.doc
*.docx
*.docm
.DS_Store
*.dylib
*.egg-info/
*.env
*.exe
*.feather
*.html
htmlcov/
.idea/
*.js
*.json
*.lzma
.mypy_cache/
*.npy
*.o
*.pdf
*.pem
*.ppt
*.pptx
*.pptm
*.pq
*.pub
*.pyc
__pycache__/
.pytest_cache/
*.rda
*.rds
*.Rdata
*.rsa
.ruff_cache/
*.snappy-*.tar.gz
*.so
*.sqlite
*.swp
*.tar.gz
*.tgz
*.tmp
*.whl
*.xls
*.xlsx
*.xlsm
*.zip
*.zstd
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# dask-build-environment

Build environments for various dask related projects on gpuCI.
15 changes: 2 additions & 13 deletions ci/gpuci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,15 @@ case ${BUILD_NAME} in
esac

# Setup BUILD_ARGS
case $RAPIDS_VER in
"24.08")
UCX_PY_VER="0.39"
;;
"24.10")
UCX_PY_VER="0.40"
;;
*)
echo "Unrecognized RAPIDS_VER: ${RAPIDS_VER}"
exit 1
;;
esac
UCX_PY_VER="$(curl -sL https://version.gpuci.io/rapids/${RAPIDS_VER})"
BUILD_IMAGE="gpuci/${BUILD_NAME}"
BUILD_DIR="${WORKSPACE}/${BUILD_NAME}"

# Setup BUILD_TAG and BUILD_ARGS
case ${BUILD_NAME} in
"dask_image") # doesn't depend on RAPIDS / ucx-py for gpuCI
BUILD_TAG="cuda${CUDA_VER}-devel-${LINUX_VER}-py${PYTHON_VER}"
BUILD_ARGS="--squash --build-arg RAPIDS_VER=$RAPIDS_VER --build-arg CUDA_VER=$CUDA_VER --build-arg LINUX_VER=$LINUX_VER --build-arg PYTHON_VER=$PYTHON_VER"
BUILD_ARGS="--squash --build-arg CUDA_VER=$CUDA_VER --build-arg LINUX_VER=$LINUX_VER --build-arg PYTHON_VER=$PYTHON_VER"
;;
*)
BUILD_TAG="${RAPIDS_VER}-cuda${CUDA_VER}-devel-${LINUX_VER}-py${PYTHON_VER}"
Expand Down
14 changes: 7 additions & 7 deletions dask/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ARG CUDA_VER=11.8.0
ARG LINUX_VER=ubuntu20.04
ARG PYTHON_VER=3.10
ARG CUDA_VER=unset
ARG LINUX_VER=unset
ARG PYTHON_VER=unset

FROM rapidsai/miniforge-cuda:cuda$CUDA_VER-base-$LINUX_VER-py$PYTHON_VER

ARG CUDA_VER=11.8.0
ARG PYTHON_VER=3.10
ARG RAPIDS_VER=23.12
ARG UCX_PY_VER=0.35
ARG CUDA_VER=unset
ARG PYTHON_VER=unset
ARG RAPIDS_VER=unset
ARG UCX_PY_VER=unset

COPY environment.yml /rapids.yml
ADD https://raw.githubusercontent.com/dask/dask/main/continuous_integration/environment-$PYTHON_VER.yaml /dask.yml
Expand Down
12 changes: 5 additions & 7 deletions dask_image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
ARG CUDA_VER=11.8.0
ARG LINUX_VER=ubuntu20.04
ARG PYTHON_VER=3.10
ARG CUDA_VER=unset
ARG LINUX_VER=unset
ARG PYTHON_VER=unset

FROM rapidsai/miniforge-cuda:cuda$CUDA_VER-base-$LINUX_VER-py$PYTHON_VER

ARG CUDA_VER=11.8.0
ARG PYTHON_VER=3.10
# RAPIDS_VER isn't used but is part of the matrix so must be included
ARG RAPIDS_VER=23.12
ARG CUDA_VER=unset
ARG PYTHON_VER=unset

COPY environment.yml /rapids.yml
ADD https://raw.githubusercontent.com/dask/dask-image/main/continuous_integration/environment-$PYTHON_VER.yml /dask.yml
Expand Down
14 changes: 7 additions & 7 deletions distributed/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ARG CUDA_VER=11.8.0
ARG LINUX_VER=ubuntu20.04
ARG PYTHON_VER=3.10
ARG CUDA_VER=unset
ARG LINUX_VER=unset
ARG PYTHON_VER=unset

FROM rapidsai/miniforge-cuda:cuda$CUDA_VER-base-$LINUX_VER-py$PYTHON_VER

ARG CUDA_VER=11.8.0
ARG PYTHON_VER=3.10
ARG RAPIDS_VER=23.12
ARG UCX_PY_VER=0.35
ARG CUDA_VER=unset
ARG PYTHON_VER=unset
ARG RAPIDS_VER=unset
ARG UCX_PY_VER=unset

COPY environment.yml /rapids.yml
ADD https://raw.githubusercontent.com/dask/distributed/main/continuous_integration/environment-$PYTHON_VER.yaml /dask.yml
Expand Down

0 comments on commit 65c2149

Please sign in to comment.