Skip to content

Commit

Permalink
Merge 'trilinos/Trilinos:develop' (3ce6990) into 'tcad-charon/Trilino…
Browse files Browse the repository at this point in the history 
…s:develop' (43675a0).

* trilinos-develop: (24 commits)
  STK: Snapshot 06-25-21 17:27
  MueLu: Adding tests
  MueLu: Extending aggregate smoothers to # pdes > 1
  Ifpack: Singleton Support
  MueLu: Singleton Support
  enabled xpetra tests
  Revert "FMT: Update to fmt-8.0.0"
  Revert "FMT: New files from fmt-8.0.0"
  IOSS: Add number_width test for >32 bit integers
  IOSS: Handle mixed field with no separator and _ separator
  IOSS: Eliminate maximum size limit on field suffices
  IOSS: Intel build fixes
  EXODUS: Python interface updates
  IOSS: Fix reading of embedded nodeblock fields
  FMT: New files from fmt-8.0.0
  GJOIN: Basic support for names
  Eliminate unused variable warnings; spelling fixes
  FMT: Update to fmt-8.0.0
  FASTQ: Change mesage function name to message
  drivers/atdm: Post build results to SparcATDM group
  ...
  • Loading branch information
Charonops Jenkins Pipeline committed Jun 26, 2021
2 parents 43675a0 + 3ce6990 commit ce7572e
Show file tree
Hide file tree
Showing 277 changed files with 13,594 additions and 12,578 deletions.
2 changes: 1 addition & 1 deletion ...s/atdm/ats1/drivers/Trilinos-atdm-ats1-hsw_intel-19.0.4_mpich-7.7.15_openmp_static_dbg.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=SparcATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats1/local-driver.sh
2 changes: 1 addition & 1 deletion ...s/atdm/ats1/drivers/Trilinos-atdm-ats1-hsw_intel-19.0.4_mpich-7.7.15_openmp_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=SparcATDM
fi
export Trilinos_SKIP_CTEST_ADD_TEST=FALSE
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats1/local-driver.sh
2 changes: 1 addition & 1 deletion ...s/atdm/ats1/drivers/Trilinos-atdm-ats1-knl_intel-19.0.4_mpich-7.7.15_openmp_static_dbg.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=SparcATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats1/local-driver.sh
2 changes: 1 addition & 1 deletion ...s/atdm/ats1/drivers/Trilinos-atdm-ats1-knl_intel-19.0.4_mpich-7.7.15_openmp_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=PrimaryATDM
fi
export Trilinos_SKIP_CTEST_ADD_TEST=FALSE
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats1/local-driver.sh
2 changes: 1 addition & 1 deletion ...s2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-gnu-7.3.1-spmpi-rolling_complex_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=SecondaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh
2 changes: 1 addition & 1 deletion .../atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-gnu-7.3.1-spmpi-rolling_static_dbg.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SecondaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh
2 changes: 1 addition & 1 deletion .../atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-gnu-7.3.1-spmpi-rolling_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=PrimaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh
2 changes: 1 addition & 1 deletion ...m/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_dbg.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SparcATDM
fi

$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh
2 changes: 1 addition & 1 deletion ...m/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=PrimaryATDM
fi

$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh
2 changes: 1 addition & 1 deletion ...drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-gnu-7.3.1-spmpi-rolling_serial_static_dbg.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SecondaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh
2 changes: 1 addition & 1 deletion ...drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-gnu-7.3.1-spmpi-rolling_serial_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SecondaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh
2 changes: 1 addition & 1 deletion ...ers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_dbg.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SparcATDM
fi

$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh
2 changes: 1 addition & 1 deletion ...ers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SparcATDM
fi

