Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20200630_000610 branch to master

cmake/ctest/drivers/atdm/van1-tx2/drivers/Trilinos-atdm-van1-tx2_arm-20.1_openmpi-4.0.3_openmp_static_dbg.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+#export SALLOC_CTEST_TIME_LIMIT_MINUTES=1:00:00
+
+if [ "${Trilinos_TRACK}" == "" ] ; then
+  export Trilinos_TRACK=Specialized
+fi
+
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/van1-tx2/local-driver.sh

cmake/ctest/drivers/atdm/van1-tx2/drivers/Trilinos-atdm-van1-tx2_arm-20.1_openmpi-4.0.3_openmp_static_opt.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+#export SALLOC_CTEST_TIME_LIMIT_MINUTES=1:00:00
+
+if [ "${Trilinos_TRACK}" == "" ] ; then
+  export Trilinos_TRACK=Specialized
+fi
+
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/van1-tx2/local-driver.sh

cmake/std/PullRequestLinuxCuda9.2TestingSettings.cmake

@@ -73,6 +73,11 @@ set (TPL_ENABLE_BoostLib OFF CACHE BOOL "Set by default for CUDA PR testing")
 set (TPL_ENABLE_Matio OFF CACHE BOOL "Set by default for CUDA PR testing")
 set (TPL_DLlib_LIBRARIES "-ldl" CACHE FILEPATH "Set by default for CUDA PR testing")
 
+# The compile times for two Panzer files went up to over 6 hours. This
+# turns off one feature that allows these in about 24 minutes. Please remove
+# when issue #7532 is resolved.
+set (Sacado_NEW_FAD_DESIGN_IS_DEFAULT OFF CACHE BOOL "Temporary fix for issue #7532" )
+
 # Disable some packages that can't be tested with this PR build
 set (Trilinos_ENABLE_ShyLU_NodeTacho OFF CACHE BOOL
   "Can't test Tacho with CUDA without RDC" FORCE)

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

