Add a clang 6 build/test

ornladios · Jul 7, 2023 · 5b4dc07 · 5b4dc07
1 parent 7009e0b
commit 5b4dc07
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 4 deletions.
diff --git a/.github/workflows/everything.yml b/.github/workflows/everything.yml
@@ -110,7 +110,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu20.04]
-        compiler: [gcc8, gcc9, gcc10, gcc11, clang10]
+        compiler: [gcc8, gcc9, gcc10, gcc11, clang6, clang10]
         parallel: [serial, mpi]
         include:
           - os: ubuntu20.04

diff --git a/scripts/ci/cmake-v2/ci-ubuntu20.04-clang6-mpi.cmake b/scripts/ci/cmake-v2/ci-ubuntu20.04-clang6-mpi.cmake
@@ -0,0 +1,41 @@
+include(ProcessorCount)
+ProcessorCount(NCPUS)
+math(EXPR N2CPUS "${NCPUS}*2")
+
+set(ENV{CC}  clang-6.0)
+set(ENV{CXX} clang++-6.0)
+set(ENV{FC}  gfortran-11)
+
+execute_process(
+  COMMAND "python3-config" "--prefix"
+  OUTPUT_VARIABLE PY_ROOT
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+set(dashboard_cache "
+ADIOS2_USE_BZip2:BOOL=ON
+ADIOS2_USE_Blosc:BOOL=ON
+ADIOS2_USE_DataMan:BOOL=ON
+ADIOS2_USE_Fortran:BOOL=ON
+ADIOS2_USE_HDF5:BOOL=ON
+ADIOS2_USE_MPI:BOOL=ON
+ADIOS2_USE_Python:BOOL=ON
+ADIOS2_USE_SZ:BOOL=ON
+ADIOS2_USE_ZeroMQ:STRING=ON
+ADIOS2_USE_ZFP:BOOL=ON
+
+Python_ROOT_DIR:PATH=${PY_ROOT}
+Python_FIND_STRATEGY:STRING=LOCATION
+Python_FIND_FRAMEWORK:STRING=FIRST
+
+CMAKE_C_FLAGS:STRING=-Wall
+CMAKE_CXX_FLAGS:STRING=-Wall
+CMAKE_Fortran_FLAGS:STRING=-Wall
+
+MPIEXEC_EXTRA_FLAGS:STRING=--allow-run-as-root --oversubscribe
+MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
+")
+
+set(CTEST_TEST_ARGS PARALLEL_LEVEL 1)
+set(CTEST_CMAKE_GENERATOR "Ninja")
+list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
+include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)
diff --git a/scripts/ci/cmake-v2/ci-ubuntu20.04-clang6-serial.cmake b/scripts/ci/cmake-v2/ci-ubuntu20.04-clang6-serial.cmake
@@ -0,0 +1,33 @@
+set(ENV{CC}  clang-6.0)
+set(ENV{CXX} clang++-6.0)
+set(ENV{FC}  gfortran-11)
+
+execute_process(
+  COMMAND "python3-config" "--prefix"
+  OUTPUT_VARIABLE PY_ROOT
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+set(dashboard_cache "
+ADIOS2_USE_BZip2:BOOL=ON
+ADIOS2_USE_Blosc:BOOL=ON
+ADIOS2_USE_DataMan:BOOL=ON
+ADIOS2_USE_Fortran:BOOL=ON
+ADIOS2_USE_HDF5:BOOL=ON
+ADIOS2_USE_MPI:BOOL=OFF
+ADIOS2_USE_Python:BOOL=ON
+ADIOS2_USE_SZ:BOOL=ON
+ADIOS2_USE_ZeroMQ:STRING=ON
+ADIOS2_USE_ZFP:BOOL=ON
+
+Python_ROOT_DIR:PATH=${PY_ROOT}
+Python_FIND_STRATEGY:STRING=LOCATION
+Python_FIND_FRAMEWORK:STRING=FIRST
+
+CMAKE_C_FLAGS:STRING=-Wall
+CMAKE_CXX_FLAGS:STRING=-Wall
+CMAKE_Fortran_FLAGS:STRING=-Wall
+")
+
+set(CTEST_CMAKE_GENERATOR "Ninja")
+list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
+include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)
diff --git a/scripts/ci/images-v2/Dockerfile.ci-spack-ubuntu20.04-clang b/scripts/ci/images-v2/Dockerfile.ci-spack-ubuntu20.04-clang
@@ -1,5 +1,6 @@
 FROM adios2:ci-spack-ubuntu20.04-base
+ARG CLANG_VERSION=10
 
 RUN apt-get update && apt-get install -y \
-    clang-10 && \
+    clang-${CLANG_VERSION} && \
     rm -rf /var/lib/apt/lists/*
diff --git a/scripts/ci/images-v2/build-ubuntu.sh b/scripts/ci/images-v2/build-ubuntu.sh
@@ -13,19 +13,22 @@ docker build --rm --build-arg GCC_VERSION=8 -f ./Dockerfile.ci-spack-ubuntu20.04
 docker build --rm --build-arg GCC_VERSION=9 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t adios2:ci-spack-ubuntu20.04-gcc9 .
 docker build --rm --build-arg GCC_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t adios2:ci-spack-ubuntu20.04-gcc10 .
 
-# Build the clang10 image
-docker build --rm -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t adios2:ci-spack-ubuntu20.04-clang10 .
+# Build the clang6 and clang10 images
+docker build --rm --build-arg CLANG_VERSION=6.0 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t adios2:ci-spack-ubuntu20.04-clang6 .
+docker build --rm --build-arg CLANG_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t adios2:ci-spack-ubuntu20.04-clang10 .
 
 # Tag test images for pushing (TODO: change organization before merge)
 docker tag adios2:ci-spack-ubuntu20.04-gcc8 ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8
 docker tag adios2:ci-spack-ubuntu20.04-gcc9 ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc9
 docker tag adios2:ci-spack-ubuntu20.04-gcc10 ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc10
 docker tag adios2:ci-spack-ubuntu20.04-gcc11 ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc11
+docker tag adios2:ci-spack-ubuntu20.04-clang6 ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang6
 docker tag adios2:ci-spack-ubuntu20.04-clang10 ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang10
 
 # Push (TODO: change organization before merge)
 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
diff --git a/scripts/ci/setup-run/ci-ubuntu20.04-clang6.sh b/scripts/ci/setup-run/ci-ubuntu20.04-clang6.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+spack env activate "adios2-ci-${GH_YML_MATRIX_PARALLEL}"