Merge Pull Request #7726 from trilinos/Trilinos/master_merge_20200725…

…_000609

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20200725_000609 branch to master
PR Author: trilinos-autotester

cmake/ctest/drivers/atdm/TrilinosCTestDriverCore.atdm.cmake

@@ -83,8 +83,8 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
   PRINT_VAR(ATDM_CONFIGURE_OPTIONS_FILES)
 
   MESSAGE("Include the configure options files at the top level to influence what package get enabled or disabled ...")
-  SPLIT("${ATDM_CONFIGURE_OPTIONS_FILES}" "," ATDM_CONFIGURE_OPTIONS_FILES)
-  FOREACH (CONFIG_OPTIONS_FILE ${ATDM_CONFIGURE_OPTIONS_FILES})
+  SPLIT("${ATDM_CONFIGURE_OPTIONS_FILES}" "," ATDM_CONFIGURE_OPTIONS_FILES_LIST)
+  FOREACH (CONFIG_OPTIONS_FILE ${ATDM_CONFIGURE_OPTIONS_FILES_LIST})
     SET(CONFIG_OPTIONS_FILE "${TRIBITS_PROJECT_ROOT}/${CONFIG_OPTIONS_FILE}")
     MESSAGE("Including ${CONFIG_OPTIONS_FILE} ...")
     INCLUDE("${CONFIG_OPTIONS_FILE}")

cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini-no-mpi_clang-9.0.1_serial_static_opt.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+export Trilinos_TRACK=ATDM
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh

cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini-no-mpi_cuda-10.1.243_gcc-7.2.0_static_opt.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+export Trilinos_TRACK=ATDM
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh

cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini-no-mpi_gnu-7.2.0_serial_static_opt.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+export Trilinos_TRACK=ATDM
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh

cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini-no-mpi_intel-18.0.2_mpich2-3.2_static_opt.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+export Trilinos_TRACK=ATDM
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh

cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_clang-9.0.1_openmpi-4.0.3_serial_static_opt.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+export Trilinos_TRACK=ATDM
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh

cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_static_dbg.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+export Trilinos_TRACK=ATDM
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh

cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_static_opt.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+export Trilinos_TRACK=ATDM
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh

cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_gnu-7.2.0_openmpi-4.0.3_serial_static_opt.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+export Trilinos_TRACK=ATDM
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh

cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_mini_intel-18.0.2_mpich2-3.2_static_opt.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+export Trilinos_TRACK=ATDM
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh

cmake/ctest/drivers/atdm/cee-rhel6/local-driver.sh

@@ -1,7 +1,17 @@
 #!/bin/bash -l
 
-if [ "${Trilinos_CTEST_DO_ALL_AT_ONCE}" == "" ] ; then
-  export Trilinos_CTEST_DO_ALL_AT_ONCE=TRUE
+set +x
+
+# Need to load env so we define some vars
+source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME
+
+# Make adjustments for mini build of Trilinos for SPARC
+if atdm_match_buildname_keyword mini ; then
+  echo "This is a mini build of Trilinos for SPARC!"
+  export ATDM_CONFIG_CONFIGURE_OPTIONS_FILES=cmake/std/atdm/apps/sparc/SPARC_MiniTrilinos_PACKAGES.cmake,cmake/std/atdm/ATDMDevEnv.cmake
+  # NOTE: Above, we list SPARC_MiniTrilinos_PACKAGES.cmake before
+  # ATDMDevEnv.cmake so that defaults for cache vars are set there before they
+  # get set in ATDMDevEnv.cmake.
 fi
 
 set -x

cmake/std/atdm/ATDMDevEnvSettings.cmake

@@ -28,6 +28,7 @@ ASSERT_DEFINED(ENV{ATDM_CONFIG_BUILD_COUNT})
 
 ASSERT_DEFINED(ENV{ATDM_CONFIG_SYSTEM_NAME})
 ASSERT_DEFINED(ENV{ATDM_CONFIG_COMPILER})
+ASSERT_DEFINED(ENV{ATDM_CONFIG_USE_MPI})
 ASSERT_DEFINED(ENV{ATDM_CONFIG_BUILD_TYPE})
 ASSERT_DEFINED(ENV{ATDM_CONFIG_CUDA_RDC})
 ASSERT_DEFINED(ENV{ATDM_CONFIG_COMPLEX})
