Merge 'trilinos/Trilinos:develop' (8c5bac7) into 'tcad-charon/Trilino…

…s:develop' (7db7806). * trilinos-develop: (128 commits) MueLu: Better configure time checks for matlab EXODUS: Fix a few off-by-one in copy_string (trilinos#4961) Phalanx: Evalautor Typo Fix tpetra: added scalar = int instantiation as suggested in trilinos#4951 Belos,Ifpack2,ShyLU: Fix use of deprecated Tpetra features MueLu: fix link issue Tpetra: Fix trilinos#4857 Tpetra::CrsGraph: Hide CrsGraphCopier in deprecated macro Tpetra::MultiVector: Hide MultiVectorCloner in deprecated macro Ifpack2: Fix use of deprecated Tpetra::Map constructor Tpetra,Ifpack2: Finish hiding methods deprecated by trilinos#2630 IOSS: Fix name length handling one last time SUPES: Fix off-by-one error xpetra: removed default types in deprecated code Set Trilinos_MAKE_INSTALL_WORLD_READABLE=ON by default (trilinos#2689) Automatic snapshot commit from tribits at 747ad3d KokkosKernels: Patching in test size reduction to D2GC unit test MueLu: Fixing issue identified by Yingzhou Li (4927) MueLu: Fixing issue identified by Yingzhou Li (4927) MueLu: Fixing issue identified by Yingzhou Li (4927) ...
tcad-charon · Apr 20, 2019 · a6a844d · a6a844d
2 parents 7db7806 + 8c5bac7
commit a6a844d
Show file tree

Hide file tree