@@ -16,15 +16,18 @@ fi
 # Test atdm get_known_system_info script
 #
 test_atdm_get_known_system_info() {
-   # TODO: D.2 needs to be tested by setting these values:
+  # Tweak these values for testing on other platforms
+  # TODO: Test branch D.2 in get_known_system_info.sh
   SNLSYSTEM=
   SEMS_PLATFORM=
   ATDM_SYSTEM_NAME=
   SNLCLUSTER=
-
-  # Get the good ATDM_KNOWN_SYSTEM_NAMES_LIST
-  ATDM_CONFIG_BUILD_NAME=unit_test
+  HOST=
+  ATDM_CONFIG_SEMS_GET_PLATFORM=/fake/path/for/unit/testing/
+  ATDM_CONFIG_GET_KNOW_SYSTEM_INFO_REAL_HOSTNAME_OVERRIDE_FOR_UNIT_TESTING=unit_test
+  ATDM_CONFIG_BUILD_NAME=$ATDM_CONFIG_GET_KNOW_SYSTEM_INFO_REAL_HOSTNAME_OVERRIDE_FOR_UNIT_TESTING
   ATDM_CONFIG_DISABLE_WARNINGS=ON
+  # Populate ATDM_KNOWN_SYSTEM_NAMES_LIST
   source ${ATDM_UTIL_SCRIPT_GET_KNOWN_SYSTEM_INFO}
 
   # Check that all known system names pass
@@ -55,7 +58,7 @@ test_atdm_get_known_system_info() {
   SNLSYSTEM=cts1
   RET=$(source ${ATDM_UTIL_SCRIPT_GET_KNOWN_SYSTEM_INFO})
   assertEquals "Hostname '$ATDM_CONFIG_BUILD_NAME' matches known ATDM host '$ATDM_CONFIG_BUILD_NAME' and system 'cts1empire'" "$RET"
-  
+
   # Ensure that cts1 is still selected when it's in the build name
   ATDM_CONFIG_BUILD_NAME=cts1-default
   ATDM_CONFIG_GET_KNOW_SYSTEM_INFO_REAL_HOSTNAME_OVERRIDE_FOR_UNIT_TESTING=$ATDM_CONFIG_BUILD_NAME

cmake/std/atdm/utils/get_known_system_info.sh

@@ -30,9 +30,6 @@ fi
 
 source ${ATDM_CONFIG_SCRIPT_DIR}/utils/get_system_info_utils.sh
 
-realHostname=`hostname`
-# TODO: come up with a better way to unit test this code.
-unset $ATDM_CONFIG_HOSTNAME_OVERRIDE
 if [[ "${ATDM_CONFIG_GET_KNOW_SYSTEM_INFO_REAL_HOSTNAME_OVERRIDE_FOR_UNIT_TESTING}" ]] ; then
   if [[ -z $ATDM_CONFIG_DISABLE_WARNINGS ]]; then
     echo
@@ -45,7 +42,9 @@ if [[ "${ATDM_CONFIG_GET_KNOW_SYSTEM_INFO_REAL_HOSTNAME_OVERRIDE_FOR_UNIT_TESTIN
     echo
   fi
   realHostname=${ATDM_CONFIG_GET_KNOW_SYSTEM_INFO_REAL_HOSTNAME_OVERRIDE_FOR_UNIT_TESTING}
-  ATDM_CONFIG_HOSTNAME_OVERRIDE=true
+else
+  realHostname=`hostname`
+  ATDM_CONFIG_SEMS_GET_PLATFORM=/projects/sems/modulefiles/utils/get-platform
 fi
 #echo "Hostname = '$realHostname'"
 
@@ -141,8 +140,7 @@ fi
 #
 
 # ATS-1 systems
-if [[ $realHostname == "mutrino"* ||
-      $HOST == "mutrino"* && -z $ATDM_CONFIG_HOSTNAME_OVERRIDE ]] ; then
+if [[ $realHostname == "mutrino"* || $HOST == "mutrino"* ]] ; then
   systemNameTypeMatchedList+=(ats1)
   systemNameTypeMatchedListHostNames[ats1]=mutrino
   systemNameTypeMatchedList+=(mutrino)
@@ -182,9 +180,8 @@ elif [[ "${SNLSYSTEM}" == "astra" || \
         "${SNLSYSTEM}" == "vortex" ]] ; then
   echo "Don't call get-platform on 'astra' systems" > /dev/null
   # Above logic avoids an 'ERROR: Unrecognized cluster <name>' on these systems
-elif [[ -f /projects/sems/modulefiles/utils/get-platform &&
-        -z $ATDM_CONFIG_HOSTNAME_OVERRIDE ]] ; then
-  ATDM_SYSTEM_NAME=`source /projects/sems/modulefiles/utils/get-platform`
+elif [[ -f $ATDM_CONFIG_SEMS_GET_PLATFORM ]] ; then
+  ATDM_SYSTEM_NAME=`source $ATDM_CONFIG_SEMS_GET_PLATFORM`
   if [[ $ATDM_SYSTEM_NAME == "rhel6-x86_64" ]] ; then
     systemNameTypeMatchedList+=(sems-rhel6)
     systemNameTypeMatchedListHostNames[sems-rhel6]=sems-rhel6

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

@@ -5,4 +5,6 @@ export ATDM_CONFIG_CTEST_S_BUILD_NAME_PREFIX=Trilinos-atdm-
 export ATDM_CONFIG_ALL_SUPPORTED_BUILDS=(
   van1-tx2_arm-20.0_openmpi-4.0.2_openmp_static_opt
   van1-tx2_arm-20.0_openmpi-4.0.2_openmp_static_dbg
+  van1-tx2_arm-20.1_openmpi-4.0.3_openmp_static_opt
+  van1-tx2_arm-20.1_openmpi-4.0.3_openmp_static_dbg
   )

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

@@ -2,7 +2,14 @@
 # Custom builds for van1-tx2 env
 #
 
+# Try matching against arm-20.1 before arm-20 or arm
 if atdm_match_any_buildname_keyword \
+     arm-20.1-openmpi-4.0.3 \
+     arm-20.1_openmpi-4.0.3 \
+     arm-20.1 \
+  ; then
+  export ATDM_CONFIG_COMPILER=ARM-20.1_OPENMPI-4.0.3
+elif atdm_match_any_buildname_keyword \
      arm-20.0-openmpi-4.0.2 \
      arm-20.0_openmpi-4.0.2 \
      arm-20.0 \
@@ -11,7 +18,6 @@ if atdm_match_any_buildname_keyword \
      default \
   ; then
   export ATDM_CONFIG_COMPILER=ARM-20.0_OPENMPI-4.0.2
-
 else
   echo
   echo "***"
@@ -20,6 +26,7 @@ else
   echo "*** Supported compilers include:"
   echo "***"
   echo "****  arm-20.0-openmpi-4.0.2    (arm-20.0, default)"
+  echo "****  arm-20.1-openmpi-4.0.3    (arm-20.1)"
   echo "***"
   return
 

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

@@ -12,38 +12,52 @@ testAll() {
 
   ATDM_CONFIG_SYSTEM_DIR=${ATDM_CONFIG_SCRIPT_DIR}/van1-tx2
 
+  #### TEST ARM-20.0 ####
   ATDM_CONFIG_BUILD_NAME=default
   . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
-  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} ARM-20.0_OPENMPI-4.0.2
+  ${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER}
 
   ATDM_CONFIG_BUILD_NAME=before-arm-20.0-openmpi-4.0.2_after
   . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
-  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} ARM-20.0_OPENMPI-4.0.2
+  ${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER}
 
   ATDM_CONFIG_BUILD_NAME=before-arm-20.0_openmpi-4.0.2-after
   . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
-  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} ARM-20.0_OPENMPI-4.0.2
+  ${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER}
 
   ATDM_CONFIG_BUILD_NAME=before_arm-20.0-after
   . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
-  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} ARM-20.0_OPENMPI-4.0.2
+  ${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER}
 
   ATDM_CONFIG_BUILD_NAME=before_arm-20-afert
   . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
-  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} ARM-20.0_OPENMPI-4.0.2
+  ${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER}
 
   ATDM_CONFIG_BUILD_NAME=before-arm-after
   . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