@@ -169,21 +170,31 @@ FOREACH(ATDM_TWEAKS_FILE ${ATDM_TWEAKS_FILES})
 ENDFOREACH()
 
 #
-# C) Set the compilers
+# C) Set the compilers and MPI usage
 #
 
 # All ATDM builds of Trilinos are MPI builds!
-ATDM_SET_ENABLE(TPL_ENABLE_MPI ON)
 
-# Assert compiler env vars are set
-ASSERT_DEFINED(ENV{MPICC})
-ASSERT_DEFINED(ENV{MPICXX})
-ASSERT_DEFINED(ENV{MPIF90})
+# Set compilers AND mpi 
+SET(ATDM_USE_MPI "$ENV{ATDM_CONFIG_USE_MPI}")
+IF (ATDM_USE_MPI)
+  ASSERT_DEFINED(ENV{MPICC})
+  ASSERT_DEFINED(ENV{MPICXX})
+  ASSERT_DEFINED(ENV{MPIF90})
+  ATDM_SET_CACHE(CMAKE_C_COMPILER "$ENV{MPICC}" CACHE FILEPATH)
+  ATDM_SET_CACHE(CMAKE_CXX_COMPILER "$ENV{MPICXX}" CACHE FILEPATH)
+  ATDM_SET_CACHE(CMAKE_Fortran_COMPILER "$ENV{MPIF90}" CACHE FILEPATH)
+  ATDM_SET_ENABLE(TPL_ENABLE_MPI ON)
+ELSE()
+  ASSERT_DEFINED(ENV{SERIAL_CC})
+  ASSERT_DEFINED(ENV{SERIAL_CXX})
+  ASSERT_DEFINED(ENV{SERIAL_FC})
+  ATDM_SET_CACHE(CMAKE_C_COMPILER "$ENV{SERIAL_CC}" CACHE FILEPATH)
+  ATDM_SET_CACHE(CMAKE_CXX_COMPILER "$ENV{SERIAL_CXX}" CACHE FILEPATH)
+  ATDM_SET_CACHE(CMAKE_Fortran_COMPILER "$ENV{SERIAL_FC}" CACHE FILEPATH)
+  ATDM_SET_ENABLE(TPL_ENABLE_MPI OFF)
+ENDIF()
 
-# Set compilers
-ATDM_SET_CACHE(CMAKE_C_COMPILER "$ENV{MPICC}" CACHE FILEPATH)
-ATDM_SET_CACHE(CMAKE_CXX_COMPILER "$ENV{MPICXX}" CACHE FILEPATH)
-ATDM_SET_CACHE(CMAKE_Fortran_COMPILER "$ENV{MPIF90}" CACHE FILEPATH)
 IF (ATDM_ENABLE_SPARC_SETTINGS  OR  ATDM_PT_PACKAGES)
   ATDM_SET_ENABLE(Trilinos_ENABLE_Fortran ON)
 ELSE()
@@ -392,16 +403,24 @@ ELSE()
 ENDIF()
 
 # METIS
-ATDM_SET_ENABLE(TPL_ENABLE_METIS ${ATDM_ENABLE_SPARC_SETTINGS})
-ATDM_SET_CACHE(METIS_INCLUDE_DIRS "$ENV{METIS_ROOT}/include" CACHE FILEPATH)
-ATDM_SET_CACHE(METIS_LIBRARY_DIRS "$ENV{METIS_ROOT}/lib" CACHE FILEPATH)
-ATDM_SET_CACHE(TPL_METIS_LIBRARIES "$ENV{ATDM_CONFIG_METIS_LIBS}" CACHE FILEPATH)
+IF (ATDM_ENABLE_SPARC_SETTINGS AND ATDM_USE_MPI)
+  ATDM_SET_ENABLE(TPL_ENABLE_METIS ON)
+  ATDM_SET_CACHE(METIS_INCLUDE_DIRS "$ENV{METIS_ROOT}/include" CACHE FILEPATH)
+  ATDM_SET_CACHE(METIS_LIBRARY_DIRS "$ENV{METIS_ROOT}/lib" CACHE FILEPATH)
+  ATDM_SET_CACHE(TPL_METIS_LIBRARIES "$ENV{ATDM_CONFIG_METIS_LIBS}" CACHE FILEPATH)
+ELSE()
+  ATDM_SET_ENABLE(TPL_ENABLE_METIS OFF)
+ENDIF()
 
 # ParMETIS
