Merge Pull Request #7228 from trilinos/Trilinos/master_merge_20200422…

…_000613

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

cmake/ctest/drivers/atdm/cee-rhel6/drivers/Trilinos-atdm-cee-rhel6_clang-9.0.1_openmpi-4.0.2_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/cee-rhel6/local-driver.sh

cmake/std/atdm/CMakeLists.txt

@@ -1,4 +1,5 @@
 TRIBITS_PACKAGE(TrilinosATDMConfigTests)
 TRIBITS_ADD_TEST_DIRECTORIES(test)
+TRIBITS_ADD_TEST_DIRECTORIES(cee-rhel6)
 TRIBITS_ADD_TEST_DIRECTORIES(van1-tx2)
 TRIBITS_PACKAGE_POSTPROCESS()

cmake/std/atdm/cee-rhel6/CMakeLists.txt

@@ -0,0 +1,10 @@
+TRIBITS_ADD_ADVANCED_TEST( cee-rhel6_custom_builds_unit_tests
+  OVERALL_WORKING_DIRECTORY TEST_NAME
+  OVERALL_NUM_MPI_PROCS 1
+  TEST_0 CMND env
+    ARGS SHUNIT_COLOR=none ${CMAKE_CURRENT_SOURCE_DIR}/custom_builds_unit_tests.sh
+    PASS_REGULAR_EXPRESSION_ALL
+      "Ran 1 test"
+      "[^]OK[$]"
+    ALWAYS_FAIL_ON_NONZERO_RETURN
+  )

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

@@ -3,8 +3,12 @@
 export ATDM_CONFIG_CTEST_S_BUILD_NAME_PREFIX=Trilinos-atdm-
 
 export ATDM_CONFIG_ALL_SUPPORTED_BUILDS=(
-  cee-rhel6_clang-5.0.1_openmpi-4.0.2_serial_static_opt    # SPARC CI build
+  #cee-rhel6_clang-9.0.1_openmpi-4.0.2_serial_static_dbg    # SPARC has installs with this build
+  cee-rhel6_clang-9.0.1_openmpi-4.0.2_serial_static_opt    # SPARC CI build
   cee-rhel6_gnu-7.2.0_openmpi-4.0.2_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
   )
+
+# NOTE: Above, we have commented out the 'dbg' build because it was running
+# the test suite very slow and had many timeouts (see ATDV-322)

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

@@ -7,63 +7,58 @@
 
 # Custom compiler selection logic
 
-if   [[ $ATDM_CONFIG_BUILD_NAME == *"clang-5.0.1-openmpi-1.10.2"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"clang-5.0.1_openmpi-1.10.2"* ]] \
+if atdm_match_any_buildname_keyword \
+    clang-9.0.1-openmpi-4.0.2 \
+    clang-9.0.1_openmpi-4.0.2 \
+    clang-9.0.1 \
+    clang-9 \
+    clang \
+    default \
   ; then
-  export ATDM_CONFIG_COMPILER=CLANG-5.0.1_OPENMPI-1.10.2
+  export ATDM_CONFIG_COMPILER=CLANG-9.0.1_OPENMPI-4.0.2
+  # Must list the default clang build last of all the 'clang' builds for
+  # correct matching of of defaults
 
-elif [[ $ATDM_CONFIG_BUILD_NAME == *"clang-5.0.1-openmpi-4.0.2"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"clang-5.0.1_openmpi-4.0.2"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"clang-5.0.1"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"clang-5"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"clang"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"default" ]] \
-  ; then
-  export ATDM_CONFIG_COMPILER=CLANG-5.0.1_OPENMPI-4.0.2
-  # Must list the default clang build last for correct matching of of defaults
-
-elif [[ $ATDM_CONFIG_BUILD_NAME == *"gnu-7.2.0-openmpi-1.10.2"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"gnu-7.2.0_openmpi-1.10.2"* ]] \
-  ; then
-  export ATDM_CONFIG_COMPILER=GNU-7.2.0_OPENMPI-1.10.2
-
-elif [[ $ATDM_CONFIG_BUILD_NAME == *"gnu-7.2.0-openmpi-4.0.2"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"gnu-7.2.0_openmpi-4.0.2"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"gnu-7.2.0"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"gnu-7"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"gnu"* ]] \
+elif atdm_match_any_buildname_keyword \
+    gnu-7.2.0-openmpi-4.0.2 \
+    gnu-7.2.0_openmpi-4.0.2 \
+    gnu-7.2.0 \
+    gnu-7 \
+    gnu \
   ; then
   export ATDM_CONFIG_COMPILER=GNU-7.2.0_OPENMPI-4.0.2
