From 6384d5259e31798563d916ca1748711229fffd7c Mon Sep 17 00:00:00 2001 From: Jacob Domagala Date: Wed, 3 Jul 2024 23:47:09 +0200 Subject: [PATCH] #350: Change env variables used for CI to use magistrate instead of checkpoint --- .../dockerimage-clang-10-ubuntu-mpich.yml | 2 +- .../dockerimage-clang-11-ubuntu-mpich-vt.yml | 2 +- .../dockerimage-clang-11-ubuntu-mpich.yml | 2 +- .../dockerimage-clang-12-ubuntu-mpich.yml | 2 +- .../dockerimage-clang-13-ubuntu-mpich.yml | 2 +- .../dockerimage-clang-14-ubuntu-mpich.yml | 2 +- .../dockerimage-clang-8-ubuntu-mpich.yml | 2 +- .../dockerimage-clang-9-ubuntu-mpich.yml | 2 +- .../dockerimage-gcc-10-ubuntu-mpich.yml | 2 +- .../dockerimage-gcc-8-ubuntu-mpich.yml | 2 +- .../dockerimage-gcc-9-ubuntu-mpich.yml | 2 +- .../dockerimage-nvcc-11-ubuntu-mpich.yml | 2 +- ci/build_against_vt.sh | 6 ++-- ci/build_cpp.sh | 20 +++++------ ci/docker/ubuntu-18.04-clang-cpp.dockerfile | 34 +++++++++---------- ci/docker/ubuntu-18.04-gnu-cpp.dockerfile | 34 +++++++++---------- ci/docker/ubuntu-18.04-intel-cpp.dockerfile | 34 +++++++++---------- ci/docker/ubuntu-20.04-gnu-docs.dockerfile | 4 +-- ci/docker/ubuntu-20.04-nvidia-cpp.dockerfile | 34 +++++++++---------- ci/docker/ubuntu-22.04-clang-cpp.dockerfile | 34 +++++++++---------- docker-compose.yml | 20 +++++------ docs/md/checkpoint_learn_build.md | 20 +++++------ scripts/workflow-template.yml | 2 +- 23 files changed, 133 insertions(+), 133 deletions(-) diff --git a/.github/workflows/dockerimage-clang-10-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-10-ubuntu-mpich.yml index 05e4f190..1ae3078c 100644 --- a/.github/workflows/dockerimage-clang-10-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-10-ubuntu-mpich.yml @@ -29,7 +29,7 @@ jobs: CHECKPOINT_TESTS: 1 CHECKPOINT_EXAMPLES: 1 CHECKPOINT_MPI: 1 - CHECKPOINT_WARNINGS_AS_ERRORS: 1 + MAGISTRATE_WARNINGS_AS_ERRORS: 1 CHECKPOINT_DOCS: 0 CHECKPOINT_ASAN: 1 CHECKPOINT_UBSAN: 0 diff --git a/.github/workflows/dockerimage-clang-11-ubuntu-mpich-vt.yml b/.github/workflows/dockerimage-clang-11-ubuntu-mpich-vt.yml index 0ba4d460..5857bddb 100644 --- a/.github/workflows/dockerimage-clang-11-ubuntu-mpich-vt.yml +++ b/.github/workflows/dockerimage-clang-11-ubuntu-mpich-vt.yml @@ -25,7 +25,7 @@ jobs: CHECKPOINT_TESTS: 1 CHECKPOINT_EXAMPLES: 1 CHECKPOINT_MPI: 1 - CHECKPOINT_WARNINGS_AS_ERRORS: 1 + MAGISTRATE_WARNINGS_AS_ERRORS: 1 CHECKPOINT_DOCS: 0 CHECKPOINT_ASAN: 1 CHECKPOINT_UBSAN: 1 diff --git a/.github/workflows/dockerimage-clang-11-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-11-ubuntu-mpich.yml index 4590120d..52c0eaa7 100644 --- a/.github/workflows/dockerimage-clang-11-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-11-ubuntu-mpich.yml @@ -29,7 +29,7 @@ jobs: CHECKPOINT_TESTS: 1 CHECKPOINT_EXAMPLES: 1 CHECKPOINT_MPI: 1 - CHECKPOINT_WARNINGS_AS_ERRORS: 1 + MAGISTRATE_WARNINGS_AS_ERRORS: 1 CHECKPOINT_DOCS: 0 CHECKPOINT_ASAN: 1 CHECKPOINT_UBSAN: 0 diff --git a/.github/workflows/dockerimage-clang-12-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-12-ubuntu-mpich.yml index bc362bb8..5242df5f 100644 --- a/.github/workflows/dockerimage-clang-12-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-12-ubuntu-mpich.yml @@ -29,7 +29,7 @@ jobs: CHECKPOINT_TESTS: 1 CHECKPOINT_EXAMPLES: 1 CHECKPOINT_MPI: 1 - CHECKPOINT_WARNINGS_AS_ERRORS: 1 + MAGISTRATE_WARNINGS_AS_ERRORS: 1 CHECKPOINT_DOCS: 0 CHECKPOINT_ASAN: 1 CHECKPOINT_UBSAN: 0 diff --git a/.github/workflows/dockerimage-clang-13-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-13-ubuntu-mpich.yml index 8d502457..42d50865 100644 --- a/.github/workflows/dockerimage-clang-13-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-13-ubuntu-mpich.yml @@ -29,7 +29,7 @@ jobs: CHECKPOINT_TESTS: 1 CHECKPOINT_EXAMPLES: 1 CHECKPOINT_MPI: 1 - CHECKPOINT_WARNINGS_AS_ERRORS: 1 + MAGISTRATE_WARNINGS_AS_ERRORS: 1 CHECKPOINT_DOCS: 0 CHECKPOINT_ASAN: 1 CHECKPOINT_UBSAN: 0 diff --git a/.github/workflows/dockerimage-clang-14-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-14-ubuntu-mpich.yml index faa5cdc0..b7731b63 100644 --- a/.github/workflows/dockerimage-clang-14-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-14-ubuntu-mpich.yml @@ -29,7 +29,7 @@ jobs: CHECKPOINT_TESTS: 1 CHECKPOINT_EXAMPLES: 1 CHECKPOINT_MPI: 1 - CHECKPOINT_WARNINGS_AS_ERRORS: 1 + MAGISTRATE_WARNINGS_AS_ERRORS: 1 CHECKPOINT_DOCS: 0 CHECKPOINT_ASAN: 1 CHECKPOINT_UBSAN: 0 diff --git a/.github/workflows/dockerimage-clang-8-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-8-ubuntu-mpich.yml index a2512954..9ff31d6d 100644 --- a/.github/workflows/dockerimage-clang-8-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-8-ubuntu-mpich.yml @@ -29,7 +29,7 @@ jobs: CHECKPOINT_TESTS: 1 CHECKPOINT_EXAMPLES: 1 CHECKPOINT_MPI: 1 - CHECKPOINT_WARNINGS_AS_ERRORS: 1 + MAGISTRATE_WARNINGS_AS_ERRORS: 1 CHECKPOINT_DOCS: 0 CHECKPOINT_ASAN: 0 CHECKPOINT_UBSAN: 1 diff --git a/.github/workflows/dockerimage-clang-9-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-9-ubuntu-mpich.yml index 241076a8..d0ded842 100644 --- a/.github/workflows/dockerimage-clang-9-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-9-ubuntu-mpich.yml @@ -29,7 +29,7 @@ jobs: CHECKPOINT_TESTS: 1 CHECKPOINT_EXAMPLES: 1 CHECKPOINT_MPI: 1 - CHECKPOINT_WARNINGS_AS_ERRORS: 1 + MAGISTRATE_WARNINGS_AS_ERRORS: 1 CHECKPOINT_DOCS: 0 CHECKPOINT_ASAN: 1 CHECKPOINT_UBSAN: 0 diff --git a/.github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml index 13294d85..df85cafc 100644 --- a/.github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml @@ -29,7 +29,7 @@ jobs: CHECKPOINT_TESTS: 1 CHECKPOINT_EXAMPLES: 1 CHECKPOINT_MPI: 1 - CHECKPOINT_WARNINGS_AS_ERRORS: 1 + MAGISTRATE_WARNINGS_AS_ERRORS: 1 CHECKPOINT_DOCS: 0 CHECKPOINT_ASAN: 1 CHECKPOINT_UBSAN: 0 diff --git a/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml index 2393640f..936b3e83 100644 --- a/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml @@ -29,7 +29,7 @@ jobs: CHECKPOINT_TESTS: 1 CHECKPOINT_EXAMPLES: 1 CHECKPOINT_MPI: 1 - CHECKPOINT_WARNINGS_AS_ERRORS: 1 + MAGISTRATE_WARNINGS_AS_ERRORS: 1 CHECKPOINT_DOCS: 0 CHECKPOINT_ASAN: 1 CHECKPOINT_UBSAN: 0 diff --git a/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml index 0840a3ab..97d88d6d 100644 --- a/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml @@ -29,7 +29,7 @@ jobs: CHECKPOINT_TESTS: 1 CHECKPOINT_EXAMPLES: 1 CHECKPOINT_MPI: 1 - CHECKPOINT_WARNINGS_AS_ERRORS: 1 + MAGISTRATE_WARNINGS_AS_ERRORS: 1 CHECKPOINT_DOCS: 0 CHECKPOINT_ASAN: 1 CHECKPOINT_UBSAN: 0 diff --git a/.github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml b/.github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml index ef1ca55a..557e2485 100644 --- a/.github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml @@ -29,7 +29,7 @@ jobs: CHECKPOINT_TESTS: 1 CHECKPOINT_EXAMPLES: 1 CHECKPOINT_MPI: 1 - CHECKPOINT_WARNINGS_AS_ERRORS: 1 + MAGISTRATE_WARNINGS_AS_ERRORS: 1 CHECKPOINT_DOCS: 0 CHECKPOINT_ASAN: 0 CHECKPOINT_UBSAN: 0 diff --git a/ci/build_against_vt.sh b/ci/build_against_vt.sh index 09313824..78cf592f 100755 --- a/ci/build_against_vt.sh +++ b/ci/build_against_vt.sh @@ -40,9 +40,9 @@ cd build rm -Rf ./* cmake -G "${CMAKE_GENERATOR:-Ninja}" \ -DCMAKE_INSTALL_PREFIX="${CHECKPOINT_BUILD}/install" \ - -Dcheckpoint_asan_enabled="${CHECKPOINT_ASAN_ENABLED:-1}" \ - -Dcheckpoint_ubsan_enabled="${CHECKPOINT_UBSAN_ENABLED:-1}" \ - -Dcheckpoint_serialization_error_checking_enabled="${CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED:-1}" \ + -Dcheckpoint_asan_enabled="${MAGISTRATE_ASAN_ENABLED:-1}" \ + -Dcheckpoint_ubsan_enabled="${MAGISTRATE_UBSAN_ENABLED:-1}" \ + -Dcheckpoint_serialization_error_checking_enabled="${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED:-1}" \ "${CHECKPOINT}" cmake --build . --target install diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 3f92c9ba..4f3c9b46 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -5,7 +5,7 @@ set -ex source_dir=${1} build_dir=${2} -if test "${CHECKPOINT_DOXYGEN_ENABLED:-0}" -eq 1 +if test "${MAGISTRATE_DOXYGEN_ENABLED:-0}" -eq 1 then token=${3} else @@ -33,14 +33,14 @@ fi cmake -G "${CMAKE_GENERATOR:-Ninja}" \ -DCMAKE_EXPORT_COMPILE_COMMANDS=1 \ - -Dcheckpoint_doxygen_enabled="${CHECKPOINT_DOXYGEN_ENABLED:-0}" \ - -Dcheckpoint_tests_enabled="${CHECKPOINT_TESTS_ENABLED:-1}" \ - -Dcheckpoint_examples_enabled="${CHECKPOINT_EXAMPLES_ENABLED:-1}" \ - -Dcheckpoint_warnings_as_errors="${CHECKPOINT_WARNINGS_AS_ERRORS:-0}" \ - -Dcheckpoint_mpi_enabled="${CHECKPOINT_MPI_ENABLED:-1}" \ - -Dcheckpoint_asan_enabled="${CHECKPOINT_ASAN_ENABLED:-0}" \ - -Dcheckpoint_ubsan_enabled="${CHECKPOINT_UBSAN_ENABLED:-0}" \ - -Dcheckpoint_serialization_error_checking_enabled="${CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED:-$is_debug}" \ + -Dmagistrate_doxygen_enabled="${MAGISTRATE_DOXYGEN_ENABLED:-0}" \ + -Dmagistrate_tests_enabled="${MAGISTRATE_TESTS_ENABLED:-1}" \ + -Dmagistrate_examples_enabled="${MAGISTRATE_EXAMPLES_ENABLED:-1}" \ + -Dmagistrate_warnings_as_errors="${MAGISTRATE_WARNINGS_AS_ERRORS:-0}" \ + -Dmagistrate_mpi_enabled="${MAGISTRATE_MPI_ENABLED:-1}" \ + -Dmagistrate_asan_enabled="${MAGISTRATE_ASAN_ENABLED:-0}" \ + -Dmagistrate_ubsan_enabled="${MAGISTRATE_UBSAN_ENABLED:-0}" \ + -Dmagistrate_serialization_error_checking_enabled="${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED:-$is_debug}" \ -DCMAKE_BUILD_TYPE="${cmake_build_type}" \ -DCMAKE_CXX_COMPILER="${CXX:-c++}" \ -DCMAKE_C_COMPILER="${CC:-cc}" \ @@ -53,7 +53,7 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \ -DKokkosKernels_ROOT="${KOKKOS_KERNELS_ROOT}" \ "$CHECKPOINT" -if test "${CHECKPOINT_DOXYGEN_ENABLED:-0}" -eq 1 +if test "${MAGISTRATE_DOXYGEN_ENABLED:-0}" -eq 1 then MCSS=$PWD/m.css GHPAGE=$PWD/DARMA-tasking.github.io diff --git a/ci/docker/ubuntu-18.04-clang-cpp.dockerfile b/ci/docker/ubuntu-18.04-clang-cpp.dockerfile index 51dcc564..c60293df 100644 --- a/ci/docker/ubuntu-18.04-clang-cpp.dockerfile +++ b/ci/docker/ubuntu-18.04-clang-cpp.dockerfile @@ -67,23 +67,23 @@ ENV MPI_EXTRA_FLAGS="" \ FROM base as build COPY . /checkpoint -ARG CHECKPOINT_DOXYGEN_ENABLED -ARG CHECKPOINT_TESTS_ENABLED -ARG CHECKPOINT_EXAMPLES_ENABLED -ARG CHECKPOINT_WARNINGS_AS_ERRORS -ARG CHECKPOINT_MPI_ENABLED -ARG CHECKPOINT_ASAN_ENABLED -ARG CHECKPOINT_UBSAN_ENABLED -ARG CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED - -ENV CHECKPOINT_DOXYGEN_ENABLED=${CHECKPOINT_DOXYGEN_ENABLED} \ - CHECKPOINT_TESTS_ENABLED=${CHECKPOINT_TESTS_ENABLED} \ - CHECKPOINT_EXAMPLES_ENABLED=${CHECKPOINT_EXAMPLES_ENABLED} \ - CHECKPOINT_WARNINGS_AS_ERRORS=${CHECKPOINT_WARNINGS_AS_ERRORS} \ - CHECKPOINT_MPI_ENABLED=${CHECKPOINT_MPI_ENABLED} \ - CHECKPOINT_ASAN_ENABLED=${CHECKPOINT_ASAN_ENABLED} \ - CHECKPOINT_UBSAN_ENABLED=${CHECKPOINT_UBSAN_ENABLED} \ - CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED=${CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED} \ +ARG MAGISTRATE_DOXYGEN_ENABLED +ARG MAGISTRATE_TESTS_ENABLED +ARG MAGISTRATE_EXAMPLES_ENABLED +ARG MAGISTRATE_WARNINGS_AS_ERRORS +ARG MAGISTRATE_MPI_ENABLED +ARG MAGISTRATE_ASAN_ENABLED +ARG MAGISTRATE_UBSAN_ENABLED +ARG MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED + +ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \ + MAGISTRATE_TESTS_ENABLED=${MAGISTRATE_TESTS_ENABLED} \ + MAGISTRATE_EXAMPLES_ENABLED=${MAGISTRATE_EXAMPLES_ENABLED} \ + MAGISTRATE_WARNINGS_AS_ERRORS=${MAGISTRATE_WARNINGS_AS_ERRORS} \ + MAGISTRATE_MPI_ENABLED=${MAGISTRATE_MPI_ENABLED} \ + MAGISTRATE_ASAN_ENABLED=${MAGISTRATE_ASAN_ENABLED} \ + MAGISTRATE_UBSAN_ENABLED=${MAGISTRATE_UBSAN_ENABLED} \ + MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED=${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED} \ CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} RUN /checkpoint/ci/build_cpp.sh /checkpoint /build diff --git a/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile b/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile index e9b469cf..88df3ec3 100644 --- a/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile +++ b/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile @@ -75,23 +75,23 @@ RUN apt-get update -y -q && \ FROM base as build COPY . /checkpoint -ARG CHECKPOINT_DOXYGEN_ENABLED -ARG CHECKPOINT_TESTS_ENABLED -ARG CHECKPOINT_EXAMPLES_ENABLED -ARG CHECKPOINT_WARNINGS_AS_ERRORS -ARG CHECKPOINT_MPI_ENABLED -ARG CHECKPOINT_ASAN_ENABLED -ARG CHECKPOINT_UBSAN_ENABLED -ARG CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED - -ENV CHECKPOINT_DOXYGEN_ENABLED=${CHECKPOINT_DOXYGEN_ENABLED} \ - CHECKPOINT_TESTS_ENABLED=${CHECKPOINT_TESTS_ENABLED} \ - CHECKPOINT_EXAMPLES_ENABLED=${CHECKPOINT_EXAMPLES_ENABLED} \ - CHECKPOINT_WARNINGS_AS_ERRORS=${CHECKPOINT_WARNINGS_AS_ERRORS} \ - CHECKPOINT_MPI_ENABLED=${CHECKPOINT_MPI_ENABLED} \ - CHECKPOINT_ASAN_ENABLED=${CHECKPOINT_ASAN_ENABLED} \ - CHECKPOINT_UBSAN_ENABLED=${CHECKPOINT_UBSAN_ENABLED} \ - CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED=${CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED} \ +ARG MAGISTRATE_DOXYGEN_ENABLED +ARG MAGISTRATE_TESTS_ENABLED +ARG MAGISTRATE_EXAMPLES_ENABLED +ARG MAGISTRATE_WARNINGS_AS_ERRORS +ARG MAGISTRATE_MPI_ENABLED +ARG MAGISTRATE_ASAN_ENABLED +ARG MAGISTRATE_UBSAN_ENABLED +ARG MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED + +ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \ + MAGISTRATE_TESTS_ENABLED=${MAGISTRATE_TESTS_ENABLED} \ + MAGISTRATE_EXAMPLES_ENABLED=${MAGISTRATE_EXAMPLES_ENABLED} \ + MAGISTRATE_WARNINGS_AS_ERRORS=${MAGISTRATE_WARNINGS_AS_ERRORS} \ + MAGISTRATE_MPI_ENABLED=${MAGISTRATE_MPI_ENABLED} \ + MAGISTRATE_ASAN_ENABLED=${MAGISTRATE_ASAN_ENABLED} \ + MAGISTRATE_UBSAN_ENABLED=${MAGISTRATE_UBSAN_ENABLED} \ + MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED=${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED} \ CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} RUN /checkpoint/ci/build_cpp.sh /checkpoint /build diff --git a/ci/docker/ubuntu-18.04-intel-cpp.dockerfile b/ci/docker/ubuntu-18.04-intel-cpp.dockerfile index 9b5a823f..3a700350 100644 --- a/ci/docker/ubuntu-18.04-intel-cpp.dockerfile +++ b/ci/docker/ubuntu-18.04-intel-cpp.dockerfile @@ -68,23 +68,23 @@ ENV MPI_EXTRA_FLAGS="" \ FROM base as build COPY . /checkpoint -ARG CHECKPOINT_DOXYGEN_ENABLED -ARG CHECKPOINT_TESTS_ENABLED -ARG CHECKPOINT_EXAMPLES_ENABLED -ARG CHECKPOINT_WARNINGS_AS_ERRORS -ARG CHECKPOINT_MPI_ENABLED -ARG CHECKPOINT_ASAN_ENABLED -ARG CHECKPOINT_UBSAN_ENABLED -ARG CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED - -ENV CHECKPOINT_DOXYGEN_ENABLED=${CHECKPOINT_DOXYGEN_ENABLED} \ - CHECKPOINT_TESTS_ENABLED=${CHECKPOINT_TESTS_ENABLED} \ - CHECKPOINT_EXAMPLES_ENABLED=${CHECKPOINT_EXAMPLES_ENABLED} \ - CHECKPOINT_WARNINGS_AS_ERRORS=${CHECKPOINT_WARNINGS_AS_ERRORS} \ - CHECKPOINT_MPI_ENABLED=${CHECKPOINT_MPI_ENABLED} \ - CHECKPOINT_ASAN_ENABLED=${CHECKPOINT_ASAN_ENABLED} \ - CHECKPOINT_UBSAN_ENABLED=${CHECKPOINT_UBSAN_ENABLED} \ - CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED=${CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED} \ +ARG MAGISTRATE_DOXYGEN_ENABLED +ARG MAGISTRATE_TESTS_ENABLED +ARG MAGISTRATE_EXAMPLES_ENABLED +ARG MAGISTRATE_WARNINGS_AS_ERRORS +ARG MAGISTRATE_MPI_ENABLED +ARG MAGISTRATE_ASAN_ENABLED +ARG MAGISTRATE_UBSAN_ENABLED +ARG MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED + +ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \ + MAGISTRATE_TESTS_ENABLED=${MAGISTRATE_TESTS_ENABLED} \ + MAGISTRATE_EXAMPLES_ENABLED=${MAGISTRATE_EXAMPLES_ENABLED} \ + MAGISTRATE_WARNINGS_AS_ERRORS=${MAGISTRATE_WARNINGS_AS_ERRORS} \ + MAGISTRATE_MPI_ENABLED=${MAGISTRATE_MPI_ENABLED} \ + MAGISTRATE_ASAN_ENABLED=${MAGISTRATE_ASAN_ENABLED} \ + MAGISTRATE_UBSAN_ENABLED=${MAGISTRATE_UBSAN_ENABLED} \ + MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED=${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED} \ CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} RUN /checkpoint/ci/build_cpp.sh /checkpoint /build diff --git a/ci/docker/ubuntu-20.04-gnu-docs.dockerfile b/ci/docker/ubuntu-20.04-gnu-docs.dockerfile index 8b143f4c..76dc885d 100644 --- a/ci/docker/ubuntu-20.04-gnu-docs.dockerfile +++ b/ci/docker/ubuntu-20.04-gnu-docs.dockerfile @@ -63,10 +63,10 @@ FROM base as build COPY . /checkpoint ARG token -ARG CHECKPOINT_DOXYGEN_ENABLED +ARG MAGISTRATE_DOXYGEN_ENABLED ARG CMAKE_BUILD_TYPE -ENV CHECKPOINT_DOXYGEN_ENABLED=${CHECKPOINT_DOXYGEN_ENABLED} \ +ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \ CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} RUN /checkpoint/ci/build_cpp.sh /checkpoint /build "${token}" diff --git a/ci/docker/ubuntu-20.04-nvidia-cpp.dockerfile b/ci/docker/ubuntu-20.04-nvidia-cpp.dockerfile index 7acb5f4b..fb99355c 100644 --- a/ci/docker/ubuntu-20.04-nvidia-cpp.dockerfile +++ b/ci/docker/ubuntu-20.04-nvidia-cpp.dockerfile @@ -65,23 +65,23 @@ ENV KOKKOS_KERNELS_ROOT=/pkgs/kokkos-kernels/install FROM base as build COPY . /checkpoint -ARG CHECKPOINT_DOXYGEN_ENABLED -ARG CHECKPOINT_TESTS_ENABLED -ARG CHECKPOINT_EXAMPLES_ENABLED -ARG CHECKPOINT_WARNINGS_AS_ERRORS -ARG CHECKPOINT_MPI_ENABLED -ARG CHECKPOINT_ASAN_ENABLED -ARG CHECKPOINT_UBSAN_ENABLED -ARG CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED - -ENV CHECKPOINT_DOXYGEN_ENABLED=${CHECKPOINT_DOXYGEN_ENABLED} \ - CHECKPOINT_TESTS_ENABLED=${CHECKPOINT_TESTS_ENABLED} \ - CHECKPOINT_EXAMPLES_ENABLED=${CHECKPOINT_EXAMPLES_ENABLED} \ - CHECKPOINT_WARNINGS_AS_ERRORS=${CHECKPOINT_WARNINGS_AS_ERRORS} \ - CHECKPOINT_MPI_ENABLED=${CHECKPOINT_MPI_ENABLED} \ - CHECKPOINT_ASAN_ENABLED=${CHECKPOINT_ASAN_ENABLED} \ - CHECKPOINT_UBSAN_ENABLED=${CHECKPOINT_UBSAN_ENABLED} \ - CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED=${CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED} \ +ARG MAGISTRATE_DOXYGEN_ENABLED +ARG MAGISTRATE_TESTS_ENABLED +ARG MAGISTRATE_EXAMPLES_ENABLED +ARG MAGISTRATE_WARNINGS_AS_ERRORS +ARG MAGISTRATE_MPI_ENABLED +ARG MAGISTRATE_ASAN_ENABLED +ARG MAGISTRATE_UBSAN_ENABLED +ARG MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED + +ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \ + MAGISTRATE_TESTS_ENABLED=${MAGISTRATE_TESTS_ENABLED} \ + MAGISTRATE_EXAMPLES_ENABLED=${MAGISTRATE_EXAMPLES_ENABLED} \ + MAGISTRATE_WARNINGS_AS_ERRORS=${MAGISTRATE_WARNINGS_AS_ERRORS} \ + MAGISTRATE_MPI_ENABLED=${MAGISTRATE_MPI_ENABLED} \ + MAGISTRATE_ASAN_ENABLED=${MAGISTRATE_ASAN_ENABLED} \ + MAGISTRATE_UBSAN_ENABLED=${MAGISTRATE_UBSAN_ENABLED} \ + MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED=${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED} \ CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} RUN /checkpoint/ci/build_cpp.sh /checkpoint /build diff --git a/ci/docker/ubuntu-22.04-clang-cpp.dockerfile b/ci/docker/ubuntu-22.04-clang-cpp.dockerfile index 8a49b31f..0bbeb1b1 100644 --- a/ci/docker/ubuntu-22.04-clang-cpp.dockerfile +++ b/ci/docker/ubuntu-22.04-clang-cpp.dockerfile @@ -69,23 +69,23 @@ ENV MPI_EXTRA_FLAGS="" \ FROM base as build COPY . /checkpoint -ARG CHECKPOINT_DOXYGEN_ENABLED -ARG CHECKPOINT_TESTS_ENABLED -ARG CHECKPOINT_EXAMPLES_ENABLED -ARG CHECKPOINT_WARNINGS_AS_ERRORS -ARG CHECKPOINT_MPI_ENABLED -ARG CHECKPOINT_ASAN_ENABLED -ARG CHECKPOINT_UBSAN_ENABLED -ARG CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED - -ENV CHECKPOINT_DOXYGEN_ENABLED=${CHECKPOINT_DOXYGEN_ENABLED} \ - CHECKPOINT_TESTS_ENABLED=${CHECKPOINT_TESTS_ENABLED} \ - CHECKPOINT_EXAMPLES_ENABLED=${CHECKPOINT_EXAMPLES_ENABLED} \ - CHECKPOINT_WARNINGS_AS_ERRORS=${CHECKPOINT_WARNINGS_AS_ERRORS} \ - CHECKPOINT_MPI_ENABLED=${CHECKPOINT_MPI_ENABLED} \ - CHECKPOINT_ASAN_ENABLED=${CHECKPOINT_ASAN_ENABLED} \ - CHECKPOINT_UBSAN_ENABLED=${CHECKPOINT_UBSAN_ENABLED} \ - CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED=${CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED} \ +ARG MAGISTRATE_DOXYGEN_ENABLED +ARG MAGISTRATE_TESTS_ENABLED +ARG MAGISTRATE_EXAMPLES_ENABLED +ARG MAGISTRATE_WARNINGS_AS_ERRORS +ARG MAGISTRATE_MPI_ENABLED +ARG MAGISTRATE_ASAN_ENABLED +ARG MAGISTRATE_UBSAN_ENABLED +ARG MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED + +ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \ + MAGISTRATE_TESTS_ENABLED=${MAGISTRATE_TESTS_ENABLED} \ + MAGISTRATE_EXAMPLES_ENABLED=${MAGISTRATE_EXAMPLES_ENABLED} \ + MAGISTRATE_WARNINGS_AS_ERRORS=${MAGISTRATE_WARNINGS_AS_ERRORS} \ + MAGISTRATE_MPI_ENABLED=${MAGISTRATE_MPI_ENABLED} \ + MAGISTRATE_ASAN_ENABLED=${MAGISTRATE_ASAN_ENABLED} \ + MAGISTRATE_UBSAN_ENABLED=${MAGISTRATE_UBSAN_ENABLED} \ + MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED=${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED} \ CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} RUN /checkpoint/ci/build_cpp.sh /checkpoint /build diff --git a/docker-compose.yml b/docker-compose.yml index 77327bcf..1748a701 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,7 @@ # CHECKPOINT_TESTS=1 # Enable checkpoint tests # CHECKPOINT_EXAMPLES=1 # Enable checkpoint examples # CHECKPOINT_MPI=1 # Enable checkpoint MPI tests -# CHECKPOINT_WARNINGS_AS_ERRORS=0 # Treat warnings as errors in compilation +# MAGISTRATE_WARNINGS_AS_ERRORS=0 # Treat warnings as errors in compilation # CHECKPOINT_ASAN=0 # Enable address sanitizer in build # CHECKPOINT_UBSAN=0 # Enable undefined behavior sanitizer in build # CHECKPOINT_DOCS=0 # Enable doxygen build @@ -93,15 +93,15 @@ x-ccache: &ccache # Define rules for CheckPoint configuration options across various services x-checkpointopts: &checkpointopts - CHECKPOINT_TESTS_ENABLED: ${CHECKPOINT_TESTS:-1} - CHECKPOINT_EXAMPLES_ENABLED: ${CHECKPOINT_EXAMPLES:-1} - CHECKPOINT_MPI_ENABLED: ${CHECKPOINT_MPI:-1} - CHECKPOINT_ASAN_ENABLED: ${CHECKPOINT_ASAN:-0} - CHECKPOINT_UBSAN_ENABLED: ${CHECKPOINT_UBSAN:-0} - CHECKPOINT_WARNINGS_AS_ERRORS: ${CHECKPOINT_WARNINGS_AS_ERRORS:-0} - CHECKPOINT_DOXYGEN_ENABLED: ${CHECKPOINT_DOCS:-0} + MAGISTRATE_TESTS_ENABLED: ${CHECKPOINT_TESTS:-1} + MAGISTRATE_EXAMPLES_ENABLED: ${CHECKPOINT_EXAMPLES:-1} + MAGISTRATE_MPI_ENABLED: ${CHECKPOINT_MPI:-1} + MAGISTRATE_ASAN_ENABLED: ${CHECKPOINT_ASAN:-0} + MAGISTRATE_UBSAN_ENABLED: ${CHECKPOINT_UBSAN:-0} + MAGISTRATE_WARNINGS_AS_ERRORS: ${MAGISTRATE_WARNINGS_AS_ERRORS:-0} + MAGISTRATE_DOXYGEN_ENABLED: ${CHECKPOINT_DOCS:-0} CMAKE_BUILD_TYPE: ${BUILD_TYPE:-release} - CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED: ${CHECKPOINT_SERIALIZATION_ERROR_CHECKING:-0} + MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED: ${CHECKPOINT_SERIALIZATION_ERROR_CHECKING:-0} CODE_COVERAGE: ${CODE_COVERAGE:-0} https_proxy: ${PROXY-} http_proxy: ${PROXY-} @@ -196,7 +196,7 @@ services: ulimits: *ulimits environment: <<: *ccache - CHECKPOINT_DOXYGEN_ENABLED: 1 + MAGISTRATE_DOXYGEN_ENABLED: 1 CMAKE_BUILD_TYPE: ${BUILD_TYPE:-release} volumes: *ubuntu-volumes command: &docs-cpp-command > diff --git a/docs/md/checkpoint_learn_build.md b/docs/md/checkpoint_learn_build.md index 18403acf..bbafcb00 100644 --- a/docs/md/checkpoint_learn_build.md +++ b/docs/md/checkpoint_learn_build.md @@ -51,16 +51,16 @@ most configuration parameters. | `GTEST_ROOT` | | Install directory for googletest | | `KOKKOS_ROOT` | | Install directory for kokkos | | `KOKKOS_KERNELS_ROOT` | | Install directory for kokkos-kernels | -| `CHECKPOINT_DOXYGEN_ENABLED` | 0 | Enable doxygen generation | -| `CHECKPOINT_ASAN_ENABLED` | 0 | Enable building with address sanitizer | -| `CHECKPOINT_UBSAN_ENABLED` | 0 | Enable building with undefined behavior sanitizer | -| `CHECKPOINT_TESTS_ENABLED` | 1 | Enable checkpoint tests | -| `CHECKPOINT_EXAMPLES_ENABLED` | 1 | Enable checkpoint examples | -| `CHECKPOINT_WARNINGS_AS_ERRORS` | 0 | Make all warnings errors during build | -| `CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED` | 0 | Enable extensive error checking of serialization | -| `CHECKPOINT_MPI_ENABLED` | 1 | Enable checkpoint MPI for testing | +| `MAGISTRATE_DOXYGEN_ENABLED` | 0 | Enable doxygen generation | +| `MAGISTRATE_ASAN_ENABLED` | 0 | Enable building with address sanitizer | +| `MAGISTRATE_UBSAN_ENABLED` | 0 | Enable building with undefined behavior sanitizer | +| `MAGISTRATE_TESTS_ENABLED` | 1 | Enable checkpoint tests | +| `MAGISTRATE_EXAMPLES_ENABLED` | 1 | Enable checkpoint examples | +| `MAGISTRATE_WARNINGS_AS_ERRORS` | 0 | Make all warnings errors during build | +| `MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED` | 0 | Enable extensive error checking of serialization | +| `MAGISTRATE_MPI_ENABLED` | 1 | Enable checkpoint MPI for testing | -* note that if `CHECKPOINT_SERIALIZATION_ERROR_CHECKING_ENABLED` is not explicitly enabled or disabled, it will be **enabled** for `Debug` and `RelWithDebInfo` builds and disabled for others. +* note that if `MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED` is not explicitly enabled or disabled, it will be **enabled** for `Debug` and `RelWithDebInfo` builds and disabled for others. With these set, invoke the script with two arguments: the path to the *checkpoint* root directory and the build path. Here's an example assuming that @@ -107,7 +107,7 @@ The default set of the docker configuration options is located in # CHECKPOINT_TESTS=1 # Enable checkpoint tests # CHECKPOINT_EXAMPLES=1 # Enable checkpoint examples # CHECKPOINT_MPI=1 # Enable checkpoint MPI tests -# CHECKPOINT_WARNINGS_AS_ERRORS=0 # Treat warnings as errors in compilation +# MAGISTRATE_WARNINGS_AS_ERRORS=0 # Treat warnings as errors in compilation # CHECKPOINT_ASAN=0 # Enable address sanitizer in build # CHECKPOINT_UBSAN=0 # Enable undefined behavior sanitizer in build # CHECKPOINT_SERIALIZATION_ERROR_CHECKING=0 # Enable extensive serialization error checking diff --git a/scripts/workflow-template.yml b/scripts/workflow-template.yml index 9433d2c2..227bddaf 100644 --- a/scripts/workflow-template.yml +++ b/scripts/workflow-template.yml @@ -22,7 +22,7 @@ jobs: CHECKPOINT_TESTS: [% checkpoint_tests %] CHECKPOINT_EXAMPLES: [% checkpoint_examples %] CHECKPOINT_MPI: [% checkpoint_mpi %] - CHECKPOINT_WARNINGS_AS_ERRORS: [% checkpoint_warnings_as_errors %] + MAGISTRATE_WARNINGS_AS_ERRORS: [% checkpoint_warnings_as_errors %] CHECKPOINT_DOCS: [% checkpoint_docs %] CHECKPOINT_ASAN: [% checkpoint_asan %] CHECKPOINT_UBSAN: [% checkpoint_ubsan %]