-  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} ARM-20.0_OPENMPI-4.0.2
+  ${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER}
 
   ATDM_CONFIG_BUILD_NAME=BEFORE-ARM-AFTER
   . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
-  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} ARM-20.0_OPENMPI-4.0.2
+  ${_ASSERT_EQUALS_} ARM-20.0_OPENMPI-4.0.2 ${ATDM_CONFIG_COMPILER}
 
   # Make sure 'arms' does not match 'arm'
   ATDM_CONFIG_BUILD_NAME=anything-arms
   . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
-  ${_ASSERT_EQUALS_} ${ATDM_CONFIG_COMPILER} DEFAULT
+  ${_ASSERT_EQUALS_} DEFAULT ${ATDM_CONFIG_COMPILER}
+
+  #### Test ARM-20.1 ####
+  ATDM_CONFIG_BUILD_NAME=before-arm-20.1-openmpi-4.0.3_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ARM-20.1_OPENMPI-4.0.3 ${ATDM_CONFIG_COMPILER}
+
+  ATDM_CONFIG_BUILD_NAME=before-arm-20.1_openmpi-4.0.3-after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} ARM-20.1_OPENMPI-4.0.3 ${ATDM_CONFIG_COMPILER}
+
+  ATDM_CONFIG_BUILD_NAME=before_arm-20.1-after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_}  ARM-20.1_OPENMPI-4.0.3 ${ATDM_CONFIG_COMPILER}
 
 }
 

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

@@ -35,15 +35,6 @@ if [[ "${ATDM_CONFIG_BUILD_TYPE}" == "DEBUG" ]] ; then
   # Reducing this is to avoid that.  See CDOFA-117.
 fi
 