-ATDM_SET_ENABLE(TPL_ENABLE_ParMETIS ${ATDM_ENABLE_SPARC_SETTINGS})
-ATDM_SET_CACHE(ParMETIS_INCLUDE_DIRS "$ENV{PARMETIS_ROOT}/include" CACHE FILEPATH)
-ATDM_SET_CACHE(ParMETIS_LIBRARY_DIRS "$ENV{PARMETIS_ROOT}/lib" CACHE FILEPATH)
-ATDM_SET_CACHE(TPL_ParMETIS_LIBRARIES "$ENV{ATDM_CONFIG_PARMETIS_LIBS}" CACHE FILEPATH)
+IF (ATDM_ENABLE_SPARC_SETTINGS AND ATDM_USE_MPI)
+  ATDM_SET_ENABLE(TPL_ENABLE_ParMETIS ON)
+  ATDM_SET_CACHE(ParMETIS_INCLUDE_DIRS "$ENV{PARMETIS_ROOT}/include" CACHE FILEPATH)
+  ATDM_SET_CACHE(ParMETIS_LIBRARY_DIRS "$ENV{PARMETIS_ROOT}/lib" CACHE FILEPATH)
+  ATDM_SET_CACHE(TPL_ParMETIS_LIBRARIES "$ENV{ATDM_CONFIG_PARMETIS_LIBS}" CACHE FILEPATH)
+ELSE()
+  ATDM_SET_ENABLE(TPL_ENABLE_ParMETIS OFF)
+ENDIF()
 
 # HWLOC
 ATDM_SET_ENABLE(TPL_ENABLE_HWLOC ${ATDM_USE_HWLOC})
@@ -412,22 +431,40 @@ ATDM_SET_ENABLE(TPL_ENABLE_LAPACK ON)
 ATDM_SET_CACHE(TPL_LAPACK_LIBRARIES "$ENV{ATDM_CONFIG_LAPACK_LIBS}" CACHE FILEPATH)
 
 # CGNS
-ATDM_SET_ENABLE(TPL_ENABLE_CGNS ${ATDM_ENABLE_SPARC_SETTINGS})
-ATDM_SET_CACHE(CGNS_INCLUDE_DIRS "$ENV{CGNS_ROOT}/include" CACHE FILEPATH)
-ATDM_SET_CACHE(CGNS_LIBRARY_DIRS "$ENV{CGNS_ROOT}/lib" CACHE FILEPATH)
-IF (NOT "$ENV{ATDM_CONFIG_CGNS_LIBRARY_NAMES}" STREQUAL "")
-  ATDM_SET_CACHE(CGNS_LIBRARY_NAMES "$ENV{ATDM_CONFIG_CGNS_LIBRARY_NAMES}" CACHE FILEPATH)
+IF (ATDM_ENABLE_SPARC_SETTINGS)
+  ATDM_SET_ENABLE(TPL_ENABLE_CGNS ON)
+  IF (ATDM_USE_MPI)
+    ASSERT_DEFINED(ENV{CGNS_ROOT})
+    SET(ATDM_CGNS_ROOT "$ENV{CGNS_ROOT}")
+  ELSE()
+    ASSERT_DEFINED(ENV{SPARC_SERIAL_CGNS_ROOT})
+    SET(ATDM_CGNS_ROOT "$ENV{SPARC_SERIAL_CGNS_ROOT}")
+  ENDIF()
+  ATDM_SET_CACHE(CGNS_INCLUDE_DIRS "${ATDM_CGNS_ROOT}/include" CACHE FILEPATH)
+  ATDM_SET_CACHE(CGNS_LIBRARY_DIRS "${ATDM_CGNS_ROOT}/lib" CACHE FILEPATH)
+  IF (NOT "$ENV{ATDM_CONFIG_CGNS_LIBRARY_NAMES}" STREQUAL "")
+    ATDM_SET_CACHE(CGNS_LIBRARY_NAMES "$ENV{ATDM_CONFIG_CGNS_LIBRARY_NAMES}" CACHE FILEPATH)
+  ENDIF()
+  ATDM_SET_CACHE(TPL_CGNS_LIBRARIES "$ENV{ATDM_CONFIG_CGNS_LIBS}" CACHE FILEPATH)
+ELSE()
+  ATDM_SET_ENABLE(TPL_ENABLE_CGNS OFF)
 ENDIF()