-  # List default "gnu"* build last for correct matching of defaults
+  # List default "gnu"* build last of all the 'gnu' builds for correct
+  # matching of defaults
 
-elif [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18.0.2-mpich2-3.2"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18.0.2_mpich2-3.2"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18.0.2"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"intel-18"* ]] \
+elif atdm_match_any_buildname_keyword \
+    intel-18.0.2-mpich2-3.2 \
+    intel-18.0.2_mpich2-3.2 \
+    intel-18.0.2 \
+    intel-18 \
   ; then
   export ATDM_CONFIG_COMPILER=INTEL-18.0.2_MPICH2-3.2
 
-elif [[ $ATDM_CONFIG_BUILD_NAME == *"intel-19.0.3-intelmpi-2018.4"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"intel-19.0.3_intelmpi-2018.4"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"intel-19.0.3"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"intel-19"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"intel"* ]] \
+elif atdm_match_any_buildname_keyword \
+    intel-19.0.3-intelmpi-2018.4 \
+    intel-19.0.3_intelmpi-2018.4 \
+    intel-19.0.3 \
+    intel-19 \
+    intel \
   ; then
   export ATDM_CONFIG_COMPILER=INTEL-19.0.3_INTELMPI-2018.4
-  # List default "intel"* build last for correct matching!
+  # List default intel build last of all the 'intel' builds for correct
+  # matching!
 
 else
   echo
   echo "***"
-  echo "*** ERROR: A supported compiler was not selected for 'cee-rhel6' env"
+  echo "*** ERROR: A supported compiler was not selected for 'cee-rhel6' env in buildname '${ATDM_CONFIG_BUILD_NAME}'"
   echo "***"
   echo "*** Supported compilers include:"
   echo "***"
-  echo "****  clang-5.0.1-openmpi-1.10.2     (DEPRECATED)"
-  echo "****  clang-5.0.1-openmpi-4.0.2      (default, default clang)"
-  echo "****  gnu-7.2.0-openmpi-1.10.2       (DEPRECATED)"
+  echo "****  clang-9.0.1-openmpi-4.0.2      (default, default clang)"
   echo "****  gnu-7.2.0-openmpi-4.0.2        (default gnu)"
-  echo "****  intel-18.0.2-mpich2-3.2        (DEPRECATED)"
+  echo "****  intel-18.0.2-mpich2-3.2"
   echo "****  intel-19.0.3-intelmpi-2018.4   (default intel)"
   echo "***"  
   return

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

@@ -0,0 +1,135 @@
+#!/bin/bash
+
+CURRENT_SCRIPTS_DIR=`echo $BASH_SOURCE | sed "s/\(.*\)\/.*\.sh/\1/g"`
+ATDM_CONFIG_SCRIPT_DIR=`readlink -f ${CURRENT_SCRIPTS_DIR}/..`
+
+#
+# Test compiler parsing
+#
+
+
+testAll() {
+
+  ATDM_CONFIG_SYSTEM_DIR=${ATDM_CONFIG_SCRIPT_DIR}/cee-rhel6
+
+  ATDM_CONFIG_BUILD_NAME=default
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} CLANG-9.0.1_OPENMPI-4.0.2
+
+  ATDM_CONFIG_BUILD_NAME=default-after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} CLANG-9.0.1_OPENMPI-4.0.2
+
+  ATDM_CONFIG_BUILD_NAME=before-clang-9.0.1-openmpi-4.0.2_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} CLANG-9.0.1_OPENMPI-4.0.2
+
+  ATDM_CONFIG_BUILD_NAME=before-clang-9.0_1-openmpi-4.0.2_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} CLANG-9.0.1_OPENMPI-4.0.2
+
+  ATDM_CONFIG_BUILD_NAME=before-clang-9.0_1-after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} CLANG-9.0.1_OPENMPI-4.0.2
+
+  ATDM_CONFIG_BUILD_NAME=before-clang-9-after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} CLANG-9.0.1_OPENMPI-4.0.2
+
+  ATDM_CONFIG_BUILD_NAME=before-clang-after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} CLANG-9.0.1_OPENMPI-4.0.2
+
+  ATDM_CONFIG_BUILD_NAME=before_gnu-7.2.0-openmpi-4.0.2-after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} GNU-7.2.0_OPENMPI-4.0.2
+
+  ATDM_CONFIG_BUILD_NAME=before_gnu-7.2.0_openmpi-4.0.2-after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} GNU-7.2.0_OPENMPI-4.0.2
+
+  ATDM_CONFIG_BUILD_NAME=before_gnu-7.2.0-after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} GNU-7.2.0_OPENMPI-4.0.2
+
+  ATDM_CONFIG_BUILD_NAME=before_gnu-7-after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} GNU-7.2.0_OPENMPI-4.0.2
+
+  ATDM_CONFIG_BUILD_NAME=before_gnu-after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} GNU-7.2.0_OPENMPI-4.0.2
+
+  # Check that 'gnus' does not match 'gnu'! (Shows true keyword matching is
+  # working)
+  ATDM_CONFIG_BUILD_NAME=before_gnus-after
+  STDOUT=$(. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh 2>&1)
+  GREP_LINE=$(echo "${STDOUT}" | grep "ERROR: A supported compiler was not selected")
+  GREP_LINE_EXPECTED="*** ERROR: A supported compiler was not selected for 'cee-rhel6' env in buildname 'before_gnus-after'"
+  #echo "GREP_LINE = [${GREP_LINE}]"
+  echo "GREP_LINE_EXPECTED = [${GREP_LINE_EXPECTED}]"
+  ${_ASSERT_EQUALS_} '"${GREP_LINE}"' '"${GREP_LINE_EXPECTED}"'
+
+  ATDM_CONFIG_BUILD_NAME=before_intel-18.0.2-mpich2-3.2-after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} INTEL-18.0.2_MPICH2-3.2
+
+  ATDM_CONFIG_BUILD_NAME=before_intel-18.0.2_mpich2-3.2-after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} INTEL-18.0.2_MPICH2-3.2
+
+  ATDM_CONFIG_BUILD_NAME=before_intel-18.0.2-after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} INTEL-18.0.2_MPICH2-3.2
+
+  ATDM_CONFIG_BUILD_NAME=before_intel-18-after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} INTEL-18.0.2_MPICH2-3.2
+
+  ATDM_CONFIG_BUILD_NAME=before-intel-19.0.3-intelmpi-2018.4_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} INTEL-19.0.3_INTELMPI-2018.4
+
+  ATDM_CONFIG_BUILD_NAME=before-intel-19.0.3_intelmpi-2018.4_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} INTEL-19.0.3_INTELMPI-2018.4
+
+  ATDM_CONFIG_BUILD_NAME=before-intel-19.0.3_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} INTEL-19.0.3_INTELMPI-2018.4
+
+  ATDM_CONFIG_BUILD_NAME=before-intel-19_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} INTEL-19.0.3_INTELMPI-2018.4
+
+  ATDM_CONFIG_BUILD_NAME=before-intel_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} INTEL-19.0.3_INTELMPI-2018.4
+
+  # Check that 'somethingintel' does not match 'intl'! (Shows true keyword
+  # matching is working)
+  ATDM_CONFIG_BUILD_NAME=somethingintel
+  STDOUT=$(. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh 2>&1)
+  GREP_LINE=$(echo "${STDOUT}" | grep "ERROR: A supported compiler was not selected")
+  GREP_LINE_EXPECTED="*** ERROR: A supported compiler was not selected for 'cee-rhel6' env in buildname 'somethingintel'"
+  #echo "GREP_LINE = [${GREP_LINE}]"
+  echo "GREP_LINE_EXPECTED = [${GREP_LINE_EXPECTED}]"
+  ${_ASSERT_EQUALS_} '"${GREP_LINE}"' '"${GREP_LINE_EXPECTED}"'
+
+  # Check that missing compiler prints right error messagematch 'gnu'!
+  ATDM_CONFIG_BUILD_NAME=help
+  STDOUT=$(. ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh 2>&1)
+  GREP_LINE=$(echo "${STDOUT}" | grep "ERROR: A supported compiler was not selected")
+  GREP_LINE_EXPECTED="*** ERROR: A supported compiler was not selected for 'cee-rhel6' env in buildname 'help'"
+  #echo "GREP_LINE = [${GREP_LINE}]"
+  echo "GREP_LINE_EXPECTED = [${GREP_LINE_EXPECTED}]"
+  ${_ASSERT_EQUALS_} '"${GREP_LINE}"' '"${GREP_LINE_EXPECTED}"'
+
+}
+
+
+#
+# Run the unit tests
+#
+
+. ${ATDM_CONFIG_SCRIPT_DIR}/test/shunit2/shunit2

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