$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh
2 changes: 1 addition & 1 deletion .../cee-rhel7/drivers/Trilinos-atdm-cee-rhel7_clang-9.0.1_openmpi-4.0.3_serial_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ]; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=PrimaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion ...rhel7/drivers/Trilinos-atdm-cee-rhel7_cuda-10.1.243_gnu-7.2.0_openmpi-4.0.3_shared_dbg.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=SecondaryATDM
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion ...rhel7/drivers/Trilinos-atdm-cee-rhel7_cuda-10.1.243_gnu-7.2.0_openmpi-4.0.3_shared_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=PrimaryATDM
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion ...dm/cee-rhel7/drivers/Trilinos-atdm-cee-rhel7_gnu-7.2.0_openmpi-4.0.3_serial_shared_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ]; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SecondaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion ...e-rhel7/drivers/Trilinos-atdm-cee-rhel7_intel-19.0.3_intelmpi-2018.4_serial_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SparcATDM
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion ...dm/cee-rhel7/drivers/Trilinos-atdm-cee-rhel7_intel-19.0.3_mpich2-3.2_openmp_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SparcATDM
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion ...dm/cee-rhel7/drivers/Trilinos-atdm-cee-rhel7_mini-no-mpi_clang-9.0.1_serial_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SparcATDM
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion ...e-rhel7/drivers/Trilinos-atdm-cee-rhel7_mini-no-mpi_cuda-10.1.243_gnu-7.2.0_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SparcATDM
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion ...atdm/cee-rhel7/drivers/Trilinos-atdm-cee-rhel7_mini-no-mpi_gnu-7.2.0_serial_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SparcATDM
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion ...ers/atdm/cee-rhel7/drivers/Trilinos-atdm-cee-rhel7_mini-no-mpi_intel-19.0.3_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SparcATDM
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion ...rhel7/drivers/Trilinos-atdm-cee-rhel7_mini_clang-9.0.1_openmpi-4.0.3_serial_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SparcATDM
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion .../drivers/Trilinos-atdm-cee-rhel7_mini_cuda-10.1.243_gnu-7.2.0_openmpi-4.0.3_static_dbg.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SparcATDM
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion .../drivers/Trilinos-atdm-cee-rhel7_mini_cuda-10.1.243_gnu-7.2.0_openmpi-4.0.3_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SparcATDM
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion ...e-rhel7/drivers/Trilinos-atdm-cee-rhel7_mini_gnu-7.2.0_openmpi-4.0.3_serial_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SparcATDM
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion ...atdm/cee-rhel7/drivers/Trilinos-atdm-cee-rhel7_mini_intel-19.0.3_mpich2-3.2_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SparcATDM
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cee-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion ...vers/atdm/cts1/drivers/Trilinos-atdm-cts1-intel-19.0.4_openmpi-4.0.3_openmp_static_dbg.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#export SLURM_CTEST_TIMEOUT=1:00:00
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SecondaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cts1/local-driver.sh
2 changes: 1 addition & 1 deletion ...vers/atdm/cts1/drivers/Trilinos-atdm-cts1-intel-19.0.4_openmpi-4.0.3_openmp_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#export SLURM_CTEST_TIMEOUT=1:00:00
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=PrimaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cts1/local-driver.sh
2 changes: 1 addition & 1 deletion ...s1empire/drivers/Trilinos-atdm-cts1empire-intel-18.0.2_openmpi-4.0.1_openmp_static_dbg.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#export SLURM_CTEST_TIMEOUT=1:00:00
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=SecondaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cts1/local-driver.sh
2 changes: 1 addition & 1 deletion ...s1empire/drivers/Trilinos-atdm-cts1empire-intel-18.0.2_openmpi-4.0.1_openmp_static_opt.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#export SLURM_CTEST_TIMEOUT=1:00:00
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=PrimaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/cts1/local-driver.sh
2 changes: 1 addition & 1 deletion cmake/ctest/drivers/atdm/ride/drivers/Trilinos-atdm-white-ride-cuda-9.2-gnu-7.2.0-debug.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SecondaryATDM
fi
export EXCLUDE_NODES_FROM_BSUB="-R hname!=ride14"
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ride/local-driver.sh
2 changes: 1 addition & 1 deletion ...rivers/atdm/ride/drivers/Trilinos-atdm-white-ride-cuda-9.2-gnu-7.2.0-rdc-release-debug.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=PrimaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ride/local-driver.sh
2 changes: 1 addition & 1 deletion ...st/drivers/atdm/ride/drivers/Trilinos-atdm-white-ride-cuda-9.2-gnu-7.2.0-release-debug.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SecondaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ride/local-driver.sh
2 changes: 1 addition & 1 deletion cmake/ctest/drivers/atdm/ride/drivers/Trilinos-atdm-white-ride-cuda-9.2-gnu-7.2.0-release.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SecondaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ride/local-driver.sh
2 changes: 1 addition & 1 deletion cmake/ctest/drivers/atdm/ride/drivers/Trilinos-atdm-white-ride-gnu-7.2.0-openmp-debug.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
if [ "$Trilinos_TRACK" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SecondaryATDM
fi
export EXCLUDE_NODES_FROM_BSUB="-R hname!=ride14"
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ride/local-driver.sh
2 changes: 1 addition & 1 deletion cmake/ctest/drivers/atdm/ride/drivers/Trilinos-atdm-white-ride-gnu-7.2.0-openmp-release.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "$Trilinos_TRACK" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SecondaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ride/local-driver.sh
2 changes: 1 addition & 1 deletion ...-rhel7/drivers/Trilinos-atdm-sems-rhel7-cuda-10.1-Volta70-complex-shared-release-debug.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=PrimaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/sems-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion ...s-rhel7/drivers/Trilinos-atdm-sems-rhel7-gnu-7.2.0-openmp-complex-shared-release-debug.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=GemmaATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/sems-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion ...vers/atdm/sems-rhel7/drivers/Trilinos-atdm-sems-rhel7-intel-18.0.5-openmp-shared-debug.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=SecondaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/sems-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion ...m/sems-rhel7/drivers/Trilinos-atdm-sems-rhel7-intel-18.0.5-openmp-shared-release-debug.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=EmpireATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/sems-rhel7/local-driver.sh
2 changes: 1 addition & 1 deletion cmake/ctest/drivers/atdm/tlcc2/drivers/Trilinos-atdm-tlcc2-intel-debug-openmp.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if [[ "${SALLOC_CTEST_TIME_LIMIT_MINUTES}" == "" ]] ; then
fi

if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=SecondaryATDM
fi

$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/tlcc2/local-driver.sh
2 changes: 1 addition & 1 deletion cmake/ctest/drivers/atdm/tlcc2/drivers/Trilinos-atdm-tlcc2-intel-opt-openmp.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#export SALLOC_CTEST_TIME_LIMIT_MINUTES=1:00:00
if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=ATDM
export Trilinos_TRACK=PrimaryATDM
fi
$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/tlcc2/local-driver.sh
2 changes: 1 addition & 1 deletion .../atdm/van1-tx2/drivers/Trilinos-atdm-van1-tx2_arm-20.0_openmpi-4.0.2_openmp_static_dbg.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#export SALLOC_CTEST_TIME_LIMIT_MINUTES=1:00:00

if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Experimental
export Trilinos_TRACK=SecondaryATDM
fi

$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/van1-tx2/local-driver.sh
2 changes: 1 addition & 1 deletion .../atdm/van1-tx2/drivers/Trilinos-atdm-van1-tx2_arm-20.0_openmpi-4.0.2_openmp_static_opt.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#export SALLOC_CTEST_TIME_LIMIT_MINUTES=1:00:00

if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=SecondaryATDM
fi

$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/van1-tx2/local-driver.sh
2 changes: 1 addition & 1 deletion .../atdm/van1-tx2/drivers/Trilinos-atdm-van1-tx2_arm-20.1_openmpi-4.0.3_openmp_static_dbg.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#export SALLOC_CTEST_TIME_LIMIT_MINUTES=1:00:00

if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=SecondaryATDM
fi

$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/van1-tx2/local-driver.sh
2 changes: 1 addition & 1 deletion .../atdm/van1-tx2/drivers/Trilinos-atdm-van1-tx2_arm-20.1_openmpi-4.0.3_openmp_static_opt.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#export SALLOC_CTEST_TIME_LIMIT_MINUTES=1:00:00

if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=PrimaryATDM
fi

$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/van1-tx2/local-driver.sh
2 changes: 1 addition & 1 deletion .../atdm/van1-tx2/drivers/Trilinos-atdm-van1-tx2_arm-20.1_openmpi-4.0.5_openmp_static_opt.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#export SALLOC_CTEST_TIME_LIMIT_MINUTES=1:00:00

if [ "${Trilinos_TRACK}" == "" ] ; then
export Trilinos_TRACK=Specialized
export Trilinos_TRACK=PrimaryATDM
fi

$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/van1-tx2/local-driver.sh
1 change: 0 additions & 1 deletion cmake/std/PullRequestLinuxCuda10.1.105uvmOffTestingSettings.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ set (SEACAS_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
set (ShyLU_DD_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
set (STK_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
set (Teko_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
set (Xpetra_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
set (Zoltan2_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")


Expand Down
32 changes: 28 additions & 4 deletions packages/ifpack/src/Ifpack_UserPartitioner.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,43 @@ int Ifpack_UserPartitioner::ComputePartitions()
if (Map_ == 0)
IFPACK_CHK_ERR(-1);

// simply copy user's vector
for (int i = 0 ; i < NumMyRows() ; ++i) {
Partition_[i] = Map_[i];
if(keepSingletons_) {
// If we're keeping singletons, we need to count them and add a new part
// per singleton
int base_num_parts = NumLocalParts();
int curr_num_parts = base_num_parts;

for (int i = 0 ; i < NumMyRows() ; ++i) {
if(Map_[i] != -1)
Partition_[i] = Map_[i];
else {
Partition_[i] = curr_num_parts;
curr_num_parts++;
}
}

if(curr_num_parts != base_num_parts) {
NumLocalParts_ = curr_num_parts;
Parts_.resize(NumLocalParts());
}
}
else {
// copy the user's vector
for (int i = 0 ; i < NumMyRows() ; ++i) {
Partition_[i] = Map_[i];
}
}


#if 0
// put together all partitions composed by 1 one vertex
// (if any)
std::vector<int> singletons(NumLocalParts());
for (unsigned int i = 0 ; i < singletons.size() ; ++i) {
singletons[i] = 0;
}

#if 0

// may want to uncomment the following to ensure that no
// partitions are in fact singletons
for (int i = 0 ; i < NumMyRows() ; ++i) {
Expand Down
Loading

0 comments on commit ce7572e

Please sign in to comment.