diff --git a/.github/workflows/dockerimage-clang-3.9-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-3.9-ubuntu-mpich.yml index 379c3c2e12..8ecb9baf24 100644 --- a/.github/workflows/dockerimage-clang-3.9-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-3.9-ubuntu-mpich.yml @@ -37,6 +37,7 @@ jobs: VT_EXTENDED_TESTS: 1 VT_UNITY_BUILD: 1 VT_ZOLTAN: 0 + VT_CI_BUILD: 1 CACHE: ~/.local/cache/ steps: diff --git a/.github/workflows/dockerimage-clang-5.0-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-5.0-ubuntu-mpich.yml index 9a4b2dd17c..563feb9526 100644 --- a/.github/workflows/dockerimage-clang-5.0-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-5.0-ubuntu-mpich.yml @@ -37,6 +37,7 @@ jobs: VT_EXTENDED_TESTS: 1 VT_UNITY_BUILD: 1 VT_ZOLTAN: 0 + VT_CI_BUILD: 1 CACHE: ~/.local/cache/ steps: diff --git a/.github/workflows/dockerimage-clang-8-alpine-mpich.yml b/.github/workflows/dockerimage-clang-8-alpine-mpich.yml index 96afb1ec09..f26f84b7b6 100644 --- a/.github/workflows/dockerimage-clang-8-alpine-mpich.yml +++ b/.github/workflows/dockerimage-clang-8-alpine-mpich.yml @@ -32,6 +32,7 @@ jobs: VT_EXTENDED_TESTS: 1 VT_UNITY_BUILD: 1 VT_ZOLTAN: 0 + VT_CI_BUILD: 1 CACHE: ~/.local/cache/ steps: diff --git a/.github/workflows/dockerimage-gcc-10-ubuntu-openmpi.yml b/.github/workflows/dockerimage-gcc-10-ubuntu-openmpi.yml index 74ded799a9..db881e4323 100644 --- a/.github/workflows/dockerimage-gcc-10-ubuntu-openmpi.yml +++ b/.github/workflows/dockerimage-gcc-10-ubuntu-openmpi.yml @@ -37,6 +37,7 @@ jobs: VT_EXTENDED_TESTS: 1 VT_UNITY_BUILD: 1 VT_ZOLTAN: 0 + VT_CI_BUILD: 1 CACHE: ~/.local/cache/ steps: diff --git a/.github/workflows/dockerimage-gcc-5-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-5-ubuntu-mpich.yml index bfe853dfec..49a73cf119 100644 --- a/.github/workflows/dockerimage-gcc-5-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-gcc-5-ubuntu-mpich.yml @@ -37,6 +37,7 @@ jobs: VT_EXTENDED_TESTS: 1 VT_UNITY_BUILD: 1 VT_ZOLTAN: 0 + VT_CI_BUILD: 1 CACHE: ~/.local/cache/ steps: diff --git a/.github/workflows/dockerimage-gcc-6-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-6-ubuntu-mpich.yml index 1ec99b23b7..12aa4a7623 100644 --- a/.github/workflows/dockerimage-gcc-6-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-gcc-6-ubuntu-mpich.yml @@ -37,6 +37,7 @@ jobs: VT_EXTENDED_TESTS: 1 VT_UNITY_BUILD: 1 VT_ZOLTAN: 0 + VT_CI_BUILD: 1 CACHE: ~/.local/cache/ steps: diff --git a/.github/workflows/dockerimage-gcc-7-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-7-ubuntu-mpich.yml index 2081334b5f..ecc40a4428 100644 --- a/.github/workflows/dockerimage-gcc-7-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-gcc-7-ubuntu-mpich.yml @@ -37,6 +37,7 @@ jobs: VT_EXTENDED_TESTS: 1 VT_UNITY_BUILD: 1 VT_ZOLTAN: 0 + VT_CI_BUILD: 1 CACHE: ~/.local/cache/ steps: diff --git a/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml index 2712146f32..0dc06c6895 100644 --- a/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml @@ -37,6 +37,7 @@ jobs: VT_EXTENDED_TESTS: 1 VT_UNITY_BUILD: 1 VT_ZOLTAN: 0 + VT_CI_BUILD: 1 CACHE: ~/.local/cache/ steps: diff --git a/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml index e44739d87d..1afd56a262 100644 --- a/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml @@ -37,6 +37,7 @@ jobs: VT_EXTENDED_TESTS: 1 VT_UNITY_BUILD: 1 VT_ZOLTAN: 1 + VT_CI_BUILD: 1 CACHE: ~/.local/cache/ steps: diff --git a/.github/workflows/dockerimage-intel-18-ubuntu-mpich-extended.yml b/.github/workflows/dockerimage-intel-18-ubuntu-mpich-extended.yml index 6e4360c503..bc4299ce66 100644 --- a/.github/workflows/dockerimage-intel-18-ubuntu-mpich-extended.yml +++ b/.github/workflows/dockerimage-intel-18-ubuntu-mpich-extended.yml @@ -35,6 +35,7 @@ jobs: VT_EXTENDED_TESTS: 1 VT_UNITY_BUILD: 1 VT_ZOLTAN: 0 + VT_CI_BUILD: 1 CACHE: ~/.local/cache/ steps: diff --git a/.github/workflows/dockerimage-intel-18-ubuntu-mpich.yml b/.github/workflows/dockerimage-intel-18-ubuntu-mpich.yml index 1ac51f7c44..55561c0c91 100644 --- a/.github/workflows/dockerimage-intel-18-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-intel-18-ubuntu-mpich.yml @@ -37,6 +37,7 @@ jobs: VT_EXTENDED_TESTS: ${{ github.event_name != 'pull_request' }} VT_UNITY_BUILD: 1 VT_ZOLTAN: 0 + VT_CI_BUILD: 1 CACHE: ~/.local/cache/ steps: diff --git a/.github/workflows/dockerimage-nvidia-10-ubuntu-mpich-extended.yml b/.github/workflows/dockerimage-nvidia-10-ubuntu-mpich-extended.yml index 3b37e089b1..7a764c442a 100644 --- a/.github/workflows/dockerimage-nvidia-10-ubuntu-mpich-extended.yml +++ b/.github/workflows/dockerimage-nvidia-10-ubuntu-mpich-extended.yml @@ -35,6 +35,7 @@ jobs: VT_EXTENDED_TESTS: 1 VT_UNITY_BUILD: 1 VT_ZOLTAN: 0 + VT_CI_BUILD: 1 CACHE: ~/.local/cache/ steps: diff --git a/.github/workflows/dockerimage-nvidia-10-ubuntu-mpich.yml b/.github/workflows/dockerimage-nvidia-10-ubuntu-mpich.yml index d58f4ed40e..312c497111 100644 --- a/.github/workflows/dockerimage-nvidia-10-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-nvidia-10-ubuntu-mpich.yml @@ -37,6 +37,7 @@ jobs: VT_EXTENDED_TESTS: ${{ github.event_name != 'pull_request' }} VT_UNITY_BUILD: 1 VT_ZOLTAN: 0 + VT_CI_BUILD: 1 CACHE: ~/.local/cache/ steps: diff --git a/.github/workflows/dockerimage-nvidia-11-ubuntu-mpich-extended.yml b/.github/workflows/dockerimage-nvidia-11-ubuntu-mpich-extended.yml index 014f5a0e4d..cab6d5d3dc 100644 --- a/.github/workflows/dockerimage-nvidia-11-ubuntu-mpich-extended.yml +++ b/.github/workflows/dockerimage-nvidia-11-ubuntu-mpich-extended.yml @@ -35,6 +35,7 @@ jobs: VT_EXTENDED_TESTS: 1 VT_UNITY_BUILD: 1 VT_ZOLTAN: 0 + VT_CI_BUILD: 1 CACHE: ~/.local/cache/ steps: diff --git a/.github/workflows/dockerimage-nvidia-11-ubuntu-mpich.yml b/.github/workflows/dockerimage-nvidia-11-ubuntu-mpich.yml index b14dc9e00b..aed4d3a389 100644 --- a/.github/workflows/dockerimage-nvidia-11-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-nvidia-11-ubuntu-mpich.yml @@ -37,6 +37,7 @@ jobs: VT_EXTENDED_TESTS: ${{ github.event_name != 'pull_request' }} VT_UNITY_BUILD: 1 VT_ZOLTAN: 0 + VT_CI_BUILD: 1 CACHE: ~/.local/cache/ steps: diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 708d6fd207..13335d1555 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -111,6 +111,7 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \ -Dcheckpoint_DIR="$CHECKPOINT_BUILD/install" \ -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH:-}" \ -DCMAKE_INSTALL_PREFIX="$VT_BUILD/install" \ + -Dvt_ci_build="${VT_CI_BUILD:-0}" \ "$VT" if test "${VT_DOXYGEN_ENABLED:-0}" -eq 1 diff --git a/cmake/define_build_types.cmake b/cmake/define_build_types.cmake index ef81141482..21ba16c46b 100644 --- a/cmake/define_build_types.cmake +++ b/cmake/define_build_types.cmake @@ -164,6 +164,9 @@ else() set(vt_feature_cmake_zoltan "0") endif() +message(STATUS "CI_BUILD = ${vt_ci_build}") +set(vt_feature_cmake_ci_build ${vt_ci_build}) + set(vt_feature_cmake_no_feature "0") set(vt_feature_cmake_production "0") @@ -212,8 +215,8 @@ foreach(loop_build_type ${VT_CONFIG_TYPES}) ${cmake_vt_debug_modes_${loop_build_type}} ) - # assume production mode for everything except debug - if (loop_build_type STREQUAL "debug") + # assume production mode for everything except debug or CI build + if (loop_build_type STREQUAL "debug" OR ${vt_ci_build}) set(vt_feature_cmake_production "0") else() set(vt_feature_cmake_production "1") diff --git a/cmake_config.h.in b/cmake_config.h.in index 7e38360a47..610bd19db3 100644 --- a/cmake_config.h.in +++ b/cmake_config.h.in @@ -67,6 +67,7 @@ #define vt_feature_cmake_mimalloc @vt_feature_cmake_mimalloc@ #define vt_feature_cmake_mpi_access_guards @vt_feature_cmake_mpi_access_guards@ #define vt_feature_cmake_zoltan @vt_feature_cmake_zoltan@ +#define vt_feature_cmake_ci_build @vt_feature_cmake_ci_build@ #cmakedefine vt_quirked_trivially_copyable_on_msg #cmakedefine vt_quirked_serialize_method_detection diff --git a/docker-compose.yml b/docker-compose.yml index 125152a4ed..ced014fc2b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -130,6 +130,7 @@ x-vtopts: &vtopts CODE_COVERAGE: ${CODE_COVERAGE:-0} https_proxy: ${PROXY-} http_proxy: ${PROXY-} + VT_CI_BUILD: ${VT_CI_BUILD:-0} services: ############################################################################## diff --git a/scripts/workflow-template.yml b/scripts/workflow-template.yml index 8435bab748..8956e4a86a 100644 --- a/scripts/workflow-template.yml +++ b/scripts/workflow-template.yml @@ -30,6 +30,7 @@ jobs: VT_EXTENDED_TESTS: [% vt_extended_tests %] VT_UNITY_BUILD: [% vt_unity_build %] VT_ZOLTAN: [% vt_zoltan %] + VT_CI_BUILD: [% vt_ci_build %] CACHE: [% cache_dir %] steps: diff --git a/scripts/workflows.ini b/scripts/workflows.ini index 558a7500cd..b9f8613974 100644 --- a/scripts/workflows.ini +++ b/scripts/workflows.ini @@ -10,6 +10,7 @@ vt_pool = 1 vt_extended_tests = 1 vt_unity_build = 1 vt_zoltan = 0 +vt_ci_build = 1 ulimit_core = 0 code_coverage = 0 build_type = release diff --git a/src/vt/configs/features/features_defines.h b/src/vt/configs/features/features_defines.h index 2c6c4ed6a4..b47798f8b7 100644 --- a/src/vt/configs/features/features_defines.h +++ b/src/vt/configs/features/features_defines.h @@ -69,5 +69,6 @@ #define vt_feature_mimalloc 0 || vt_feature_cmake_mimalloc #define vt_feature_mpi_access_guards 0 || vt_feature_cmake_mpi_access_guards #define vt_feature_zoltan 0 || vt_feature_cmake_zoltan +#define vt_feature_ci_build 0 || vt_feature_cmake_ci_build #endif /*INCLUDED_VT_CONFIGS_FEATURES_FEATURES_DEFINES_H*/