Showing 379 changed files with 8,889 additions and 6,370 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,27 @@
+---
+name: Bug Report
+about: Help us fix something that's broken.
+title: "PackageName:  General Summary of the Bug"
+labels: "type: bug"
+assignees: ''
+
+---
+
+## Bug Report
+@trilinos/\<PackageName\>
+
+### Description
+What went wrong?  What should have happened?  Do you have an idea what might
+fix things?  How has this bug affected you?  What are you trying to accomplish?
+What specifically must we demonstrate to call this work complete?
+
+### Steps to Reproduce
+1. SHA1:  [insert here]
+1. Configure script:  [attach here]
+1. Configure log:  [attach here]
+1. Build log:  [attach here]
+1. Input deck:  [attach here]
+1. Do this.
+1. Do that.
+1. Shake fist angrily at computer.
+1. Run log:  [attach here]
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
@@ -0,0 +1,16 @@
+---
+name: Documentation
+about: Help us improve our documentation.
+title: "PackageName:  General Summary of the Documentation Needed"
+labels: "impacting: documentation"
+assignees: ''
+
+---
+
+## Documentation
+@trilinos/\<PackageName\>
+
+What would you like to see in the documentation?  How does our current
+documentation not meet your needs?  How has this lack of documentation affected
+you?  What are you trying to accomplish?  What specifically must we demonstrate
+to call this work complete?
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -0,0 +1,17 @@
+---
+name: Enhancement
+about: Help us fix something that's broken.
+title: "PackageName:  General Summary of the Enhancement"
+labels: "type: enhancement"
+assignees: ''
+
+---
+
+## Enhancement
+@trilinos/\<PackageName\>
+
+What feature/addition is needed?  How does this differ from what we currently
+have?  Are there any alternative solutions you've considered?  Do you have
+suggestions on implementation?  How has the lack of this feature affected you? 
+What are you trying to accomplish?  What specifically must we demonstrate to
+call this work complete?
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,15 @@
+---
+name: Question
+about: What's something you need help with?
+title: "PackageName:  General Summary of the Question"
+labels: "type: question"
+assignees: ''
+
+---
+
+## Question
+@trilinos/\<PackageName\>
+
+What are you wondering about?  What has you confused?  What answers do you
+need?  What are you trying to accomplish?  How does your question fit into what
+you're trying to do?
diff --git a/...m-white-ride-cuda-10.0-gnu-7.4.0-debug.sh → ...m-white-ride-cuda-10.1-gnu-7.2.0-debug.sh b/...m-white-ride-cuda-10.0-gnu-7.4.0-debug.sh → ...m-white-ride-cuda-10.1-gnu-7.2.0-debug.sh
diff --git a/...rs/atdm/ride/drivers/Trilinos-atdm-white-ride-cuda-10.1-gnu-7.2.0-rdc-release-debug-pt.sh b/...rs/atdm/ride/drivers/Trilinos-atdm-white-ride-cuda-10.1-gnu-7.2.0-rdc-release-debug-pt.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+if [ "${Trilinos_TRACK}" == "" ] ; then
+  export Trilinos_TRACK=Specialized
+fi
+if [ "${ATDM_CONFIG_KNOWN_HOSTNAME}" == "ride" ] ; then
+  export EXCLUDE_NODES_FROM_BSUB="-R hname!=ride7"
+fi
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ride/local-driver.sh
diff --git a/...ride-cuda-10.0-gnu-7.4.0-release-debug.sh → ...-cuda-10.1-gnu-7.2.0-rdc-release-debug.sh b/...ride-cuda-10.0-gnu-7.4.0-release-debug.sh → ...-cuda-10.1-gnu-7.2.0-rdc-release-debug.sh
diff --git a/...white-ride-cuda-10.0-gnu-7.4.0-release.sh → ...ride-cuda-10.1-gnu-7.2.0-release-debug.sh b/...white-ride-cuda-10.0-gnu-7.4.0-release.sh → ...ride-cuda-10.1-gnu-7.2.0-release-debug.sh
diff --git a/...e/ctest/drivers/atdm/ride/drivers/Trilinos-atdm-white-ride-cuda-10.1-gnu-7.2.0-release.sh b/...e/ctest/drivers/atdm/ride/drivers/Trilinos-atdm-white-ride-cuda-10.1-gnu-7.2.0-release.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+if [ "${Trilinos_TRACK}" == "" ] ; then
+  export Trilinos_TRACK=Specialized
+fi
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ride/local-driver.sh
diff --git a/cmake/ctest/drivers/atdm/ride/drivers/Trilinos-atdm-white-ride-cuda-9.2-gnu-7.2.0-debug.sh b/cmake/ctest/drivers/atdm/ride/drivers/Trilinos-atdm-white-ride-cuda-9.2-gnu-7.2.0-debug.sh
@@ -2,4 +2,5 @@
 if [ "${Trilinos_TRACK}" == "" ] ; then
   export Trilinos_TRACK=ATDM
 fi
+export EXCLUDE_NODES_FROM_BSUB="-R hname!=ride14"
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ride/local-driver.sh
diff --git a/...ers/atdm/ride/drivers/Trilinos-atdm-white-ride-cuda-9.2-gnu-7.2.0-rdc-release-debug-pt.sh b/...ers/atdm/ride/drivers/Trilinos-atdm-white-ride-cuda-9.2-gnu-7.2.0-rdc-release-debug-pt.sh
@@ -2,4 +2,7 @@
 if [ "${Trilinos_TRACK}" == "" ] ; then
   export Trilinos_TRACK=Specialized
 fi
+if [ "${ATDM_CONFIG_KNOWN_HOSTNAME}" == "ride" ] ; then
+  export EXCLUDE_NODES_FROM_BSUB="-R hname!=ride7"
+fi
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ride/local-driver.sh
diff --git a/cmake/ctest/drivers/atdm/ride/drivers/Trilinos-atdm-white-ride-gnu-7.2.0-openmp-debug.sh b/cmake/ctest/drivers/atdm/ride/drivers/Trilinos-atdm-white-ride-gnu-7.2.0-openmp-debug.sh
@@ -2,4 +2,5 @@
 if [ "$Trilinos_TRACK" == "" ] ; then
   export Trilinos_TRACK=ATDM
 fi
