Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: ci: Improve performance of mpich tests in CI #3828

Closed
wants to merge 1 commit into from
Closed

WIP: ci: Improve performance of mpich tests in CI #3828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/everything.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:

runs-on: ubuntu-20.04
container:
image: ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-${{ matrix.compiler }}
image: ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu20.04-${{ matrix.compiler }}
options: --shm-size=1g
env:
GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.compiler }}${{ matrix.shared == 'static' && '-static' || ''}}-${{ matrix.parallel }}
Expand Down
16 changes: 8 additions & 8 deletions scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ RUN . /spack/share/spack/setup-env.sh && \
spack config add "config:checksum:false" && \
spack config add "config:build_jobs:$(nproc)" && \
spack config add "concretizer:unify:false" && \
spack env create adios2-ci-mpich && \
vicentebolea marked this conversation as resolved.
Show resolved Hide resolved
spack -e adios2-ci-mpich add ${ADIOS_SPEC_MPICH} && \
spack -e adios2-ci-mpich concretize && \
spack -e adios2-ci-mpich install \
--include-build-deps \
--no-check-signature \
--fail-fast \
--only dependencies && \
spack env create adios2-ci-serial && \
spack -e adios2-ci-serial add ${ADIOS_SPEC_NO_MPI} && \
spack -e adios2-ci-serial concretize && \
Expand All @@ -27,14 +35,6 @@ RUN . /spack/share/spack/setup-env.sh && \
--no-check-signature \
--fail-fast \
--only dependencies && \
spack env create adios2-ci-mpich && \
spack -e adios2-ci-mpich add ${ADIOS_SPEC_MPICH} && \
spack -e adios2-ci-mpich concretize && \
spack -e adios2-ci-mpich install \
--include-build-deps \
--no-check-signature \
--fail-fast \
--only dependencies && \
spack clean -a && \
echo "source /spack/share/spack/setup-env.sh" >> /etc/profile.d/zz-spack.sh

Expand Down
28 changes: 14 additions & 14 deletions scripts/ci/images/build-ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
set -ex

# Build the base image
docker build --rm -f ./Dockerfile.ci-spack-ubuntu20.04-base -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base .
docker build --rm -f ./Dockerfile.ci-spack-ubuntu20.04-base -t ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu20.04-base .

# Which is also the gcc11 image
docker tag ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc11
docker tag ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu20.04-base ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu20.04-gcc11

# Build the gcc8, gcc9, and gcc10 images
docker build --rm --build-arg GCC_VERSION=8 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8 .
docker build --rm --build-arg GCC_VERSION=9 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc9 .
docker build --rm --build-arg GCC_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc10 .
docker build --rm --build-arg GCC_VERSION=8 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu20.04-gcc8 .
docker build --rm --build-arg GCC_VERSION=9 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu20.04-gcc9 .
docker build --rm --build-arg GCC_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu20.04-gcc10 .

# Build the clang6 and clang10 images
docker build --rm --build-arg CLANG_VERSION=6.0 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang6 .
docker build --rm --build-arg CLANG_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang10 .
docker build --rm --build-arg CLANG_VERSION=6.0 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu20.04-clang6 .
docker build --rm --build-arg CLANG_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu20.04-clang10 .

# Push images to github container registry
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc9
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc10
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc11
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang6
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang10
docker push ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu20.04-base
docker push ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu20.04-gcc8
docker push ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu20.04-gcc9
docker push ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu20.04-gcc10
docker push ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu20.04-gcc11
docker push ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu20.04-clang6
docker push ghcr.io/scottwittenburg/adios2:ci-spack-ubuntu20.04-clang10
2 changes: 0 additions & 2 deletions scripts/ci/images/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ packages:
target: [haswell]
adios2:
require: '+blosc+bzip2+zfp+sz+png+sst+dataman+ssc+hdf5+python+fortran'
mpich:
require: 'device=ch3 netmod=tcp'
openmpi:
require: '@4.1'
Loading