#1173: CI: use different configurations for threading

DARMA-tasking · Feb 1, 2021 · 36e10c6 · 36e10c6
1 parent b9c4ebc
commit 36e10c6
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 0 deletions.
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/ci/azure/azure-clang-3.9-ubuntu-mpich.yml b/ci/azure/azure-clang-3.9-ubuntu-mpich.yml
@@ -39,6 +39,8 @@ variables:
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 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,8 @@ variables:
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 1
+  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,8 @@ variables:
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 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-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml
@@ -39,6 +39,8 @@ variables:
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 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-5-ubuntu-mpich.yml b/ci/azure/azure-gcc-5-ubuntu-mpich.yml
@@ -39,6 +39,8 @@ variables:
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 1
+  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,8 @@ variables:
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 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,8 @@ variables:
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 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-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml
@@ -39,6 +39,8 @@ variables:
   VT_POOL: 0
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 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-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml
@@ -39,6 +39,8 @@ variables:
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 1
+  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,8 @@ variables:
   VT_POOL: 0
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 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-intel-18-ubuntu-mpich.yml b/ci/azure/azure-intel-18-ubuntu-mpich.yml
@@ -39,6 +39,8 @@ variables:
   VT_POOL: 0
   VT_EXTENDED_TESTS: 0
   VT_UNITY_BUILD: 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-intel-19-ubuntu-mpich.yml b/ci/azure/azure-intel-19-ubuntu-mpich.yml
@@ -39,6 +39,8 @@ variables:
   VT_POOL: 0
   VT_EXTENDED_TESTS: 0
   VT_UNITY_BUILD: 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-nvidia-10-ubuntu-mpich-extended.yml b/ci/azure/azure-nvidia-10-ubuntu-mpich-extended.yml
@@ -33,6 +33,8 @@ variables:
   VT_POOL: 0
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 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-nvidia-10-ubuntu-mpich.yml b/ci/azure/azure-nvidia-10-ubuntu-mpich.yml
@@ -39,6 +39,8 @@ variables:
   VT_POOL: 0
   VT_EXTENDED_TESTS: 0
   VT_UNITY_BUILD: 1
+  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,8 @@ variables:
   VT_POOL: 0
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 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-nvidia-11-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-ubuntu-mpich.yml
@@ -39,6 +39,8 @@ variables:
   VT_POOL: 0
   VT_EXTENDED_TESTS: 0
   VT_UNITY_BUILD: 1
+  VT_USE_OPENMP: 0
+  VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
   VT_DIAGNOSTICS: 0

diff --git a/scripts/azure-workflow-template.yml b/scripts/azure-workflow-template.yml
@@ -29,6 +29,8 @@ variables:
   VT_POOL: [% vt_pool %]
   VT_EXTENDED_TESTS: [% vt_extended_tests %]
   VT_UNITY_BUILD: [% vt_unity_build %]
+  VT_USE_OPENMP: [% vt_use_openmp %]
+  VT_USE_STD_THREAD: [% vt_use_std_thread %]
   VT_ZOLTAN: [% vt_zoltan %]
   VT_CI_BUILD: [% vt_ci_build %]
   VT_DIAGNOSTICS: [% vt_diagnostics %]

diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini
@@ -10,6 +10,8 @@ vt_werror = 1
 vt_pool = 1
 vt_extended_tests = 1
 vt_unity_build = 1
+vt_use_openmp = 0
+vt_use_std_thread = 0
 vt_zoltan = 0
 vt_ci_build = 1
 ulimit_core = 0
@@ -127,6 +129,7 @@ compiler_type = gnu
 compiler = gcc-5
 output_name = ci/azure/azure-gcc-5-ubuntu-mpich.yml
 cache_name = "[% linux %]-[% compiler %]-cache"
+vt_use_openmp = 1
 
 [PR-tests-gcc-6]
 test_configuration = "gcc-6, ubuntu, mpich"
@@ -183,6 +186,7 @@ compiler_type = clang
 compiler = clang-5.0
 output_name = ci/azure/azure-clang-5.0-ubuntu-mpich.yml
 vt_trace = 1
+vt_use_std_thread = 1
 
 [PR-tests-clang-8]
 test_configuration = "clang-8, alpine, mpich"