-ATDM_SET_CACHE(TPL_CGNS_LIBRARIES "$ENV{ATDM_CONFIG_CGNS_LIBS}" CACHE FILEPATH)
 
 # HDF5
 ATDM_SET_ENABLE(TPL_ENABLE_HDF5 ON)
-ATDM_SET_CACHE(HDF5_INCLUDE_DIRS "$ENV{HDF5_ROOT}/include" CACHE FILEPATH)
+IF (ATDM_USE_MPI)
+  ASSERT_DEFINED(ENV{HDF5_ROOT})
+  ATDM_SET_CACHE(HDF5_ROOT "$ENV{HDF5_ROOT}" CACHE FILEPATH)
+ELSE()
+  ASSERT_DEFINED(ENV{SPARC_SERIAL_HDF5_ROOT})
+  ATDM_SET_CACHE(HDF5_ROOT "$ENV{SPARC_SERIAL_HDF5_ROOT}" CACHE FILEPATH)
+ENDIF()
+ATDM_SET_CACHE(HDF5_INCLUDE_DIRS "${HDF5_ROOT}/include" CACHE FILEPATH)
 IF (NOT "$ENV{ATDM_CONFIG_HDF5_LIBS}" STREQUAL "")
   ATDM_SET_CACHE(TPL_HDF5_LIBRARIES "$ENV{ATDM_CONFIG_HDF5_LIBS}" CACHE FILEPATH)
 ELSE()
   ASSERT_DEFINED(ENV{ZLIB_ROOT})
-  ATDM_SET_CACHE(TPL_HDF5_LIBRARIES "$ENV{HDF5_ROOT}/lib/libhdf5_hl.${ATDM_TPL_LIB_EXT};$ENV{HDF5_ROOT}/lib/libhdf5.${ATDM_TPL_LIB_EXT};$ENV{ZLIB_ROOT}/lib/libz.${ATDM_TPL_LIB_EXT};-ldl" CACHE FILEPATH)
+  ATDM_SET_CACHE(TPL_HDF5_LIBRARIES "${HDF5_ROOT}/lib/libhdf5_hl.${ATDM_TPL_LIB_EXT};${HDF5_ROOT}/lib/libhdf5.${ATDM_TPL_LIB_EXT};$ENV{ZLIB_ROOT}/lib/libz.${ATDM_TPL_LIB_EXT};-ldl" CACHE FILEPATH)
 ENDIF()
 
 # Netcdf
@@ -436,9 +473,14 @@ ATDM_SET_CACHE(NETCDF_ROOT "$ENV(NETCDF_ROOT)" CACHE FILEPATH)
 IF (ATDM_USE_SPARC_TPL_FIND_SETTINGS)
   # SPARC ATDM Trilinos configuration has SEACAS-customized FindNetCDF.cmake
   # module recurrsively find PNetCDF and HDF5 internally!
-  ATDM_SET_CACHE(HDF5_ROOT "$ENV{HDF5_ROOT}" CACHE FILEPATH)
+  IF (ATDM_USE_MPI)
+    ASSERT_DEFINED(ENV{NETCDF_ROOT})
+    ATDM_SET_CACHE(NetCDF_ROOT "$ENV{NETCDF_ROOT}" CACHE FILEPATH)
+  ELSE()
+    ASSERT_DEFINED(ENV{SPARC_SERIAL_NETCDF_ROOT})
+    ATDM_SET_CACHE(NetCDF_ROOT "$ENV{SPARC_SERIAL_NETCDF_ROOT}" CACHE FILEPATH)
+  ENDIF()
   ATDM_SET_CACHE(PNetCDF_ROOT "$ENV{PNETCDF_ROOT}" CACHE FILEPATH)
