PullRequestLinuxGCCTestingSettings.cmake: add scotch to all PR builds

This will close issue trilinos#2065
prwolfe · Jun 13, 2018 · 16d0f8d · 16d0f8d
1 parent 1f0b422
commit 16d0f8d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/cmake/std/PullRequestLinuxGCCTestingSettings.cmake b/cmake/std/PullRequestLinuxGCCTestingSettings.cmake
@@ -52,6 +52,11 @@ set (TPL_ENABLE_HDF5 ON CACHE BOOL "Set by default for PR testing")
 set (TPL_ENABLE_Netcdf ON CACHE BOOL "Set by default for PR testing")
 set (TPL_ENABLE_SuperLU ON CACHE BOOL "Set by default for PR testing")
 set (Trilinos_TRACE_ADD_TEST ON CACHE BOOL "Set by default for PR testing")
+
+set (TPL_ENABLE_Scotch ON CACHE BOOL "Set by default for PR testing")
+# Disable test that was enabled when Scotch TPL was enabled (#2051, #2052)
+set (Zoltan2_orderingTestDriverExample_MPI_1_DISABLE ONCACHE BOOL "Set by default for PR testing")
+
 # Disable long-failing Piro test until it can be fixed (#826)
 set (Piro_EpetraSolver_MPI_4_DISABLE ON CACHE BOOL "Set by default for PR testing")
 
@@ -93,3 +98,5 @@ SET(Netcdf_LIBRARY_DIRS "$ENV{SEMS_NETCDF_LIBRARY_PATH}" CACHE PATH "Set by defa
 SET(SuperLU_INCLUDE_DIRS "$ENV{SEMS_SUPERLU_INCLUDE_PATH}" CACHE PATH "Set by default for PR testing")
 SET(SuperLU_LIBRARY_DIRS "$ENV{SEMS_SUPERLU_LIBRARY_PATH}" CACHE PATH "Set by default for PR testing")
 
+set (TPL_Scotch_INCLUDE_DIRS "$ENV{SEMS_SCOTCH_INCLUDE_PATH}" CACHE PATH "Set by default for PR testing")
+set (Scotch_LIBRARY_DIRS "$ENV{SEMS_SCOTCH_LIBRARY_PATH}" CACHE PATH "Set by default for PR testing")
diff --git a/cmake/std/sems/PullRequestGCC4.8.4TestingEnv.sh b/cmake/std/sems/PullRequestGCC4.8.4TestingEnv.sh
@@ -19,7 +19,7 @@ module load sems-zlib/1.2.8/base
 module load sems-hdf5/1.8.12/parallel
 module load sems-netcdf/4.4.1/exo_parallel
 module load sems-parmetis/4.0.3/parallel
-module load sems-scotch/6.0.3/parallel
+module load sems-scotch/6.0.3/nopthread_64bit_parallel
 module load sems-superlu/4.3/base
 
 # Using CMake and Ninja modules from the ATDM project space.

diff --git a/cmake/std/sems/PullRequestGCC4.9.3TestingEnv.sh b/cmake/std/sems/PullRequestGCC4.9.3TestingEnv.sh
@@ -19,9 +19,15 @@ module load sems-zlib/1.2.8/base
 module load sems-hdf5/1.8.12/parallel
 module load sems-netcdf/4.4.1/exo_parallel
 module load sems-parmetis/4.0.3/parallel
-module load sems-scotch/6.0.3/parallel
+module load sems-scotch/6.0.3/nopthread_64bit_parallel
 module load sems-superlu/4.3/base
 
+# Using CMake and Ninja modules from the ATDM project space.
+# SEMS does not yet supply a recent enough version of CMake
+# for the single configure/build/test capability. We are also
+# using a custom version of Ninja (with Fortran support not
+# available in main-line Ninja) to significantly speed up
+# compile and link times.
 module load atdm-env
 module load atdm-cmake/3.11.1
 module load atdm-ninja_fortran/1.7.2

diff --git a/cmake/std/sems/PullRequestIntel17.0.1TestingEnv.sh b/cmake/std/sems/PullRequestIntel17.0.1TestingEnv.sh
@@ -21,7 +21,7 @@ module load sems-zlib/1.2.8/base
 module load sems-hdf5/1.8.12/parallel
 module load sems-netcdf/4.4.1/exo_parallel
 module load sems-parmetis/4.0.3/parallel
-module load sems-scotch/6.0.3/parallel
+module load sems-scotch/6.0.3/nopthread_64bit_parallel
 module load sems-superlu/4.3/base
 
 # Using CMake and Ninja modules from the ATDM project space.