Merge 'trilinos/Trilinos:develop' (4cfa684) into 'tcad-charon/Trilino…

…s:develop' (2bfd2c7).

* trilinos-develop: (122 commits)
  Tpetra: fixing small typo
  Moertel: fix warnings due to signed/unsigned comparison, see issue trilinos#6698
  Incoprporating changes suggested in PR
  Tpetra: adding benchmark for CrsMatrix::apply, see issue trilinos#6692
  Add clang-7.0.1 explicitly in parsing (ATDV-291)
  Tpetra::CrsGraph: Fix build errors relating to unique_ptr
  MueLu ParameterListInterpreter test: Remove and regenerate xml
  Tpetra::CrsGraph::makeIndicesLocal: Add verbose output
  Tpetra::CrsMatrix::globalAssemble: Add verbose debugging output
  Tpetra::CrsMatrix::fillLocalMatrix: Add verbose output
  Tpetra::CrsMatrix::fillLocalGraphAndMatrix: Add verbose output
  Tpetra::CrsMatrix: Add more verbose output on allocation
  Tpetra: Add verbose debugging output to padCrsArrays
  PyTrilinos: Update swig interface files for SWIG 4.0
  PyTrilinos: Update build system for SWIG 4.0
  PyTrilinos: Replace SWIGEMPTYHACK with PYTRILINOS_NULLSTR
  Tpetra::Crs{Graph,Matrix}: Add verbose output for memory use
  MueLu: adding thresholding of the interpolation values in GeometricInterpolationPFactory, see issue trilinos#6681
  Made default clang7, tested with openmp and empire
  This turns off the Anasazi_Epetra_OrthoManagerGenTester_0_MPI_4 test
  ...

cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-gnu-7.3.1-spmpi-2019.06.24_static_dbg.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+if [ "${Trilinos_TRACK}" == "" ] ; then
+  export Trilinos_TRACK=Experimental
+fi
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh

cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-gnu-7.3.1-spmpi-2019.06.24_static_opt.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+if [ "${Trilinos_TRACK}" == "" ] ; then
+  export Trilinos_TRACK=Experimental
+fi
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh

cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-gnu-7.3.1-spmpi-2019.06.24_serial_static_dbg.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+if [ "${Trilinos_TRACK}" == "" ] ; then
+  export Trilinos_TRACK=Experimental
+fi
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh

cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-gnu-7.3.1-spmpi-2019.06.24_serial_static_opt.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+if [ "${Trilinos_TRACK}" == "" ] ; then
+  export Trilinos_TRACK=Experimental
+fi
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh

cmake/ctest/drivers/atdm/ats2/local-driver.sh

@@ -0,0 +1,21 @@
+#!/bin/bash -l
+
+if [ "${LSF_CTEST_TIMEOUT}" == "" ] ; then
+  LSF_CTEST_TIMEOUT=4:00
+  # This is just running tests, not the entire build!
+fi
+
+if [ "${Trilinos_CTEST_DO_ALL_AT_ONCE}" == "" ] ; then
+  export Trilinos_CTEST_DO_ALL_AT_ONCE=TRUE
+fi
+
+set -x
+
+source $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ctest-s-driver-config-build.sh
+
+set -x
+
+atdm_run_script_on_compute_node \
+  $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ctest-s-driver-test.sh \
+  $PWD/ctest-s-driver-test.out \
+  ${LSF_CTEST_TIMEOUT}

cmake/ctest/drivers/atdm/utils/setup_env.sh

@@ -9,8 +9,10 @@ echo
 echo "cmake in path:"
 which cmake
 echo
-echo "ninja in path:"
-which ninja
+if [[ "$ATDM_CONFIG_USE_NINJA" == "ON" ]]; then
+  echo "ninja in path:"
+  which ninja
+fi
 echo
 echo "ATDM config env vars:"
 set | grep ATDM_CONFIG_

cmake/std/PullRequestLinuxCommonTestingSettings.cmake