-  ATDM_SET_CACHE(NetCDF_ROOT "$ENV{NETCDF_ROOT}" CACHE FILEPATH)
 ELSE()
   ATDM_SET_CACHE(Netcdf_INCLUDE_DIRS "$ENV{NETCDF_ROOT}/include" CACHE FILEPATH)
   ATDM_SET_CACHE(TPL_Netcdf_PARALLEL "ON" CACHE BOOL)
@@ -451,14 +493,18 @@ ELSE()
       SET(PNETCDF_ROOT "$ENV{PNETCDF_ROOT}")
     ENDIF()
     ASSERT_DEFINED(ENV{ZLIB_ROOT})
-    ATDM_SET_CACHE(TPL_Netcdf_LIBRARIES "$ENV{NETCDF_ROOT}/lib/libnetcdf.${ATDM_TPL_LIB_EXT};${PNETCDF_ROOT}/lib/libpnetcdf.a;$ENV{HDF5_ROOT}/lib/libhdf5_hl.${ATDM_TPL_LIB_EXT};$ENV{HDF5_ROOT}/lib/libhdf5.${ATDM_TPL_LIB_EXT};$ENV{ZLIB_ROOT}/lib/libz.${ATDM_TPL_LIB_EXT};-ldl;-lcurl" CACHE FILEPATH)
+    ATDM_SET_CACHE(TPL_Netcdf_LIBRARIES "$ENV{NETCDF_ROOT}/lib/libnetcdf.${ATDM_TPL_LIB_EXT};${PNETCDF_ROOT}/lib/libpnetcdf.a;${HDF5_ROOT}/lib/libhdf5_hl.${ATDM_TPL_LIB_EXT};${HDF5_ROOT}/lib/libhdf5.${ATDM_TPL_LIB_EXT};$ENV{ZLIB_ROOT}/lib/libz.${ATDM_TPL_LIB_EXT};-ldl;-lcurl" CACHE FILEPATH)
   ENDIF()
 ENDIF()
 
 # SuperLUDist
-ATDM_SET_ENABLE(TPL_ENABLE_SuperLUDist ${ATDM_ENABLE_SPARC_SETTINGS})
-ATDM_SET_CACHE(SuperLUDist_INCLUDE_DIRS "$ENV{ATDM_CONFIG_SUPERLUDIST_INCLUDE_DIRS}" CACHE FILEPATH)
-ATDM_SET_CACHE(TPL_SuperLUDist_LIBRARIES "$ENV{ATDM_CONFIG_SUPERLUDIST_LIBS}" CACHE FILEPATH)
+IF (ATDM_ENABLE_SPARC_SETTINGS AND ATDM_USE_MPI)
+  ATDM_SET_ENABLE(TPL_ENABLE_SuperLUDist ON)
+  ATDM_SET_CACHE(SuperLUDist_INCLUDE_DIRS "$ENV{ATDM_CONFIG_SUPERLUDIST_INCLUDE_DIRS}" CACHE FILEPATH)
+  ATDM_SET_CACHE(TPL_SuperLUDist_LIBRARIES "$ENV{ATDM_CONFIG_SUPERLUDIST_LIBS}" CACHE FILEPATH)
+ELSE()
+  ATDM_SET_ENABLE(TPL_ENABLE_SuperLUDist OFF)
+ENDIF()
 
 # DLlib
 ATDM_SET_CACHE(TPL_DLlib_LIBRARIES "-ldl" CACHE FILEPATH)

cmake/std/atdm/README.md

@@ -78,7 +78,7 @@ keywords of the form `XXX-<keyword0>-<keyword1>-...-YYY` (or
 `XXX_<keyword0>_<keyword1>_..._YYY`, either separator is supported).  The
 typical order and format of this string is:
 
