DARMA-tasking · cz4rs · Feb 3, 2021 · Jan 13, 2021 · Jan 20, 2021 · Jan 20, 2021
diff --git a/.github/workflows/macosx-clang-mpich.yml b/.github/workflows/macosx-clang-mpich.yml
@@ -21,6 +21,9 @@ jobs:
       CMAKE_BUILD_TYPE: release
       VT_LB_ENABLED: 1
       VT_TRACE_ENABLED: 1
+      VT_USE_OPENMP: 0
+      VT_USE_STD_THREAD: 0
+      VT_WERROR: 1
       CMAKE_GENERATOR: "Unix Makefiles"
       CMAKE_BUILD_PARALLEL_LEVEL: 4
 

diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,8 @@ transport
 lib/*-build
 lib/checkpoint
 lib/detector
+lib/googletest
+lib/kokkos
 .emacs.desktop
 .vscode/
 project/*

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -87,8 +87,6 @@ if (vt_unity_build_enabled)
   endif()
 endif()
 
-option(vt_fcontext_enabled "Build VT with fcontext (ULT) enabled" OFF)
-
 # Option included here, handled in define_build_modes.cmake so libfort can be
 # included correspondingly
 option(vt_diagnostics_enabled "Build VT with performance metrics/stats" ON)
@@ -100,7 +98,6 @@ else()
   option(vt_libfort_enabled "Build VT with fort library enabled" OFF)
 endif()
 
-option(vt_fcontext_enabled "Build VT with fcontext (ULT) enabled" OFF)
 option(vt_mimalloc_enabled "Build VT with mimalloc" OFF)
 option(vt_mimalloc_static "Build VT with mimalloc using static linking" ON)
 option(vt_asan_enabled "Build VT with address sanitizer" OFF)

diff --git a/ci/azure/azure-clang-3.9-ubuntu-mpich.yml b/ci/azure/azure-clang-3.9-ubuntu-mpich.yml
@@ -39,6 +39,9 @@ variables:
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 1
+  VT_FCONTEXT: 1
+  VT_USE_OPENMP: 0
+  VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 1

diff --git a/ci/azure/azure-clang-5.0-ubuntu-mpich.yml b/ci/azure/azure-clang-5.0-ubuntu-mpich.yml
@@ -39,6 +39,9 @@ variables:
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 1
+  VT_FCONTEXT: 0
+  VT_USE_OPENMP: 0
+  VT_USE_STD_THREAD: 1
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 1

diff --git a/ci/azure/azure-clang-8-alpine-mpich.yml b/ci/azure/azure-clang-8-alpine-mpich.yml
@@ -39,6 +39,9 @@ variables:
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 1
+  VT_FCONTEXT: 0
+  VT_USE_OPENMP: 0
+  VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 1

diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml
@@ -39,6 +39,9 @@ variables:
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 1
+  VT_FCONTEXT: 0
+  VT_USE_OPENMP: 0
+  VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 1

diff --git a/ci/azure/azure-gcc-5-ubuntu-mpich.yml b/ci/azure/azure-gcc-5-ubuntu-mpich.yml
@@ -39,6 +39,9 @@ variables:
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 1
+  VT_FCONTEXT: 0
+  VT_USE_OPENMP: 1
+  VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 1

diff --git a/ci/azure/azure-gcc-6-ubuntu-mpich.yml b/ci/azure/azure-gcc-6-ubuntu-mpich.yml
@@ -39,6 +39,9 @@ variables:
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 1
+  VT_FCONTEXT: 1
+  VT_USE_OPENMP: 0
+  VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 1

diff --git a/ci/azure/azure-gcc-7-ubuntu-mpich.yml b/ci/azure/azure-gcc-7-ubuntu-mpich.yml
@@ -39,6 +39,9 @@ variables:
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 1
+  VT_FCONTEXT: 0
+  VT_USE_OPENMP: 0
+  VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 1

diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml
@@ -39,6 +39,9 @@ variables:
   VT_POOL: 0
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 1
+  VT_FCONTEXT: 0
+  VT_USE_OPENMP: 0
+  VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 1

diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml
@@ -39,6 +39,9 @@ variables:
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 1
+  VT_FCONTEXT: 0
+  VT_USE_OPENMP: 0
+  VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 1
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 1

diff --git a/ci/azure/azure-intel-18-ubuntu-mpich-extended.yml b/ci/azure/azure-intel-18-ubuntu-mpich-extended.yml
@@ -33,6 +33,9 @@ variables:
   VT_POOL: 0
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 1
+  VT_FCONTEXT: 0
+  VT_USE_OPENMP: 0
+  VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 1

diff --git a/ci/azure/azure-intel-18-ubuntu-mpich.yml b/ci/azure/azure-intel-18-ubuntu-mpich.yml
@@ -39,6 +39,9 @@ variables:
   VT_POOL: 0
   VT_EXTENDED_TESTS: 0
   VT_UNITY_BUILD: 1
+  VT_FCONTEXT: 0
+  VT_USE_OPENMP: 0
+  VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 1

diff --git a/ci/azure/azure-intel-19-ubuntu-mpich.yml b/ci/azure/azure-intel-19-ubuntu-mpich.yml
@@ -39,6 +39,9 @@ variables:
   VT_POOL: 0
   VT_EXTENDED_TESTS: 0
   VT_UNITY_BUILD: 1
+  VT_FCONTEXT: 0
+  VT_USE_OPENMP: 0
+  VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 1

diff --git a/ci/azure/azure-nvidia-10-ubuntu-mpich-extended.yml b/ci/azure/azure-nvidia-10-ubuntu-mpich-extended.yml
@@ -33,6 +33,9 @@ variables:
   VT_POOL: 0
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 1
+  VT_FCONTEXT: 0
+  VT_USE_OPENMP: 0
+  VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 1

diff --git a/ci/azure/azure-nvidia-10-ubuntu-mpich.yml b/ci/azure/azure-nvidia-10-ubuntu-mpich.yml
@@ -39,6 +39,9 @@ variables:
   VT_POOL: 0
   VT_EXTENDED_TESTS: 0
   VT_UNITY_BUILD: 1
+  VT_FCONTEXT: 0
+  VT_USE_OPENMP: 0
+  VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 0

diff --git a/ci/azure/azure-nvidia-11-ubuntu-mpich-extended.yml b/ci/azure/azure-nvidia-11-ubuntu-mpich-extended.yml
@@ -33,6 +33,9 @@ variables:
   VT_POOL: 0
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 1
+  VT_FCONTEXT: 0
+  VT_USE_OPENMP: 0
+  VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 1

diff --git a/ci/azure/azure-nvidia-11-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-ubuntu-mpich.yml
@@ -39,6 +39,9 @@ variables:
   VT_POOL: 0
   VT_EXTENDED_TESTS: 0
   VT_UNITY_BUILD: 1
+  VT_FCONTEXT: 0
+  VT_USE_OPENMP: 0
+  VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 0

diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
@@ -110,6 +110,9 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \
       -Dvt_diagnostics_enabled="${VT_DIAGNOSTICS_ENABLED:-1}" \
       -Dvt_diagnostics_runtime_enabled="${VT_DIAGNOSTICS_RUNTIME_ENABLED:-0}" \
       -Dzoltan_DIR="${ZOLTAN_CONFIG:-}" \
+      -Dvt_fcontext_enabled="${VT_FCONTEXT_ENABLED:-0}" \
+      -DUSE_OPENMP="${VT_USE_OPENMP:-0}" \
+      -DUSE_STD_THREAD="${VT_USE_STD_THREAD:-0}" \
       -DCODE_COVERAGE="${CODE_COVERAGE:-0}" \
       -DMI_INTERPOSE:BOOL=ON \
       -DMI_OVERRIDE:BOOL=ON \

diff --git a/ci/docker/alpine-cpp.dockerfile b/ci/docker/alpine-cpp.dockerfile
@@ -29,6 +29,9 @@ ARG VT_DOXYGEN_ENABLED
 ARG VT_ASAN_ENABLED
 ARG VT_WERROR_ENABLED
 ARG VT_POOL_ENABLED
+ARG VT_FCONTEXT_ENABLED
+ARG VT_USE_OPENMP
+ARG VT_USE_STD_THREAD
 ARG CMAKE_BUILD_TYPE
 
 ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
@@ -39,6 +42,9 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_ASAN_ENABLED=${VT_ASAN_ENABLED} \
     VT_WERROR_ENABLED=${VT_WERROR_ENABLED} \
     VT_POOL_ENABLED=${VT_POOL_ENABLED} \
+    VT_FCONTEXT_ENABLED=${VT_FCONTEXT_ENABLED} \
+    VT_USE_OPENMP=${VT_USE_OPENMP} \
+    VT_USE_STD_THREAD=${VT_USE_STD_THREAD} \
     CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 
 RUN /vt/ci/build_cpp.sh /vt /build

diff --git a/ci/docker/ubuntu-18.04-clang-cpp.dockerfile b/ci/docker/ubuntu-18.04-clang-cpp.dockerfile
@@ -63,6 +63,9 @@ ARG VT_WERROR_ENABLED
 ARG VT_POOL_ENABLED
 ARG CMAKE_BUILD_TYPE
 ARG VT_EXTENDED_TESTS_ENABLED
+ARG VT_FCONTEXT_ENABLED
+ARG VT_USE_OPENMP
+ARG VT_USE_STD_THREAD
 
 ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_TRACE_ENABLED=${VT_TRACE_ENABLED} \
@@ -74,7 +77,10 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_POOL_ENABLED=${VT_POOL_ENABLED} \
     VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \
     VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
+    VT_FCONTEXT_ENABLED=${VT_FCONTEXT_ENABLED} \
     VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
+    VT_USE_OPENMP=${VT_USE_OPENMP} \
+    VT_USE_STD_THREAD=${VT_USE_STD_THREAD} \
     VT_DIAGNOSTICS_ENABLED=${VT_DIAGNOSTICS_ENABLED} \
     VT_DIAGNOSTICS_RUNTIME_ENABLED=${VT_DIAGNOSTICS_RUNTIME_ENABLED} \
     CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

diff --git a/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile b/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile
@@ -89,6 +89,9 @@ ARG VT_POOL_ENABLED
 ARG VT_ZOLTAN_ENABLED
 ARG CMAKE_BUILD_TYPE
 ARG VT_EXTENDED_TESTS_ENABLED
+ARG VT_FCONTEXT_ENABLED
+ARG VT_USE_OPENMP
+ARG VT_USE_STD_THREAD
 
 ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_TRACE_ENABLED=${VT_TRACE_ENABLED} \
@@ -102,6 +105,9 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_ZOLTAN_ENABLED=${VT_ZOLTAN_ENABLED} \
     VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
     VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
+    VT_FCONTEXT_ENABLED=${VT_FCONTEXT_ENABLED} \
+    VT_USE_OPENMP=${VT_USE_OPENMP} \
+    VT_USE_STD_THREAD=${VT_USE_STD_THREAD} \
     VT_DIAGNOSTICS_ENABLED=${VT_DIAGNOSTICS_ENABLED} \
     VT_DIAGNOSTICS_RUNTIME_ENABLED=${VT_DIAGNOSTICS_RUNTIME_ENABLED} \
     CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

diff --git a/ci/docker/ubuntu-18.04-gnu-docs.dockerfile b/ci/docker/ubuntu-18.04-gnu-docs.dockerfile
@@ -54,6 +54,9 @@ ARG VT_WERROR_ENABLED
 ARG VT_POOL_ENABLED
 ARG CMAKE_BUILD_TYPE
 ARG VT_EXTENDED_TESTS_ENABLED
+ARG VT_FCONTEXT_ENABLED
+ARG VT_USE_OPENMP
+ARG VT_USE_STD_THREAD
 
 ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_TRACE_ENABLED=${VT_TRACE_ENABLED} \
@@ -65,6 +68,9 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_POOL_ENABLED=${VT_POOL_ENABLED} \
     VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \
     VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
+    VT_FCONTEXT_ENABLED=${VT_FCONTEXT_ENABLED} \
+    VT_USE_OPENMP=${VT_USE_OPENMP} \
+    VT_USE_STD_THREAD=${VT_USE_STD_THREAD} \
     VT_DIAGNOSTICS_ENABLED=${VT_DIAGNOSTICS_ENABLED} \
     VT_DIAGNOSTICS_RUNTIME_ENABLED=${VT_DIAGNOSTICS_RUNTIME_ENABLED} \
     CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

diff --git a/ci/docker/ubuntu-18.04-intel-cpp.dockerfile b/ci/docker/ubuntu-18.04-intel-cpp.dockerfile
@@ -61,6 +61,9 @@ ARG VT_DOXYGEN_ENABLED
 ARG VT_ASAN_ENABLED
 ARG VT_WERROR_ENABLED
 ARG VT_POOL_ENABLED
+ARG VT_FCONTEXT_ENABLED
+ARG VT_USE_OPENMP
+ARG VT_USE_STD_THREAD
 ARG CMAKE_BUILD_TYPE
 ARG VT_EXTENDED_TESTS_ENABLED
 
@@ -75,6 +78,9 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \
     VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
     VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
+    VT_FCONTEXT_ENABLED=${VT_FCONTEXT_ENABLED} \
+    VT_USE_OPENMP=${VT_USE_OPENMP} \
+    VT_USE_STD_THREAD=${VT_USE_STD_THREAD} \
     VT_DIAGNOSTICS_ENABLED=${VT_DIAGNOSTICS_ENABLED} \
     VT_DIAGNOSTICS_RUNTIME_ENABLED=${VT_DIAGNOSTICS_RUNTIME_ENABLED} \
     CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

diff --git a/ci/docker/ubuntu-18.04-nvidia-cpp.dockerfile b/ci/docker/ubuntu-18.04-nvidia-cpp.dockerfile
@@ -92,6 +92,9 @@ ARG VT_WERROR_ENABLED
 ARG VT_POOL_ENABLED
 ARG CMAKE_BUILD_TYPE
 ARG VT_EXTENDED_TESTS_ENABLED
+ARG VT_FCONTEXT_ENABLED
+ARG VT_USE_OPENMP
+ARG VT_USE_STD_THREAD
 
 ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_TRACE_ENABLED=${VT_TRACE_ENABLED} \
@@ -103,6 +106,9 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_POOL_ENABLED=${VT_POOL_ENABLED} \
     VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
     VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
+    VT_FCONTEXT_ENABLED=${VT_FCONTEXT_ENABLED} \
+    VT_USE_OPENMP=${VT_USE_OPENMP} \
+    VT_USE_STD_THREAD=${VT_USE_STD_THREAD} \
     VT_DIAGNOSTICS_ENABLED=${VT_DIAGNOSTICS_ENABLED} \
     VT_DIAGNOSTICS_RUNTIME_ENABLED=${VT_DIAGNOSTICS_RUNTIME_ENABLED} \
     CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

diff --git a/ci/docker/ubuntu-20.04-clang-cpp.dockerfile b/ci/docker/ubuntu-20.04-clang-cpp.dockerfile
@@ -61,6 +61,9 @@ ARG VT_DOXYGEN_ENABLED
 ARG VT_ASAN_ENABLED
 ARG VT_WERROR_ENABLED
 ARG VT_POOL_ENABLED
+ARG VT_FCONTEXT_ENABLED
+ARG VT_USE_OPENMP
+ARG VT_USE_STD_THREAD
 ARG CMAKE_BUILD_TYPE
 ARG VT_EXTENDED_TESTS_ENABLED
 
@@ -75,6 +78,9 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \
     VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
     VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
+    VT_FCONTEXT_ENABLED=${VT_FCONTEXT_ENABLED} \
+    VT_USE_OPENMP=${VT_USE_OPENMP} \
+    VT_USE_STD_THREAD=${VT_USE_STD_THREAD} \
     VT_DIAGNOSTICS_ENABLED=${VT_DIAGNOSTICS_ENABLED} \
     VT_DIAGNOSTICS_RUNTIME_ENABLED=${VT_DIAGNOSTICS_RUNTIME_ENABLED} \
     CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

diff --git a/ci/docker/ubuntu-20.04-gnu-cpp.dockerfile b/ci/docker/ubuntu-20.04-gnu-cpp.dockerfile
@@ -83,6 +83,9 @@ ARG VT_POOL_ENABLED
 ARG VT_ZOLTAN_ENABLED
 ARG CMAKE_BUILD_TYPE
 ARG VT_EXTENDED_TESTS_ENABLED
+ARG VT_FCONTEXT_ENABLED
+ARG VT_USE_OPENMP
+ARG VT_USE_STD_THREAD
 
 ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_TRACE_ENABLED=${VT_TRACE_ENABLED} \
@@ -96,6 +99,9 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_ZOLTAN_ENABLED=${VT_ZOLTAN_ENABLED} \
     VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
     VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
+    VT_FCONTEXT_ENABLED=${VT_FCONTEXT_ENABLED} \
+    VT_USE_OPENMP=${VT_USE_OPENMP} \
+    VT_USE_STD_THREAD=${VT_USE_STD_THREAD} \
     VT_DIAGNOSTICS_ENABLED=${VT_DIAGNOSTICS_ENABLED} \
     VT_DIAGNOSTICS_RUNTIME_ENABLED=${VT_DIAGNOSTICS_RUNTIME_ENABLED} \
     CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

diff --git a/ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile b/ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile
@@ -85,6 +85,9 @@ ARG VT_ASAN_ENABLED
 ARG VT_WERROR_ENABLED
 ARG VT_POOL_ENABLED
 ARG VT_ZOLTAN_ENABLED
+ARG VT_FCONTEXT_ENABLED
+ARG VT_USE_OPENMP
+ARG VT_USE_STD_THREAD
 ARG CMAKE_BUILD_TYPE
 ARG VT_EXTENDED_TESTS_ENABLED
 
@@ -100,6 +103,9 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_ZOLTAN_ENABLED=${VT_ZOLTAN_ENABLED} \
     VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
     VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
+    VT_FCONTEXT_ENABLED=${VT_FCONTEXT_ENABLED} \
+    VT_USE_OPENMP=${VT_USE_OPENMP} \
+    VT_USE_STD_THREAD=${VT_USE_STD_THREAD} \
     VT_DIAGNOSTICS_ENABLED=${VT_DIAGNOSTICS_ENABLED} \
     VT_DIAGNOSTICS_RUNTIME_ENABLED=${VT_DIAGNOSTICS_RUNTIME_ENABLED} \
     CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

diff --git a/cmake/define_build_types.cmake b/cmake/define_build_types.cmake
@@ -220,7 +220,6 @@ set(vt_feature_cmake_production "0")
 
 set (vt_feature_cmake_mpi_rdma "0")
 set (vt_feature_cmake_print_term_msgs "0")
-set (vt_feature_cmake_default_threading "1")
 set (vt_feature_cmake_no_pool_alloc_env "0")
 
 if (${vt_pool_enabled})