@@ -60,6 +60,9 @@ set (Piro_EpetraSolver_MPI_4_DISABLE ON CACHE BOOL "Set by default for PR testin
 # Disable tests that timeout in PR testing until it can be fixed (#4614)
 set (PanzerAdaptersSTK_PoissonInterfaceExample_2d_diffsideids_MPI_1_DISABLE ON CACHE BOOL "Set by default for PR testing")
 
+# Disable long-failing Anazazi test until it can be fixed (#3585)
+set (Anasazi_Epetra_OrthoManagerGenTester_0_MPI_4_DISABLE ON CACHE BOOL "Set by default for PR testing")
+
 # Options from SEMSDevEnv.cmake
 
 SET(CMAKE_C_COMPILER "$ENV{MPICC}" CACHE FILEPATH "Set by default for PR testing")

cmake/std/atdm/ATDMDevEnvSettings.cmake

@@ -278,9 +278,13 @@ ATDM_SET_CACHE(Trilinos_ENABLE_OpenMP "${ATDM_USE_OPENMP}" CACHE BOOL)
 ATDM_SET_CACHE(Trilinos_ENABLE_COMPLEX "${ATDM_COMPLEX}" CACHE BOOL)
 ATDM_SET_CACHE(Kokkos_ENABLE_OpenMP "${ATDM_USE_OPENMP}" CACHE BOOL)
 ATDM_SET_CACHE(Kokkos_ENABLE_Pthread "${ATDM_USE_PTHREADS}" CACHE BOOL)
+#ATDM_SET_CACHE(Kokkos_ENABLE_Cuda_UVM "$ENV{ATDM_CONFIG_Kokkos_ENABLE_Cuda_UVM}" CACHE BOOL)
 ATDM_SET_CACHE(Kokkos_ENABLE_Cuda_UVM "${ATDM_USE_CUDA}" CACHE BOOL)
 ATDM_SET_CACHE(Kokkos_ENABLE_Cuda_Relocatable_Device_Code "$ENV{ATDM_CONFIG_CUDA_RDC}"
   CACHE BOOL)
+ATDM_SET_CACHE(Kokkos_ENABLE_Serial "$ENV{ATDM_CONFIG_Kokkos_ENABLE_Serial}" CACHE BOOL)
+ATDM_SET_CACHE(Kokkos_ENABLE_Cuda "${ATDM_USE_CUDA}" CACHE BOOL)
+ATDM_SET_CACHE(Kokkos_ENABLE_Deprecated_Code "$ENV{ATDM_CONFIG_Kokkos_ENABLE_Deprecated_Code}" CACHE BOOL)
 ATDM_SET_CACHE(Kokkos_ENABLE_CXX11_DISPATCH_LAMBDA ON CACHE BOOL)
 ATDM_SET_CACHE(Kokkos_ENABLE_Cuda_Lambda "${ATDM_USE_CUDA}" CACHE BOOL)
 ATDM_SET_CACHE(Kokkos_ENABLE_Debug_Bounds_Check "${Trilinos_ENABLE_DEBUG}" CACHE BOOL)

cmake/std/atdm/ats2/all_supported_builds.sh

@@ -0,0 +1,11 @@
+
+export ATDM_CONFIG_CTEST_S_BUILD_NAME_PREFIX=Trilinos-atdm-
+
+#  ats2-xl-2019.08.20-spmpi-2019.06.24_openmp_static_opt
+#  ats2-xl-2019.08.20-spmpi-2019.06.24_openmp_static_dbg
+export ATDM_CONFIG_ALL_SUPPORTED_BUILDS=(
+  ats2-gnu-7.3.1-spmpi-2019.06.24_serial_static_opt
+  ats2-gnu-7.3.1-spmpi-2019.06.24_serial_static_dbg
+  ats2-cuda-10.1.243-gnu-7.3.1-spmpi-2019.06.24_static_opt
+  ats2-cuda-10.1.243-gnu-7.3.1-spmpi-2019.06.24_static_dbg
+  )

cmake/std/atdm/ats2/custom_builds.sh

@@ -0,0 +1,64 @@
+#
+# Custom builds for 'ats2' env
+#
+# NOTE: This file gets sourced in atdm/utils/set_build_options.sh before the
+# default grep logic is applied.
+#
+
+# Custom compiler selection logic
+
+if   [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243-xl-2019.08.20-spmpi-2019.06.24"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243_xl-2019.08.20_spmpi-2019.06.24"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243-xl-2019.08.20"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243_xl-2019.08.20"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243-xl-2019"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243_xl-2019"* ]] \
+  ; then
+  export ATDM_CONFIG_COMPILER=CUDA-10.1.243_XL-2019.08.20_SPMPI-2019.06.24
+
+elif [[ $ATDM_CONFIG_BUILD_NAME == *"xl-2019.08.20-spmpi-2019.06.24"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"xl-2019.08.20_spmpi-2019.06.24"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"xl-2019.08.20"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"xl-2019"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"xl"* ]] \
+  ; then
+  export ATDM_CONFIG_COMPILER=XL-2019.08.20_SPMPI-2019.06.24
+
+elif [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243-gnu-7.3.1-spmpi-2019.06.24"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243_gnu-7.3.1_spmpi-2019.06.24"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243-gnu-7.3.1"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243_gnu-7.3.1"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243-gnu-7"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243_gnu-7"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda"* ]] \
+  ; then
+  export ATDM_CONFIG_COMPILER=CUDA-10.1.243_GNU-7.3.1_SPMPI-2019.06.24
+  # NOTE: Default 'cuda' must be last cuda listed!
+
+elif [[ $ATDM_CONFIG_BUILD_NAME == *"gnu-7.3.1-spmpi-2019.06.24"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"gnu-7.3.1_spmpi-2019.06.24"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"gnu-7.3.1"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"gnu-7"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"gnu"* ]] \
+  || [[ $ATDM_CONFIG_BUILD_NAME == *"default" ]] \
+  ; then
+  export ATDM_CONFIG_COMPILER=GNU-7.3.1_SPMPI-2019.06.24
+  # NOTE: Defaut 'gnu' must be last 'gnu' listed!
+
+else
+  echo
+  echo "***"
+  echo "*** ERROR: A supported compiler was not selected for 'ats2' env - $ATDM_CONFIG_BUILD_NAME"
+  echo "***"
+  echo "*** Supported compilers include:"
+  echo "***"
+  echo "****  gnu-7.3.1_spmpi-2019.06.24                  (default, default gnu)"
+  echo "****  cuda-10.1.243_gnu-7.3.1_spmpi-2019.06.24    (default cuda)"
+  echo "****  xl-2019.08.20_spmpi-2019.06.24              (disabled)"
+  echo "****  cuda-10.1.243-gnu-7.3.1-spmpi-2019.06.24    (disabled)"
+  echo "***"
+  return
+
+fi