Skip to content

Commit

Permalink
ci: update mgard
Browse files Browse the repository at this point in the history
  • Loading branch information
vicentebolea committed Jul 25, 2024
1 parent 793700c commit 579912d
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 101 deletions.
26 changes: 14 additions & 12 deletions .github/workflows/everything.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ jobs:
# Build and test jobs
#######################################

linux_ubuntu:
ubuntu:
needs: [format, git_checks]
if: needs.git_checks.outputs.num_code_changes > 0

runs-on: ubuntu-20.04
container:
image: ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-${{ matrix.compiler }}
image: ghcr.io/ornladios/adios2:ci-spack-${{ matrix.os }}-${{ matrix.compiler }}
options: --shm-size=1g
env:
GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.compiler }}${{ matrix.shared == 'static' && '-static' || ''}}-${{ matrix.parallel }}
Expand All @@ -131,8 +131,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu20.04]
compiler: [gcc8, gcc9, gcc10, gcc11, clang6, clang10]
shared: [shared]
compiler: [gcc8, gcc9, gcc10, clang6, clang10]
parallel: [mpich]
include:
- os: ubuntu20.04
Expand All @@ -149,22 +148,25 @@ jobs:
parallel: serial
- os: ubuntu20.04
compiler: gcc8
parallel: serial
shared: static
parallel: ompi
constrains: build_only
- os: ubuntu20.04
compiler: clang6
compiler: gcc8
shared: static
parallel: ompi
parallel: mpich
constrains: build_only
- os: ubuntu20.04
compiler: gcc8
compiler: clang6
shared: static
parallel: serial
parallel: mpich
constrains: build_only
- os: ubuntu22.04
compiler: rocm
parallel: serial
constrains: build_only
- os: ubuntu22.04
compiler: gcc11
parallel: mpich
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -204,7 +206,7 @@ jobs:
if: ${{ matrix.constrains != 'build_only' }}
run: gha/scripts/ci/gh-actions/run.sh test

linux_el8:
el8:
needs: [format, git_checks]
if: needs.git_checks.outputs.num_code_changes > 0

Expand Down Expand Up @@ -574,7 +576,7 @@ jobs:
#######################################

build_and_test:
needs: [linux_el8, linux_ubuntu, macos, docker, contract]
needs: [el8, ubuntu, macos, docker, contract]
runs-on: ubuntu-latest
steps:
- run: echo "All required jobs complete"
38 changes: 0 additions & 38 deletions scripts/ci/cmake/ci-ubuntu20.04-gcc11-ompi.cmake

This file was deleted.

38 changes: 0 additions & 38 deletions scripts/ci/cmake/ci-ubuntu20.04-gcc11-serial.cmake

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ CMAKE_CXX_COMPILER_LAUNCHER=ccache
CMAKE_C_FLAGS:STRING=-Wall
CMAKE_CXX_FLAGS:STRING=-Wall
CMAKE_Fortran_FLAGS:STRING=-Wall
OpenMP_gomp_LIBRARY:FILEPATH=/spack/var/spack/environments/adios2-ci-serial/.spack-env/view/lib/libgomp.so.1
MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
")
Expand Down
8 changes: 4 additions & 4 deletions scripts/ci/images/build-rocm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ docker build \
--rm \
--build-arg BASE_IMAGE="rocm/dev-ubuntu-22.04" \
-f ./Dockerfile.ci-spack-ubuntu22.04-rocm-base \
-t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-rocm-base \
-t ghcr.io/ornladios/adios2:ci-spack-ubuntu22.04-rocm-base \
.

# Build the base image
docker build \
--progress=plain \
--rm \
--build-arg BASE_IMAGE="ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-rocm-base" \
--build-arg BASE_IMAGE="ghcr.io/ornladios/adios2:ci-spack-ubuntu22.04-rocm-base" \
--build-arg ENABLED_ENVS="serial" \
--build-arg EXTERNAL_PACKAGES="hip rocprim" \
--build-arg E4S_VERSION="24.05" \
--build-arg EXTRA_VARIANTS="+blosc2+kokkos+rocm amdgpu_target=gfx906 ^hip@6" \
-f ./Dockerfile.ci-spack-ubuntu20.04-base \
-t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-rocm \
-t ghcr.io/ornladios/adios2:ci-spack-ubuntu22.04-rocm \
.

# Push images to github container registry
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-rocm
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu22.04-rocm
20 changes: 14 additions & 6 deletions scripts/ci/images/build-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,33 @@
set -ex

# Build the base image
docker build --progress=plain --build-arg EXTRA_VARIANTS="+blosc+ssc" --rm -f ./Dockerfile.ci-spack-ubuntu20.04-base -t ghcr.io/ornladios/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 build --progress=plain --build-arg EXTRA_VARIANTS="+blosc+ssc ^mgard@2023-01-10" --rm -f ./Dockerfile.ci-spack-ubuntu20.04-base -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base .

# 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=9 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc9 .

# 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 .

# Build the ubuntu 22.04 img
docker build \
--progress=plain \
--rm \
--build-arg BASE_IMAGE="ecpe4s/ubuntu22.04-runner-amd64-gcc-11.4:2024.04.19" \
--build-arg E4S_VERSION="24.05" \
--build-arg EXTRA_VARIANTS="+blosc2" \
-f ./Dockerfile.ci-spack-ubuntu20.04-base \
-t ghcr.io/ornladios/adios2:ci-spack-ubuntu22.04-gcc11 \
.

# 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/ornladios/adios2:ci-spack-ubuntu22.04-gcc11
4 changes: 1 addition & 3 deletions scripts/ci/images/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ packages:
all:
target: [haswell]
adios2:
require: '+bzip2+zfp+sz+png+sst+dataman+hdf5+python+fortran'
require: '+bzip2+mgard+zfp+sz+png+sst+dataman+hdf5+python+fortran'
mpich:
require: 'device=ch3:sock'
openmpi:
require: '@4.1'
mgard:
require: '@2023-01-10'

0 comments on commit 579912d

Please sign in to comment.