-if [[ "$ATDM_CONFIG_NODE_TYPE" == "OPENMP" ]] ; then
-  export ATDM_CONFIG_CTEST_PARALLEL_LEVEL=16
-  export OMP_NUM_THREADS=2
-else
-  export ATDM_CONFIG_CTEST_PARALLEL_LEVEL=32
-  export OMP_PROC_BIND=FALSE
-  export OMP_NUM_THREADS=1
-fi
-
 #
 # Load the modules
 #
@@ -67,6 +58,43 @@ if [[ "$ATDM_CONFIG_COMPILER" == "ARM-20.0_OPENMPI-4.0.2" ]]; then
   export LAPACK_ROOT="$ARMPL_LIB"
   export ATDM_CONFIG_LAPACK_LIBS="-L${LAPACK_ROOT};-larmpl_ilp64_mp"
   export ATDM_CONFIG_BLAS_LIBS="-L${LAPACK_ROOT};-larmpl_ilp64_mp"
+
+  # We'll use TPL_ROOT for consistency across ATDM environments
+  export MPI_ROOT=${MPI_DIR}
+  export BLAS_ROOT=${ARMPL_DIR}
+  export LAPACK_ROOT=${ARMPL_DIR}
+  export HDF5_ROOT=${HDF5_DIR}
+  export NETCDF_ROOT=${NETCDF_DIR}
+  export PNETCDF_ROOT=${PNETCDF_DIR}
+  export ZLIB_ROOT=${ZLIB_DIR}
+  export CGNS_ROOT=${CGNS_DIR}
+  export BOOST_ROOT=${BOOST_DIR}
+  export METIS_ROOT=${METIS_DIR}
+  export PARMETIS_ROOT=${PARMETIS_DIR}
+  export SUPERLUDIST_ROOT=${SUPERLU_DIST_DIR}
+  export BINUTILS_ROOT=${BINUTILS_DIR}
+
+  module load git/2.19.2
+elif [[ "$ATDM_CONFIG_COMPILER" == "ARM-20.1_OPENMPI-4.0.3" ]]; then
+  module load sparc-dev/arm-20.1_openmpi-4.0.3
+
+  if [ "$ATDM_CONFIG_NODE_TYPE" == "OPENMP" ] ; then
+    unset OMP_PLACES
+    unset OMP_PROC_BIND
+  fi
+
+  # We'll use TPL_ROOT for consistency across ATDM environments
+  export MPI_ROOT=${MPI_DIR}
+  export BLAS_ROOT=${ARMPL_DIR}
+  export HDF5_ROOT=${HDF5_DIR}
+  export NETCDF_ROOT=${NETCDF_DIR}
+  export PNETCDF_ROOT=${PNETCDF_DIR}
+  export ZLIB_ROOT=${ZLIB_DIR}
+  export CGNS_ROOT=${CGNS_DIR}
+  export METIS_ROOT=${METIS_DIR}
+  export PARMETIS_ROOT=${PARMETIS_DIR}
+  export SUPERLUDIST_ROOT=${SUPERLU_DIST_DIR}
+  export BINUTILS_ROOT=${BINUTILS_DIR}
 else
   echo
   echo "***"
@@ -75,30 +103,18 @@ else
   return
 fi
 
+if [[ "$ATDM_CONFIG_NODE_TYPE" == "OPENMP" ]] ; then
+  export ATDM_CONFIG_CTEST_PARALLEL_LEVEL=16
+  export OMP_NUM_THREADS=2
+else
+  export ATDM_CONFIG_CTEST_PARALLEL_LEVEL=32
+  export OMP_PROC_BIND=FALSE
+  export OMP_NUM_THREADS=1
+fi
+
 # Common modules for all builds
 module load ninja
 module load cmake/3.12.2
