GCC PR configs - move from openmpi 1.6.5 to 1.10.1

Note that this commit include disabling tests documented in issue trilinos#2712 and trilinos#2691 and that those should be re-enabled when those issues are resolved.
prwolfe · Jun 29, 2018 · fe894d8 · fe894d8
1 parent 2aecc4c
commit fe894d8
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 11 deletions.
diff --git a/.../PullRequestLinuxGCCTestingSettings.cmake → ...llRequestLinuxCommonTestingSettings.cmake b/.../PullRequestLinuxGCCTestingSettings.cmake → ...llRequestLinuxCommonTestingSettings.cmake
@@ -4,7 +4,7 @@
 # appropriate set of SEMS modules must be loaded and accessible through the
 # SEMS NFS mount. (See the sems/PullRequestGCC*TestingEnv.sh files.)
 
-# Usage: cmake -C PullRequestLinuxGCCTestingSettings.cmake 
+# Usage: cmake -C PullRequestLinuxCommonTestingSettings.cmake
 
 # Misc options typically added by CI testing mode in TriBITS
 
@@ -34,7 +34,6 @@ set (Trilinos_ENABLE_EXPLICIT_INSTANTIATION ON CACHE BOOL "Set by default for PR
 set (Trilinos_ENABLE_SECONDARY_TESTED_CODE OFF CACHE BOOL "Set by default for PR testing")
 set (Teuchos_ENABLE_DEFAULT_STACKTRACE OFF CACHE BOOL "Set by default for PR testing")
 
-
 # Options from cmake/std/BasicCiTestingSettings.cmake
 
 set (Trilinos_TPL_SYSTEM_INCLUDE_DIRS TRUE CACHE BOOL "Set by default for PR testing")

diff --git a/cmake/std/PullRequestLinuxGCC4.8.4TestingSettings.cmake b/cmake/std/PullRequestLinuxGCC4.8.4TestingSettings.cmake
@@ -4,7 +4,7 @@
 # appropriate set of SEMS modules must be loaded and accessible through the
 # SEMS NFS mount. (See the sems/PullRequestGCC*TestingEnv.sh files.)
 
-# Usage: cmake -C PullRequestLinuxGCC4.8.4TestingSettings.cmake 
+# Usage: cmake -C PullRequestLinuxGCC4.8.4TestingSettings.cmake
 
 # Misc options typically added by CI testing mode in TriBITS
 
@@ -15,9 +15,17 @@ set (Trilinos_ENABLE_OpenMP ON CACHE BOOL "Set by default for PR testing")
 set (MPI_EXEC_PRE_NUMPROCS_FLAGS "--bind-to;none" CACHE STRING "Set by default for PR testing")
 # NOTE: The above is a workaround for the problem of having threads on MPI
 # ranks bind to the same cores (see #2422).
-
-# Disable just one Teko sub-unit test that fails with GCC 4.8.4 + OpenMP (#2712)
+
+set(Tpetra_INST_SERIAL ON CACHE BOOL "Set by default for PR testing")
+# note: mortar uses serial mode no matter what so we need to instantiate this to get it's examples to work
+
+# Disable just one Teko sub-unit test that fails with openmpi 1.10 (#2712)
 set (Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D ON CACHE BOOL "Temporarily disabled in PR testing")
 
-include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxGCCTestingSettings.cmake")
+# Disable three ShyLu_DD tests - see #2691
+set (ShyLU_DDFROSch_test_frosch_laplacian_epetra_2d_gdsw_MPI_4_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing")
+set (ShyLU_DDFROSch_test_frosch_laplacian_epetra_2d_rgdsw_MPI_4_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing")
+set (ShyLU_DDFROSch_test_frosch_interfacesets_2D_MPI_4_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing")
+
+include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxCommonTestingSettings.cmake")
 
diff --git a/cmake/std/PullRequestLinuxGCC4.9.3TestingSettings.cmake b/cmake/std/PullRequestLinuxGCC4.9.3TestingSettings.cmake
diff --git a/cmake/std/PullRequestLinuxGCC4.9.3TestingSettings.cmake b/cmake/std/PullRequestLinuxGCC4.9.3TestingSettings.cmake
@@ -0,0 +1,21 @@
+# This file contains the options needed to both run the pull request testing
+# for Trilinos for the Linux GCC 4.9.3 pull request testing builds, and to reproduce
+# the errors reported by those builds. Prior to using this this file, the
+# appropriate set of SEMS modules must be loaded and accessible through the
+# SEMS NFS mount. (See the sems/PullRequestGCC*TestingEnv.sh files.)
+
+# Usage: cmake -C PullRequestLinuxGCC4.9.3TestingSettings.cmake
+
+# Misc options typically added by CI testing mode in TriBITS
+
+# Use the below option only when submitting to the dashboard
+#set (CTEST_USE_LAUNCHERS ON CACHE BOOL "Set by default for PR testing")
+
+set (MPI_EXEC_PRE_NUMPROCS_FLAGS "--bind-to;none" CACHE STRING "Set by default for PR testing")
+# NOTE: The above is a workaround for the problem of having threads on MPI
+# ranks bind to the same cores (see #2422).
+
+# Disable just one Teko sub-unit test that fails with openmpi 1.10 (#2712)
+set (Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D ON CACHE BOOL "Temporarily disabled in PR testing")
+
+include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxCommonTestingSettings.cmake")
diff --git a/cmake/std/PullRequestLinuxIntelTestingSettings.cmake b/cmake/std/PullRequestLinuxIntelTestingSettings.cmake
@@ -4,7 +4,7 @@
 # appropriate set of SEMS modules must be loaded and accessible through the
 # SEMS NFS mount. (See the sems/PullRequestGCC*TestingEnv.sh files.)
 
-# Usage: cmake -C PullRequestLinuxIntelTestingSettings.cmake 
+# Usage: cmake -C PullRequestLinuxIntelTestingSettings.cmake
 
 # Misc options typically added by CI testing mode in TriBITS
 
@@ -18,5 +18,5 @@ set (MueLu_UnitTestsTpetra_MPI_4_DISABLE ON CACHE BOOL "Temporarily disabled in
 set (KokkosCore_UnitTest_Serial_MPI_1_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing")
 set (Zoltan2_simplePamgenTest_MPI_3_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing")
 
-include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxGCCTestingSettings.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxCommonTestingSettings.cmake")
 
diff --git a/cmake/std/sems/PullRequestGCC4.8.4TestingEnv.sh b/cmake/std/sems/PullRequestGCC4.8.4TestingEnv.sh
@@ -11,7 +11,7 @@
 source /projects/sems/modulefiles/utils/sems-modules-init.sh
 
 module load sems-gcc/4.8.4
-module load sems-openmpi/1.6.5
+module load sems-openmpi/1.10.1
 module load sems-python/2.7.9
 module load sems-git/2.10.1
 module load sems-boost/1.63.0/base

diff --git a/cmake/std/sems/PullRequestGCC4.9.3TestingEnv.sh b/cmake/std/sems/PullRequestGCC4.9.3TestingEnv.sh
@@ -11,7 +11,7 @@
 source /projects/sems/modulefiles/utils/sems-modules-init.sh
 
 module load sems-gcc/4.9.3
-module load sems-openmpi/1.6.5
+module load sems-openmpi/1.10.1
 module load sems-python/2.7.9
 module load sems-git/2.10.1
 module load sems-boost/1.63.0/base