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

1098 Enable assertions during CI when release builds are used #1107

Merged
merged 5 commits into from
Oct 13, 2020
Merged

1098 Enable assertions during CI when release builds are used #1107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3582cba
#1098: Add new CMake flag to detect CI build
JacobDomagala Oct 12, 2020
a5e2903
#1098: Use new CMake flag in Github workflows and add it to build_cpp…
JacobDomagala Oct 12, 2020
6f728ea
#1098: Forward VT_CI_BUILD flag to docker-compose
JacobDomagala Oct 12, 2020
053d477
#1098: Add option to use ci_build flag in code
JacobDomagala Oct 12, 2020
3bf637c
#1098: Add new variable vt_ci_build to workflow-template.yml and work…
JacobDomagala Oct 12, 2020
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
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-clang-3.9-ubuntu-mpich.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
VT_CI_BUILD: 1
lifflander marked this conversation as resolved.
Show resolved Hide resolved
CACHE: ~/.local/cache/

steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-clang-5.0-ubuntu-mpich.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
VT_CI_BUILD: 1
CACHE: ~/.local/cache/

steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-clang-8-alpine-mpich.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
VT_CI_BUILD: 1
CACHE: ~/.local/cache/

steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-gcc-10-ubuntu-openmpi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
VT_CI_BUILD: 1
CACHE: ~/.local/cache/

steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-gcc-5-ubuntu-mpich.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
VT_CI_BUILD: 1
CACHE: ~/.local/cache/

steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-gcc-6-ubuntu-mpich.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
VT_CI_BUILD: 1
CACHE: ~/.local/cache/

steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-gcc-7-ubuntu-mpich.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
VT_CI_BUILD: 1
CACHE: ~/.local/cache/

steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
VT_CI_BUILD: 1
CACHE: ~/.local/cache/

steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 1
VT_CI_BUILD: 1
CACHE: ~/.local/cache/

steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-intel-18-ubuntu-mpich-extended.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
VT_CI_BUILD: 1
CACHE: ~/.local/cache/

steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-intel-18-ubuntu-mpich.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-nvidia-10-ubuntu-mpich-extended.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
VT_CI_BUILD: 1
CACHE: ~/.local/cache/

steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-nvidia-10-ubuntu-mpich.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-nvidia-11-ubuntu-mpich-extended.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
VT_EXTENDED_TESTS: 1
VT_UNITY_BUILD: 1
VT_ZOLTAN: 0
VT_CI_BUILD: 1
CACHE: ~/.local/cache/

steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dockerimage-nvidia-11-ubuntu-mpich.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions ci/build_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions cmake/define_build_types.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down Expand Up @@ -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})
JacobDomagala marked this conversation as resolved.
Show resolved Hide resolved
set(vt_feature_cmake_production "0")
else()
set(vt_feature_cmake_production "1")
Expand Down
1 change: 1 addition & 0 deletions cmake_config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
##############################################################################
Expand Down
1 change: 1 addition & 0 deletions scripts/workflow-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions scripts/workflows.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/vt/configs/features/features_defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*/