-    <system_name>-<kokkos_arch>-<compiler>-<kokkos_thread>-<rdc>-<complex>-<shared_static>-<release_debug>-<pt>
+    <system_name>-<use_mpi>-<kokkos_arch>-<compiler>-<kokkos_thread>-<rdc>-<complex>-<shared_static>-<release_debug>-<pt>
 
 but any order of these keywords is supported.  Also, the keywords are
 case-insensitive All of these keywords, except for `<compiler>` (which can be
@@ -88,10 +88,11 @@ name of a keyword is ignored.) See some examples of build name strings
 [below](#build-name-examples).
 
 Each of these keywords [`<system_name>`](#system_name),
-[`<kokkos_arch>`](#kokkos_arch), [`<compiler>`](#compiler),
-[`<kokkos_thread>`](#kokkos_thread), [`<rdc>`](#rdc), [`<fpic>`](#fpic),
-[`<complex>`](#complex), [`<shared_static>`](#shared_static),
-[`<release_debug>`](#release_debug), and [`<pt>`](#pt), are described below.
+[`<use_mpi>`](#use_mpi), [`<kokkos_arch>`](#kokkos_arch),
+[`<compiler>`](#compiler), [`<kokkos_thread>`](#kokkos_thread),
+[`<rdc>`](#rdc), [`<fpic>`](#fpic), [`<complex>`](#complex),
+[`<shared_static>`](#shared_static), [`<release_debug>`](#release_debug), and
+[`<pt>`](#pt), are described below.
 
 <a name="system_name"/>
 
@@ -167,6 +168,16 @@ which compilers and which versions are supported for a given system.)  If
 Carefully examine STDOUT after running `source cmake/std/atdm/load-env
 <build-name>` to see what compiler gets selected.
 
+<a name="use_mpi"/>
+
+**`<use_mpi>`:** The following `<build-name>` keywords determine if MPI is
+  enabled or not in Trilinos (i.e. the value of `TPL_ENABLE_MPI`):
+
+* `mpi`: Enable MPI and use MPI compler wrappers (`TPL_ENABLE_MPI=ON`, DEFAULT)
+* `no-mpi`: Don't enable MPI and use raw compilers (except for CUDA builds that use `nvcc_wrapper` for the C++ compiler) (`TPL_ENABLE_MPI=OFF`)
+
+NOTE: Setting `no-mpi` also switches to some non-MPI TPL builds and disables other TPLs like SuperLUDist that require MPI.
+
 <a name="kokkos_thread"/>
 
 **`<kokkos_thread>`:** The following `<build-name>` keywords determine the

cmake/std/atdm/apps/sparc/SPARCMiniTrilinosPackagesEnables.cmake

@@ -0,0 +1,10 @@
+INCLUDE("${CMAKE_CURRENT_LIST_DIR}/SPARCMiniTrilinosPackagesList.cmake")
+FOREACH(TRIBITS_PACKAGE ${SPARC_MiniTrilinos_Package_Enables})
+  SET(${PROJECT_NAME}_ENABLE_${TRIBITS_PACKAGE} ON CACHE BOOL "")
+ENDFOREACH()
+FOREACH(TRIBITS_PACKAGE ${SPARC_MiniTrilinos_Package_Disables})
+  SET(${PROJECT_NAME}_ENABLE_${TRIBITS_PACKAGE} OFF CACHE BOOL "")
+ENDFOREACH()
+FOREACH(TRIBITS_TPL ${SPARC_MiniTrilinos_TPL_Disables})
+  SET(TPL_ENABLE_${TRIBITS_TPL} OFF CACHE BOOL "")
+ENDFOREACH()

cmake/std/atdm/apps/sparc/SPARCMiniTrilinosPackagesList.cmake

@@ -0,0 +1,11 @@
+SET(SPARC_MiniTrilinos_Package_Enables
+  Kokkos
+  SEACAS
+  )
+SET(SPARC_MiniTrilinos_Package_Disables
+  Pamgen
+  )
+SET(SPARC_MiniTrilinos_TPL_Disables
+  METIS
+  ParMETIS
+  )

cmake/std/atdm/apps/sparc/SPARC_MiniTrilinos_PACKAGES.cmake

@@ -0,0 +1,7 @@
+# Include this file in the driver that calls TRIBITS_CTEST_DRIVER() to set the
+# list of packages used by a mini build of SPARC.
+INCLUDE("${CMAKE_CURRENT_LIST_DIR}/SPARCMiniTrilinosPackagesEnables.cmake")
+SET(Trilinos_PACKAGES ${SPARC_MiniTrilinos_Package_Enables})
+# NOTE: Above, it is harmless to have the package enables set in
+# SPARCMiniTrilinosPackagesEnables.cmake in the outer ctest -S driver script.
+# We just include that file here to avoid duplicate code.

cmake/std/atdm/cee-rhel6/all_supported_builds.sh

@@ -8,14 +8,26 @@ if [[ "${HOSTNAME}" == "ascicgpu"* ]] ; then
   export ATDM_CONFIG_ALL_SUPPORTED_BUILDS=(
     cee-rhel6_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_shared_opt # SPARC Nightly build
     cee-rhel6_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_shared_dbg # SPARC Nightly build
+    ### SPARC MINI BUILDS ####
+    cee-rhel6_mini_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_static_opt
+    cee-rhel6_mini_cuda-10.1.243_gcc-7.2.0_openmpi-4.0.3_static_dbg
+    cee-rhel6_mini-no-mpi_cuda-10.1.243_gcc-7.2.0_static_opt
     )
 else
   export ATDM_CONFIG_ALL_SUPPORTED_BUILDS=(
-    #cee-rhel6_clang-9.0.1_openmpi-4.0.3_serial_static_dbg    # SPARC has installs with this build
+    #cee-rhel6_clang-9.0.1_openmpi-4.0.3_serial_static_dbg     # SPARC has installs with this build
     cee-rhel6_clang-9.0.1_openmpi-4.0.3_serial_static_opt      # SPARC CI build
     cee-rhel6_gnu-7.2.0_openmpi-4.0.3_serial_shared_opt        # SPARC CI build
     cee-rhel6_intel-18.0.2_mpich2-3.2_openmp_static_opt        # SPARC CI build
     cee-rhel6_intel-19.0.3_intelmpi-2018.4_serial_static_opt   # SPARC Nightly bulid
+    cee-rhel6_mini_clang-9.0.1_openmpi-4.0.3_serial_static_opt
+    #### SPARC MINI BUILDS ####
+    cee-rhel6_mini_gnu-7.2.0_openmpi-4.0.3_serial_static_opt
+    cee-rhel6_mini_clang-9.0.1_openmpi-4.0.3_serial_static_opt
+    cee-rhel6_mini-no-mpi_gnu-7.2.0_serial_static_opt
+    cee-rhel6_mini-no-mpi_clang-9.0.1_serial_static_opt
+    cee-rhel6_mini_intel-18.0.2_mpich2-3.2_static_opt
+    cee-rhel6_mini-no-mpi_intel-18.0.2_mpich2-3.2_static_opt
     )
 fi
 

cmake/std/atdm/cee-rhel6/environment.sh

@@ -244,7 +244,13 @@ atdm_config_add_libs_to_var ATDM_CONFIG_BOOST_LIBS ${BOOST_ROOT}/lib .a \
 # However, set the direct libs for HDF5 and NetCDF in case we use that option
 # for building (see env var ATDM_CONFIG_USE_SPARC_TPL_FIND_SETTINGS).
 
-export ATDM_CONFIG_HDF5_LIBS="-L${HDF5_ROOT}/lib;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl"
+if [[ "${ATDM_CONFIG_USE_MPI}" == "ON" ]] ; then
+  USE_HDF5_ROOT="${HDF5_ROOT}"
+else
+  USE_HDF5_ROOT="${SPARC_SERIAL_HDF5_ROOT}"
+fi
+
+export ATDM_CONFIG_HDF5_LIBS="-L${USE_HDF5_ROOT}/lib;${USE_HDF5_ROOT}/lib/libhdf5_hl.a;${USE_HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl"
 
 if [[ "${PNETCDF_ROOT}" == "" ]] ; then
   export PNETCDF_ROOT=${NETCDF_ROOT}

cmake/std/atdm/test/unit_tests/CMakeLists.txt

@@ -22,7 +22,7 @@ TRIBITS_ADD_ADVANCED_TEST( set_build_options_unit_tests
   OVERALL_NUM_MPI_PROCS 1
   TEST_0 CMND env
     ARGS SHUNIT_COLOR=none ${CMAKE_CURRENT_SOURCE_DIR}/set_build_options_unit_tests.sh
-    PASS_REGULAR_EXPRESSION_ALL "Ran 13 test" "[^]OK[$]"
+    PASS_REGULAR_EXPRESSION_ALL "Ran 14 test" "[^]OK[$]"
     ALWAYS_FAIL_ON_NONZERO_RETURN
   )