#510: CI: add VT_MPI_GUARD_ENABLED to build scripts

DARMA-tasking · Jun 2, 2020 · bc7ea01 · bc7ea01
1 parent aed7b05
commit bc7ea01
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 0 deletions.
diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
@@ -78,6 +78,7 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \
       -Dvt_pool_enabled="${VT_POOL_ENABLED:-1}" \
       -DMI_INTERPOSE:BOOL=ON \
       -DMI_OVERRIDE:BOOL=ON \
+      -Dvt_mpi_guards="${VT_MPI_GUARD_ENABLED:-0} \
       -DMPI_EXTRA_FLAGS="${MPI_EXTRA_FLAGS:-}" \
       -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}" \
       -DMPI_C_COMPILER="${MPICC:-mpicc}" \

diff --git a/ci/docker/ubuntu-18.04-clang-cpp.dockerfile b/ci/docker/ubuntu-18.04-clang-cpp.dockerfile
@@ -77,6 +77,7 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_TRACE_RUNTIME_ENABLED=${VT_TRACE_RUNTIME} \
     VT_ASAN_ENABLED=${VT_ASAN_ENABLED} \
     VT_POOL_ENABLED=${VT_POOL_ENABLED} \
+    VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \
     CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 
 RUN /vt/ci/build_cpp.sh /vt /build

diff --git a/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile b/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile
@@ -80,6 +80,7 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_TRACE_RUNTIME_ENABLED=${VT_TRACE_RUNTIME} \
     VT_ASAN_ENABLED=${VT_ASAN_ENABLED} \
     VT_POOL_ENABLED=${VT_POOL_ENABLED} \
+    VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \
     CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 
 RUN /vt/ci/build_cpp.sh /vt /build

diff --git a/ci/docker/ubuntu-18.04-gnu-docs.dockerfile b/ci/docker/ubuntu-18.04-gnu-docs.dockerfile
@@ -60,6 +60,7 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_TRACE_RUNTIME_ENABLED=${VT_TRACE_RUNTIME} \
     VT_ASAN_ENABLED=${VT_ASAN_ENABLED} \
     VT_POOL_ENABLED=${VT_POOL_ENABLED} \
+    VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \
     CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 
 RUN /vt/ci/build_cpp.sh /vt /build "${token}"
diff --git a/ci/docker/ubuntu-20.04-clang-cpp.dockerfile b/ci/docker/ubuntu-20.04-clang-cpp.dockerfile
@@ -77,6 +77,7 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_TRACE_RUNTIME_ENABLED=${VT_TRACE_RUNTIME} \
     VT_ASAN_ENABLED=${VT_ASAN_ENABLED} \
     VT_POOL_ENABLED=${VT_POOL_ENABLED} \
+    VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \
     CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 
 RUN /vt/ci/build_cpp.sh /vt /build

diff --git a/ci/docker/ubuntu-20.04-gnu-cpp.dockerfile b/ci/docker/ubuntu-20.04-gnu-cpp.dockerfile
@@ -53,6 +53,7 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_TRACE_RUNTIME_ENABLED=${VT_TRACE_RUNTIME} \
     VT_ASAN_ENABLED=${VT_ASAN_ENABLED} \
     VT_POOL_ENABLED=${VT_POOL_ENABLED} \
+    VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \
     CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 
 RUN /vt/ci/build_cpp.sh /vt /build

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -91,6 +91,7 @@ x-vtopts: &vtopts
   VT_TRACE_RUNTIME_ENABLED: ${VT_TRACE_RT:-0}
   VT_ASAN_ENABLED: ${VT_ASAN:-0}
   VT_POOL_ENABLED: ${VT_POOL:-1}
+  VT_MPI_GUARD_ENABLED: ${VT_MPI_GUARD:-0}
   CMAKE_BUILD_TYPE: ${BUILD_TYPE:-release}
   https_proxy: ${PROXY-}
   http_proxy: ${PROXY-}