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

…s:develop' (8d5b058).

* trilinos-develop: (27 commits)
  MiniEM: Enable reuse, test it
  Remove older and more complex buildAgainstTrilinos example (trilinos#8498)
  Update to point to demos/simpleBuildAgainstTrilinos (trilinos#8498)
  Add explicit COMPONENTS (trilinos#8498)
  Simpler one-directory build example using Trilinos (trilinos#8498)
  Intrepid2: UVM-free MonolothicExecutable Tests (trilinos#8852)
  Link to local INSTALL.rst on same branch (trilinos#8489)
  Update INSTALL.rst with link to demos/buildAgainstTrilinos (trilinos#8498)
  Eliminate duplication in tests and set PROCESSORS property (trilinos#8498)
  Modernize for newer CMake and fix compile error (trilinos#8498)
  Piro: add 'Optimizer Iteration Number' to Piro_ThyraProductME
  tpetra:  trilinos#8794 trilinos#8804  test to pick threshold timed out in PR testing. Lowering the upper bound of testing to fit run into PR testing time. Threshold is close to 400, so lowering upper bound of testing should be OK.
  Piro: move the Enable Explicit Matrix Transpose option to the app parameter list
  Piro: print response even for iteration 0
  std: -> std::
  Piro: print ROL headers
  Piro: Use observer to observe the response, the solution, and the parameters
  Piro: Add ThyraProductME_Constraint and Objective
  Tempus: Remove Doxygen dependence on algpseudocode.
  Tempus: Add Doxygen to SolutionHistory Functions.
  ...

INSTALL.rst

@@ -2,15 +2,14 @@
 Quick configure, build and install hints for Trilinos
 ==================================================================
 
-:Author: Brent Perschbacher
-:Contact: bmpersc@sandia.gov
+:Contact: trilinos-framework@software.sandia.gov
 
 This document is intended to be a very concise set of examples of how to
-configure, build and install Trilinos. The intended audience is those who need
-a quick refresher on Trilinos CMake build system or those wanting a quick
-install without worrying about all the features and options that are
-available.  For a more indepth document on what features and options are
-available and how to use them, see the document:
+configure, build, install, and build downstream code against Trilinos. The
+intended audience is those who need a quick refresher on Trilinos CMake build
+system or those wanting a quick install without worrying about all the
+features and options that are available.  For a more indepth document on what
+features and options are available and how to use them, see the document:
 
   https://trilinos.org/docs/files/TrilinosBuildReference.html
 
@@ -22,8 +21,8 @@ available and how to use them, see the document:
 Requirements
 ============
 
-* CMake 3.10.0 or newer
-* A C and C++ compiler
+* CMake 3.17.1 or newer
+* C and C++ compiler
 * Optionally a Fortran compiler
 * Optionally an installation of MPI
 
@@ -37,11 +36,12 @@ Following are a few examples of simple configurations for Trilinos. Anything in
 It is recommended that you put your configure options in a script (e..g
 ``do-configure``) so you can repeat the configure if necessary.
 
-Note: all examples assume a unix like command line and Makefile Generators.
+Note: all examples assume a unix like command line and the CMake Makefile
+Generator.
 
 
 Simple MPI instructions (enables most packages)
-------------------------------------------------
+-----------------------------------------------
 
 ::
 
@@ -60,8 +60,8 @@ will need to either point to them or disable them as specified in the CMake
 output.
 
 
-Simple serial instructions (enables most packages)
---------------------------------------------------
+Simple non-MPI instructions (enables most packages)
+---------------------------------------------------
 
 ::
 
@@ -93,15 +93,16 @@ Intermediate MPI instructions (enables a few packages)
   make -j<n> install
 
 
-Intermediate MPI instructions (enables a few packages)
-------------------------------------------------------
+Intermediate MPI instructions (enables a few packages, explict compilers)
+-------------------------------------------------------------------------
 
 ::
 
   cmake \
-  -DCMAKE_C_COMPILER=<path to C compiler> \
-  -DCMAKE_CXX_COMPILER=<path to C++ compiler> \
-  -DCMAKE_Fortran_COMPILER=<path to Fortran compiler> \
+  -DTPL_ENABLE_MPI=ON \
+  -DCMAKE_C_COMPILER=<path to MPI C compiler wrapper> \
+  -DCMAKE_CXX_COMPILER=<path to MPI C++ compiler wrapper> \
+  -DCMAKE_Fortran_COMPILER=<path to MPI Fortran compiler wrapper> \
   -DTrilinos_ENABLE_Epetra=ON \
   -DTrilinos_ENABLE_AztecOO=ON \
   -DTrilinos_ENABLE_Ifpack=ON \
@@ -114,10 +115,9 @@ Intermediate MPI instructions (enables a few packages)
 Useful Options
 ==============
 
-To turn on explicit template instantiation (can massively reduce build times)
-use::
+To generate Ninja build files (Ninja 1.10+) instead of Makefiles use::
 
-  -DTrilinos_ENABLE_EXPLICIT_INSTANTIATION=ON
+  -GNinja
 
 To use shared libraries (much smaller executables and faster linking) use::
 
@@ -139,7 +139,20 @@ To enable a package::
 
   -DTrilinos_ENABLE_<package name>=ON
 
+To get the list of packages that can be enabled, run::
+
+  cmake <path to Trilinos source> 2>&1 \
+    | grep "Final set of non-enabled SE packages"
+
 To enable tests::
 
   -DTrilinos_ENABLE_TESTS=ON
 
+
+Building against installed Trilinos
+===================================
+
+For information on how to build against an installation of Trilinos, see
+`demos/simpleBuildAgainstTrilinos`_
+
+.. _demos/simpleBuildAgainstTrilinos: demos/simpleBuildAgainstTrilinos/README.md

README.md

@@ -21,7 +21,7 @@ unique design feature of Trilinos is its focus on packages.
 
 - [General Documentation](https://trilinos.github.io/documentation.html)
 
-- [Quick configure, build and install hints for Trilinos](https://github.com/trilinos/Trilinos/blob/master/INSTALL.rst)
+- [Quick configure, build and install hints for Trilinos](INSTALL.rst)
 
 - [Trilinos Configure, Build, Test, and Install Reference Guide](https://trilinos.org/docs/files/TrilinosBuildReference.html)
 

cmake/std/atdm/ats2/environment.sh

@@ -105,7 +105,11 @@ elif [[ "$ATDM_CONFIG_COMPILER" == *"XL"* ]]; then
   # Don't use ninja as the fortran compiler test is broken.
   export ATDM_CONFIG_USE_NINJA=OFF
 
-  export ATDM_CONFIG_CXX_FLAGS="-ccbin xlc++ -qxflag=disable__cplusplusOverride"
+  if [[ "CUDA" == "$ATDM_CONFIG_NODE_TYPE" ]]; then
+    export ATDM_CONFIG_CXX_FLAGS="-ccbin xlc++ -qxflag=disable__cplusplusOverride"
+  else
+    export ATDM_CONFIG_CXX_FLAGS="-qxflag=disable__cplusplusOverride"
+  fi
 
   # set the gcc compiler XL  will use for backend to one that handles c++14
   export XLC_USR_CONFIG=/opt/ibm/xlC/16.1.1/etc/xlc.cfg.rhel.7.6.gcc.7.3.1.cuda.10.1.243