@@ -62,8 +62,8 @@ if [[ "${ATDM_CONFIG_ENABLE_STRONG_WARNINGS}" == "" ]] ; then
   export ATDM_CONFIG_ENABLE_STRONG_WARNINGS=1
 fi
 
-if [[ "$ATDM_CONFIG_COMPILER" == "CLANG-5.0.1_OPENMPI-1.10.2" ]]; then
-  module load sparc-dev/clang-5.0.1_openmpi-1.10.2
+if  [[ "$ATDM_CONFIG_COMPILER" == "CLANG-9.0.1_OPENMPI-4.0.2" ]]; then
+  module load sparc-dev/clang-9.0.1_openmpi-4.0.2
   export OMPI_CXX=`which clang++`
   export OMPI_CC=`which clang`
   export OMPI_FC=`which gfortran`
@@ -75,38 +75,6 @@ if [[ "$ATDM_CONFIG_COMPILER" == "CLANG-5.0.1_OPENMPI-1.10.2" ]]; then
   fi
   export ATDM_CONFIG_MKL_ROOT=${CBLAS_ROOT}
 
-elif [[ "$ATDM_CONFIG_COMPILER" == "CLANG-5.0.1_OPENMPI-4.0.2" ]]; then
-  module load sparc-dev/clang-5.0.1_openmpi-4.0.2
-  export OMPI_CXX=`which clang++`
-  export OMPI_CC=`which clang`
-  export OMPI_FC=`which gfortran`
-  export MPICC=`which mpicc`
-  export MPICXX=`which mpicxx`
-  export MPIF90=`which mpif90`
-  if [[ "$ATDM_CONFIG_ENABLE_STRONG_WARNINGS" == "1" ]]; then
-    export ATDM_CONFIG_CXX_FLAGS="${ATDM_CONFIG_GNU_CXX_WARNINGS}"
-  fi
-  export ATDM_CONFIG_MKL_ROOT=${CBLAS_ROOT}
-
-elif [[ "$ATDM_CONFIG_COMPILER" == "GNU-7.2.0_OPENMPI-1.10.2" ]] ; then
-  module load sparc-dev/gcc-7.2.0_openmpi-1.10.2
-  unset OMP_NUM_THREADS  # SPARC module sets these and we must unset!
-  unset OMP_PROC_BIND
-  unset OMP_PLACES
-  export OMPI_CXX=`which g++`
-  export OMPI_CC=`which gcc`
-  export OMPI_FC=`which gfortran`
-  export MPICC=`which mpicc`
-  export MPICXX=`which mpicxx`
-  export MPIF90=`which mpif90`
-  if [[ "$ATDM_CONFIG_ENABLE_STRONG_WARNINGS" == "1" ]]; then
-    export ATDM_CONFIG_CXX_FLAGS="${ATDM_CONFIG_GNU_CXX_WARNINGS}"
-  fi
-  export ATDM_CONFIG_MKL_ROOT=${CBLAS_ROOT}
-  export ATDM_CONFIG_MPI_EXEC=mpirun
-  export ATDM_CONFIG_MPI_EXEC_NUMPROCS_FLAG=-np
-  export ATDM_CONFIG_MPI_PRE_FLAGS="--bind-to;none"
-
 elif [[ "$ATDM_CONFIG_COMPILER" == "GNU-7.2.0_OPENMPI-4.0.2" ]] ; then
   module load sparc-dev/gcc-7.2.0_openmpi-4.0.2
   unset OMP_NUM_THREADS  # SPARC module sets these and we must unset!