-module load git/2.19.2
-
-#
-# Set up for the TPLs
-#
-
-# Common TPL paths, we'll use TPL_ROOT for consistency across ATDM
-# environments
-export MPI_ROOT=${MPI_DIR}
-export BLAS_ROOT=${ARMPL_DIR}
-export LAPACK_ROOT=${ARMPL_DIR}
-export HDF5_ROOT=${HDF5_DIR}
-export NETCDF_ROOT=${NETCDF_DIR}
-export PNETCDF_ROOT=${PNETCDF_DIR}
-export ZLIB_ROOT=${ZLIB_DIR}
-export CGNS_ROOT=${CGNS_DIR}
-export BOOST_ROOT=${BOOST_DIR}
-export METIS_ROOT=${METIS_DIR}
-export PARMETIS_ROOT=${PARMETIS_DIR}
-export SUPERLUDIST_ROOT=${SUPERLU_DIST_DIR}
-export BINUTILS_ROOT=${BINUTILS_DIR}
 
 export ATDM_CONFIG_USE_HWLOC=OFF
 export HWLOC_LIBS=

packages/pamgen/rtcompiler/Registrar.C

@@ -556,7 +556,7 @@ double Readline::execute(Value** args)
 
   string line;
   if (getline(curr_file, line)) {
-    assert(args[1]->getSize() > line.size()); // buffer needs to be big enough
+     assert(args[1]->getSize() > long(line.size())); // buffer needs to be big enough
     for (size_t i = 0; i < line.size(); ++i) {
       args[1]->setArrayValue(line[i], i);
     }

packages/rol/adapters/pebbl/src/algorithm/ROL_PEBBL_Driver.hpp

@@ -26,6 +26,9 @@ class ROL_PEBBL_Driver {
 
 public:
 
+  ROL_PEBBL_Driver(const Ptr<ROL_PEBBL_Branching<Real>> &branching)
+    : branching_(branching) {}
+
   ROL_PEBBL_Driver(const Ptr<OptimizationProblemFactory<Real>> &factory,
                    const Ptr<ParameterList> &parlist,
                    const Ptr<BranchHelper_PEBBL<Real>> &bHelper,
@@ -46,6 +49,15 @@ class ROL_PEBBL_Driver {
     }
     return flag;
   }
+
+  const Ptr<Vector<Real>> getSolution(void) const {
+    if (branching_ != nullPtr) {
+      return dynamic_cast<ROL_PEBBL_Solution<Real>*>(branching_->incumbent)->getVector();
+    }
+    else {
+      return nullPtr;
+    }
+  }
 };
 
 }

packages/rol/adapters/pebbl/src/algorithm/ROL_PEBBL_Interface.hpp

@@ -75,7 +75,7 @@ class ROL_PEBBL_Solution : public pebbl::solution {
 
 template<class Real>
 class ROL_PEBBL_Branching : public pebbl::branching {
-private:
+protected:
   // OptimizationProblem encapsulates the following problem
   // min        obj(x)
   // subject to xl <= x <= xu
@@ -99,7 +99,7 @@ class ROL_PEBBL_Branching : public pebbl::branching {
     : factory_(factory), parlist_(parlist), bHelper_(bHelper),
       verbosity_(verbosity), outStream_(outStream) {}
 
-  pebbl::branchSub* blankSub() {
+  virtual pebbl::branchSub* blankSub() {
     return new ROL_PEBBL_BranchSub<Real>(makePtrFromRef<ROL_PEBBL_Branching<Real>>(*this),verbosity_,outStream_);
   }
 
@@ -126,7 +126,7 @@ class ROL_PEBBL_Branching : public pebbl::branching {
 
 template<class Real>
 class ROL_PEBBL_BranchSub : public pebbl::branchSub {
-private:
+protected:
   const Ptr<ROL_PEBBL_Branching<Real>> branching_;
   const Ptr<BranchHelper_PEBBL<Real>> bHelper_;
   std::map<int,Real> fixed_;
@@ -306,10 +306,11 @@ class ROL_PEBBL_BranchSub : public pebbl::branchSub {
     return (nfrac_==0);
   }
 
-  void incumbentHeuristic() {
+  virtual void incumbentHeuristic() {
     Real tol(std::sqrt(ROL_EPSILON<Real>()));
     rndSolution_->set(*solution_);
     rndSolution_->applyUnary(rnd);
+    problem0_->getObjective()->update(*rndSolution_);
     Real val = problem0_->getObjective()->value(*rndSolution_,tol);
     branching_->foundSolution(new ROL_PEBBL_Solution<Real>(*rndSolution_,val));
   }