+export EXCLUDE_NODES_FROM_BSUB="-R hname!=ride14"
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ride/local-driver.sh
diff --git a/cmake/ctest/drivers/atdm/ride/local-driver.sh b/cmake/ctest/drivers/atdm/ride/local-driver.sh
@@ -8,8 +8,10 @@ if [ "${Trilinos_CTEST_DO_ALL_AT_ONCE}" == "" ] ; then
   export Trilinos_CTEST_DO_ALL_AT_ONCE=TRUE
 fi
 
-if [ "${ATDM_CONFIG_KNOWN_HOSTNAME}" == "white" ] ; then
-  EXCLUDE_NODES_FROM_BSUB="-R hname!=white26&&hname!=white27"
+if [ "${EXCLUDE_NODES_FROM_BSUB}" == "" ] ; then
+  if [ "${ATDM_CONFIG_KNOWN_HOSTNAME}" == "white" ] ; then
+    EXCLUDE_NODES_FROM_BSUB="-R hname!=white26&&hname!=white27"
+  fi
 fi
 
 source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME

diff --git a/...vers/dorksaber/ctest_linux_nightly_mpi_debug_muelu_kokkos_refactor_openmp_dorksaber.cmake b/...vers/dorksaber/ctest_linux_nightly_mpi_debug_muelu_kokkos_refactor_openmp_dorksaber.cmake
@@ -73,7 +73,6 @@ SET(Trilinos_PACKAGES MueLu Xpetra Amesos2)
 SET(EXTRA_CONFIGURE_OPTIONS
   ### ETI ###
   "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON"
-    "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
     "-DTpetra_INST_INT_LONG_LONG:BOOL=ON"
     "-DTpetra_INST_SERIAL:BOOL=ON"
     "-DKokkos_ENABLE_Serial:BOOL=ON"

diff --git a/cmake/ctest/drivers/eleanor/ctest_linux_nightly_mpi_debug_muelu_extratypes_ei_eleanor.cmake b/cmake/ctest/drivers/eleanor/ctest_linux_nightly_mpi_debug_muelu_extratypes_ei_eleanor.cmake
@@ -73,7 +73,6 @@ SET(EXTRA_CONFIGURE_OPTIONS
   "-DMueLu_ENABLE_EXPLICIT_INSTANTIATION=ON"
 
   "-DMueLu_INST_DOUBLE_INT_LONGLONGINT=ON"
-  "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
 )
 
 #

diff --git a/cmake/ctest/drivers/eleanor/ctest_linux_nightly_serial_debug_muelu_extratypes_eleanor.cmake b/cmake/ctest/drivers/eleanor/ctest_linux_nightly_serial_debug_muelu_extratypes_eleanor.cmake
@@ -71,7 +71,6 @@ SET(Trilinos_PACKAGES MueLu Xpetra Amesos2)
 
 SET(EXTRA_CONFIGURE_OPTIONS
   "-DMueLu_INST_DOUBLE_INT_LONGLONGINT=ON"
-  "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
 
   "-DMueLu_INST_COMPLEX_INT_INT=ON"
   "-DTeuchos_ENABLE_COMPLEX=ON"

diff --git a/...rs/enigma/ctest_linux_mpi_release_muelu_no_int_no_serial_openmp_experimental_enigma.cmake b/...rs/enigma/ctest_linux_mpi_release_muelu_no_int_no_serial_openmp_experimental_enigma.cmake
@@ -78,7 +78,6 @@ SET(Trilinos_PACKAGES MueLu Xpetra)
 SET(EXTRA_CONFIGURE_OPTIONS
   ### ETI ###
   "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON"
-    "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
     "-DTpetra_INST_INT_INT:BOOL=OFF"
     "-DTpetra_INST_INT_LONG:BOOL=OFF"
     "-DTpetra_INST_INT_LONG_LONG:BOOL=ON"

diff --git a/...drivers/enigma/ctest_linux_mpi_release_no_serial_openmp_complex_experimental_enigma.cmake b/...drivers/enigma/ctest_linux_mpi_release_no_serial_openmp_complex_experimental_enigma.cmake
@@ -77,7 +77,6 @@ SET(Trilinos_PACKAGES MueLu Xpetra)
 SET(EXTRA_CONFIGURE_OPTIONS
   ### ETI ###
   "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON"
-    "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
     "-DTrilinos_ENABLE_COMPLEX:BOOL=ON"
     "-DTeuchos_ENABLE_COMPLEX:BOOL=ON"
     "-DTpetra_INST_COMPLEX_DOUBLE:BOOL=ON"

diff --git a/.../enigma/ctest_linux_mpi_release_openmp_no_epetra_no_int_complex_experimental_enigma.cmake b/.../enigma/ctest_linux_mpi_release_openmp_no_epetra_no_int_complex_experimental_enigma.cmake
@@ -76,7 +76,6 @@ SET(Trilinos_PACKAGES MueLu Xpetra)
 SET(EXTRA_CONFIGURE_OPTIONS
   ### ETI ###
   "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON"
-    "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
     "-DTrilinos_ENABLE_COMPLEX:BOOL=ON"
     "-DTeuchos_ENABLE_COMPLEX:BOOL=ON"
     "-DTpetra_INST_INT_INT:BOOL=OFF"

diff --git a/cmake/ctest/drivers/enigma/ctest_linux_nightly_mpi_debug_muelu_extratypes_ei_enigma.cmake b/cmake/ctest/drivers/enigma/ctest_linux_nightly_mpi_debug_muelu_extratypes_ei_enigma.cmake
@@ -80,7 +80,6 @@ SET(Trilinos_PACKAGES MueLu Xpetra Amesos2)
 
 SET(EXTRA_CONFIGURE_OPTIONS
   "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON"
-  "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
 
   "-DZoltan2_ENABLE_Experimental:BOOL=ON"
   "-DTPL_ENABLE_SuperLU:BOOL=ON"

diff --git a/...vers/enigma/ctest_linux_nightly_mpi_release_muelu_no_int_openmp_experimental_enigma.cmake b/...vers/enigma/ctest_linux_nightly_mpi_release_muelu_no_int_openmp_experimental_enigma.cmake
@@ -78,7 +78,6 @@ SET(Trilinos_PACKAGES MueLu Xpetra)
 SET(EXTRA_CONFIGURE_OPTIONS
   ### ETI ###
   "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON"
-    "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
     "-DTpetra_INST_INT_INT:BOOL=OFF"
     "-DTpetra_INST_INT_LONG:BOOL=OFF"
     "-DTpetra_INST_INT_LONG_LONG:BOOL=ON"

diff --git a/cmake/ctest/drivers/enigma/ctest_linux_nightly_serial_debug_muelu_extratypes_enigma.cmake b/cmake/ctest/drivers/enigma/ctest_linux_nightly_serial_debug_muelu_extratypes_enigma.cmake
@@ -77,7 +77,6 @@ SET(Trilinos_PACKAGES MueLu Xpetra Amesos2)
 
 SET(EXTRA_CONFIGURE_OPTIONS
     "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION=ON"
-    "-DTeuchos_ENABLE_LONG_LONG_INT=ON"
     "-DTpetra_INST_INT_LONG_LONG=ON"
     "-DTeuchos_ENABLE_COMPLEX=ON"
     "-DTrilinos_ENABLE_COMPLEX_DOUBLE=ON"

diff --git a/.../drivers/geminga/ctest_linux_nightly_mpi_release_muelu_kokkos_refactor_cuda_geminga.cmake b/.../drivers/geminga/ctest_linux_nightly_mpi_release_muelu_kokkos_refactor_cuda_geminga.cmake
@@ -76,7 +76,6 @@ SET(Trilinos_PACKAGES MueLu Xpetra Amesos2)
 SET(EXTRA_CONFIGURE_OPTIONS
   ### ETI ###
   "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON"
-    "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=OFF"
     "-DTpetra_INST_INT_LONG_LONG:BOOL=OFF"
     "-DTrilinos_ENABLE_COMPLEX:BOOL=ON"
     "-DTeuchos_ENABLE_COMPLEX:BOOL=OFF"

diff --git a/...rs/geminga/ctest_linux_nightly_mpi_release_muelu_no_epetra_no_serial_openmp_geminga.cmake b/...rs/geminga/ctest_linux_nightly_mpi_release_muelu_no_epetra_no_serial_openmp_geminga.cmake
@@ -78,7 +78,6 @@ SET(Trilinos_PACKAGES MueLu Xpetra)
 SET(EXTRA_CONFIGURE_OPTIONS
   ### ETI ###
   "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON"
-    "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
     "-DTpetra_INST_INT_LONG:BOOL=OFF"
     "-DTpetra_INST_INT_LONG_LONG:BOOL=ON"
     "-DTrilinos_ENABLE_OpenMP=ON"

diff --git a/...ivers/geminga/ctest_linux_nightly_mpi_release_muelu_tpetra_no_int_no_serial_geminga.cmake b/...ivers/geminga/ctest_linux_nightly_mpi_release_muelu_tpetra_no_int_no_serial_geminga.cmake
@@ -77,7 +77,6 @@ SET(Trilinos_PACKAGES MueLu Xpetra)
 SET(EXTRA_CONFIGURE_OPTIONS
   ### ETI ###
   "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON"
-    "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
     "-DTrilinos_ENABLE_COMPLEX:BOOL=ON"
     "-DTeuchos_ENABLE_COMPLEX:BOOL=ON"
     "-DTpetra_INST_INT_INT:BOOL=OFF"

diff --git a/.../drivers/geminga/ctest_linux_nightly_mpi_release_tpetra_no_int_experimental_geminga.cmake b/.../drivers/geminga/ctest_linux_nightly_mpi_release_tpetra_no_int_experimental_geminga.cmake
@@ -77,7 +77,6 @@ SET(Trilinos_PACKAGES Tpetra)
 SET(EXTRA_CONFIGURE_OPTIONS
   ### ETI ###
   "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON"
-    "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
     "-DTpetra_INST_INT_INT:BOOL=OFF"
     "-DTpetra_INST_INT_LONG_LONG:BOOL=ON"
     "-DTpetra_INST_COMPLEX_FLOAT:BOOL=OFF"

diff --git a/cmake/ctest/drivers/magret/ctest_linux_nightly_serial_debug_muelu_extratypes_ei_magret.cmake b/cmake/ctest/drivers/magret/ctest_linux_nightly_serial_debug_muelu_extratypes_ei_magret.cmake
@@ -73,7 +73,6 @@ SET(EXTRA_CONFIGURE_OPTIONS
   "-DMueLu_ENABLE_EXPLICIT_INSTANTIATION=ON"
 
   "-DMueLu_INST_DOUBLE_INT_LONGLONGINT=ON"
-  "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
 
   "-DMueLu_INST_COMPLEX_INT_INT=ON"
   "-DTeuchos_ENABLE_COMPLEX=ON"

diff --git a/cmake/ctest/drivers/magret/ctest_linux_nightly_serial_debug_muelu_extratypes_magret.cmake b/cmake/ctest/drivers/magret/ctest_linux_nightly_serial_debug_muelu_extratypes_magret.cmake
@@ -71,7 +71,6 @@ SET(Trilinos_PACKAGES MueLu Xpetra Amesos2)
 
 SET(EXTRA_CONFIGURE_OPTIONS
   "-DMueLu_INST_DOUBLE_INT_LONGLONGINT=ON"
-  "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
 
   "-DMueLu_INST_COMPLEX_INT_INT=ON"
   "-DTeuchos_ENABLE_COMPLEX=ON"

diff --git a/cmake/ctest/drivers/rhel6-x86_64/ctest_linux_nightly_jenkins_zoltan2.cmake b/cmake/ctest/drivers/rhel6-x86_64/ctest_linux_nightly_jenkins_zoltan2.cmake
@@ -137,10 +137,7 @@ setConfig( $ENV{JENKINS_Tpetra_INST_INT_INT}            Tpetra_INST_INT_INT )
 setConfig( $ENV{JENKINS_Tpetra_INST_INT_UNSIGNED}       Tpetra_INST_INT_UNSIGNED )
 setConfig( $ENV{JENKINS_Tpetra_INST_INT_UNSIGNED_LONG}  Tpetra_INST_INT_UNSIGNED_LONG )
 setConfig( $ENV{JENKINS_Tpetra_INST_INT_LONG}           Tpetra_INST_INT_LONG )
-
-# Special case - If Tpetra_INST_INT_LONG_LONG is on we also turn on Teuchos_ENABLE_LONG_LONG_INT
-setConfig( $ENV{JENKINS_Tpetra_INST_INT_LONG_LONG} Tpetra_INST_INT_LONG_LONG )
-setConfig( $ENV{JENKINS_Tpetra_INST_INT_LONG_LONG} Teuchos_ENABLE_LONG_LONG_INT )
+setConfig( $ENV{JENKINS_Tpetra_INST_INT_LONG_LONG}      Tpetra_INST_INT_LONG_LONG )
 
 # Special handling of the packages for cdash - handles Blank, TRUE, FALSE, EXCLUDE, or INCLUDE
 checkPackage( $ENV{JENKINS_USE_EPETRA}      Trilinos_ENABLE_Epetra    Epetra    )

diff --git a/...ers/trappist/ctest_linux_nightly_mpi_release_muelu_no_int_no_serial_openmp_trappist.cmake b/...ers/trappist/ctest_linux_nightly_mpi_release_muelu_no_int_no_serial_openmp_trappist.cmake
@@ -74,7 +74,6 @@ SET(Trilinos_PACKAGES MueLu Xpetra)
 SET(EXTRA_CONFIGURE_OPTIONS
   ### ETI ###
   "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON"
-    "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
     "-DTpetra_INST_INT_INT:BOOL=OFF"
     "-DTpetra_INST_INT_LONG:BOOL=OFF"
     "-DTpetra_INST_INT_LONG_LONG:BOOL=ON"

diff --git a/cmake/ctest/drivers/typhon/ctest_linux_nightly_mpi_debug_muelu_extratypes_ei_typhon.cmake b/cmake/ctest/drivers/typhon/ctest_linux_nightly_mpi_debug_muelu_extratypes_ei_typhon.cmake
@@ -71,7 +71,6 @@ SET(Trilinos_PACKAGES MueLu Xpetra Amesos2)
 
 SET(EXTRA_CONFIGURE_OPTIONS
   "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON"
-  "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
 
   "-DZoltan2_ENABLE_Experimental:BOOL=ON"
 )

diff --git a/...ctest/drivers/typhon/ctest_linux_nightly_mpi_debug_muelu_extratypes_ei_typhon_clang.cmake b/...ctest/drivers/typhon/ctest_linux_nightly_mpi_debug_muelu_extratypes_ei_typhon_clang.cmake
@@ -71,7 +71,6 @@ SET(Trilinos_PACKAGES MueLu Xpetra Amesos2)
 
 SET(EXTRA_CONFIGURE_OPTIONS
   "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON"
-  "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
 
   "-DZoltan2_ENABLE_Experimental:BOOL=ON"
 )

diff --git a/cmake/ctest/drivers/typhon/ctest_linux_nightly_serial_debug_muelu_extratypes_typhon.cmake b/cmake/ctest/drivers/typhon/ctest_linux_nightly_serial_debug_muelu_extratypes_typhon.cmake
@@ -71,7 +71,6 @@ SET(Trilinos_PACKAGES MueLu Xpetra Amesos2)
 
 SET(EXTRA_CONFIGURE_OPTIONS
   "-DMueLu_INST_DOUBLE_INT_LONGLONGINT=ON"
-  "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
 
   "-DMueLu_INST_COMPLEX_INT_INT=ON"
   "-DTeuchos_ENABLE_COMPLEX=ON"
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,7 +73,6 @@ SET(EXTRA_CONFIGURE_OPTIONS @@
       "-DMueLu_ENABLE_EXPLICIT_INSTANTIATION=ON"
       "-DMueLu_INST_DOUBLE_INT_LONGLONGINT=ON"
-      "-DTeuchos_ENABLE_LONG_LONG_INT:BOOL=ON"
     )
     #
@@ Expand Down @@