cmake/std/atdm/test/unit_tests/set_build_options_unit_tests.sh

@@ -7,6 +7,9 @@ ATDM_CONFIG_SCRIPT_DIR=`readlink -f ${CURRENT_SCRIPTS_DIR}/../..`
 # Test compiler parsing
 #
 
+# Make work on all systems reguardless of ATDM Trilinos env loaded
+unset ATDM_CONFIG_SYSTEM_NAME
+unset ATDM_CONFIG_SYSTEM_DIR
 
 testAllDefaults() {
   ATDM_CONFIG_BUILD_NAME=default

cmake/std/atdm/van1-tx2/environment.sh

@@ -12,13 +12,14 @@ echo "Using ARM ATSE compiler stack $ATDM_CONFIG_COMPILER to build $ATDM_CONFIG_
 #
 
 if   [[ "$ATDM_CONFIG_KOKKOS_ARCH" == "DEFAULT" ]] \
+  || [[ "$ATDM_CONFIG_KOKKOS_ARCH" == "TX2" ]] \
   || [[ "$ATDM_CONFIG_KOKKOS_ARCH" == "" ]] \
   ; then
   export ATDM_CONFIG_KOKKOS_ARCH=ARMv8-TX2
 else
   echo
   echo "***"
-  echo "*** ERROR: Only one arch is supported this system!  Remove any arch keywords from build name '${ATDM_CONFIG_BUILD_NAME}'"
+  echo "*** ERROR: KOKKOS_ARCH='${ATDM_CONFIG_KOKKOS_ARCH}' was parsed from the the buildname '${ATDM_CONFIG_BUILD_NAME}'.  Only one KOKKOS_ARCH is supported for this system.  Please remove that KOKKOS_ARCH keyword from the buildname!"
   echo "***"
   return
 fi

packages/muelu/doc/CMakeLists.txt

@@ -2,10 +2,10 @@
 find_package(Doxygen)
 if(DOXYGEN_FOUND)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
-add_custom_target(doc
+add_custom_target(doc_muelu
 TRILINOS_HOME=${PROJECT_SOURCE_DIR} ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-COMMENT "Generating API documentation with Doxygen" VERBATIM
+COMMENT "Generating ${PACKAGE_NAME} API documentation with Doxygen" VERBATIM
 )
 endif(DOXYGEN_FOUND)
 

packages/muelu/doc/Doxyfile

@@ -2,4 +2,4 @@
 # This file is used by doxygen for building documentation in the source tree
 #
 @INCLUDE = Doxyfile.options
-INPUT                  = ./MueLu_DoxygenDocumentation.hpp ../src ../adapters ./MueLu_groups ../matlab/src
+INPUT    = ./MueLu_DoxygenDocumentation.hpp ./MueLu_groups ../src ../adapters ../matlab/src

packages/muelu/doc/Doxyfile.in

@@ -2,4 +2,4 @@
 # This file is used by doxygen for building documentation in the build tree
 #
 @INCLUDE = @CMAKE_CURRENT_SOURCE_DIR@/Doxyfile.options
-INPUT    = @CMAKE_CURRENT_SOURCE_DIR@/../src @CMAKE_CURRENT_SOURCE_DIR@/../adapters @CMAKE_CURRENT_SOURCE_DIR@/MueLu_DoxygenDocumentation.hpp @CMAKE_CURRENT_SOURCE_DIR@/../matlab/src
+INPUT    = @CMAKE_CURRENT_SOURCE_DIR@/MueLu_DoxygenDocumentation.hpp @CMAKE_CURRENT_SOURCE_DIR@/MueLu_groups @CMAKE_CURRENT_SOURCE_DIR@/../src @CMAKE_CURRENT_SOURCE_DIR@/../adapters @CMAKE_CURRENT_SOURCE_DIR@/../matlab/src

packages/muelu/doc/README.md

@@ -0,0 +1,13 @@
+# Doxygen
+
+`MueLu`'s documentation is built in the build tree:
+
+1. Run your `cmake` configure line or script.
+1. In the <buildDirectory>, type `make doc_muelu`.
+
+The documentation will be placed in `<buildDirectory>/packages/muelu/doc/html`.
+
+# User's Guide
+
+The user's guide is in `muelu/doc/UsersGuide`.
+To build the guide, simply run `make` in `muelu/doc/UsersGuide`, which should produce `mueluguide.pdf`.