Merge Pull Request #13004 from trilinos/Trilinos/master_merge_2024051…

…0_175839

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

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,66 +1,75 @@
 <!---
-Be sure to select `develop` as the `base` branch against which to create this
-pull request.  Only pull requests against `develop` will undergo Trilinos'
-automated testing.  Pull requests against `master` will be ignored.
+  Note that anything between these delimiters is a comment that will not appear
+  in the pull request description once created. Most areas in this message are
+  commented out and can be easily added by removing the comment delimiters.
 
-Provide a general summary of your changes in the Title above.  If this pull
-request pertains to a particular package in Trilinos, it's worthwhile to start
-the title with "PackageName:  ".
+  CHOOSE APPROPRIATE BRANCH
+  Be sure to select `develop` as the `base` branch against which to create this
+  pull request.  Only pull requests against `develop` will undergo Trilinos'
+  automated testing.  Pull requests against `master` will be ignored.
 
-Note that anything between these delimiters is a comment that will not appear
-in the pull request description once created. Most areas in this message are
-commented out and can be easily added by removing the comment delimiters.
+  TITLE
+  Provide a general summary of your changes in the Title above.  If this pull
+  request pertains to a particular package in Trilinos, it's worthwhile to start
+  the title with "PackageName:  ".
 
-Please make sure to mark:
-* Reviewers
-* Assignees
-* Labels
+  REVIEWERS
+  Please make sure to mark:
+  * Reviewers
+  * Assignees
+  * Labels
 
-If the changes in the PR should be considered for inclusion in the release notes,
-please apply the label "xx.y release note" where xx.y is the version of the
-upcoming release.
-Replace <teamName> below with the appropriate Trilinos package/team name.
+  SHOULD THIS PR BE IN THE RELEASE NOTES?
+  If the changes in the PR should be considered for inclusion in the release notes,
+  please apply the label "xx.y release note" where xx.y is the version of the
+  upcoming release.
+
+  NOTIFY THE RIGHT TEAMS
+  Replace <teamName> below with the appropriate Trilinos package/team name.
 -->
 @trilinos/<teamName>
 
 ## Motivation
 <!--- 
-Why is this change required?  What problem does it solve? Please link to a github 
-issue that describes the problem/issue/bug this PR solves.
+  Why is this change required?  What problem does it solve? Please link to a github 
+  issue that describes the problem/issue/bug this PR solves.
 -->
 
+## Related Issues
 <!---
-If applicable, let us know how this merge request is related to any other open
-issues or pull requests:
+  If applicable, let us know how this merge request is related to any other open
+  issues or pull requests:
+-->
 
-## Related Issues
+* Closes `put-issue-number-here`
 
-* Closes 
-* Blocks 
-* Is blocked by 
-* Follows 
-* Precedes 
-* Related to 
-* Part of 
-* Composed of 
+<!--
+  Other options are
+  * Blocks 
+  * Is blocked by 
+  * Follows 
+  * Precedes 
+  * Related to 
+  * Part of 
+  * Composed of 
 -->
 
 
 ## Stakeholder Feedback
 <!--- 
-If a github issue includes feedback from the relevant stakeholder(s), please link it.  
-If the stakeholder(s) communicated that feedback through a different medium, please note that you did so.
+  If a github issue includes feedback from the relevant stakeholder(s), please link it.  
+  If the stakeholder(s) communicated that feedback through a different medium, please note that you did so.
 -->
 
 ## Testing
 <!---
-Please confirm that any classes or functions in the Trilinos library that this PR touches are 
-exercised by at least one test in Trilinos.  Please specify which test that is.  For untestable 
-changes (e.g. changes to the nightly testing system) or changes to Trilinos tests, please say "N/A".
+  Please confirm that any classes or functions in the Trilinos library that this PR touches are 
+  exercised by at least one test in Trilinos.  Please specify which test that is.  For untestable 
+  changes (e.g. changes to the nightly testing system) or changes to Trilinos tests, please say "N/A".
 
 -->
 
 <!--- 
-## Additional Information
-Anything else we need to know in evaluating this merge request?
- -->
+  ## Additional Information
+  Anything else we need to know in evaluating this merge request?
+-->

.github/workflows/AT2.yml

@@ -41,7 +41,7 @@ jobs:
           mkdir -p /home/Trilinos/src/Trilinos
           mkdir -p /home/Trilinos/build
       - name: Clone trilinos
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           fetch-depth: 0
       - name: Repo status
@@ -99,7 +99,7 @@ jobs:
           mkdir -p /home/Trilinos/src/Trilinos
           mkdir -p /home/Trilinos/build
       - name: Clone trilinos
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           fetch-depth: 0
       - name: Repo status

.github/workflows/clang_format.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
     - uses: DoozyX/clang-format-lint-action@11b773b1598aa4ae3b32f023701bca5201c3817d # v0.17
       with:
         source: './packages/muelu ./packages/tempus ./packages/teko ./packages/xpetra'

.github/workflows/codeql.yml

@@ -58,7 +58,7 @@ jobs:
         # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
     - name: Checkout repository
-      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/dependency-review.yml

@@ -22,6 +22,6 @@ jobs:
           egress-policy: audit
 
       - name: 'Checkout Repository'
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@e58c696e52cac8e62d61cc21fda89565d71505d7 # v4.3.1
+        uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4.3.2

.github/workflows/detect-git-lfs.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - name: Check out code
-      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
       with:
         fetch-depth: 0
 

.github/workflows/detect-mpi-comm-world.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - name: Check out code
-      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
       with:
         fetch-depth: 0
 

.github/workflows/scorecards.yml

@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           persist-credentials: false
 

.github/workflows/spack.yml

@@ -24,7 +24,7 @@ jobs:
         with:
           access_token: ${{ github.token }}
       - name: Clone Trilinos
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           fetch-depth: 1
       - name: Spack build

packages/belos/src/BelosBlockCGSolMgr.hpp

@@ -623,8 +623,9 @@ setParameters (const Teuchos::RCP<Teuchos::ParameterList> &params)
   // Create orthogonalization manager if we need to.
   if (ortho_ == Teuchos::null || changedOrthoType) {
     Belos::OrthoManagerFactory<ScalarType, MV, OP> factory;
-    Teuchos::RCP<Teuchos::ParameterList> paramsOrtho;   // can be null
+    Teuchos::RCP<Teuchos::ParameterList> paramsOrtho;   
     if (orthoType_=="DGKS" && orthoKappa_ > 0) {
+      paramsOrtho = Teuchos::rcp(new Teuchos::ParameterList());
       paramsOrtho->set ("depTol", orthoKappa_ );
     }
 

packages/belos/src/BelosBlockGmresSolMgr.hpp

@@ -662,8 +662,9 @@ void BlockGmresSolMgr<ScalarType,MV,OP>::setParameters( const Teuchos::RCP<Teuch
   // Create orthogonalization manager if we need to.
   if (ortho_ == Teuchos::null || changedOrthoType) {
     Belos::OrthoManagerFactory<ScalarType, MV, OP> factory;
-    Teuchos::RCP<Teuchos::ParameterList> paramsOrtho;   // can be null
+    Teuchos::RCP<Teuchos::ParameterList> paramsOrtho;   
     if (orthoType_=="DGKS" && orthoKappa_ > 0) {
+      paramsOrtho = Teuchos::rcp(new Teuchos::ParameterList());
       paramsOrtho->set ("depTol", orthoKappa_ );
     }
 

packages/belos/src/BelosPCPGSolMgr.hpp

@@ -616,6 +616,7 @@ void PCPGSolMgr<ScalarType,MV,OP,true>::setParameters( const Teuchos::RCP<Teucho
     Belos::OrthoManagerFactory<ScalarType, MV, OP> factory;
     Teuchos::RCP<Teuchos::ParameterList> paramsOrtho;   // can be null
     if (orthoType_=="DGKS" && orthoKappa_ > 0) {
+      paramsOrtho = Teuchos::rcp(new Teuchos::ParameterList());
       paramsOrtho->set ("depTol", orthoKappa_ );
     }
 

packages/belos/src/BelosPseudoBlockGmresSolMgr.hpp

@@ -786,6 +786,7 @@ setParameters (const Teuchos::RCP<Teuchos::ParameterList>& params)
     Belos::OrthoManagerFactory<ScalarType, MV, OP> factory;
     Teuchos::RCP<Teuchos::ParameterList> paramsOrtho;   // can be null
     if (orthoType_=="DGKS" && orthoKappa_ > 0) {
+      paramsOrtho = Teuchos::rcp(new Teuchos::ParameterList());
       paramsOrtho->set ("depTol", orthoKappa_ );
     }
 

packages/belos/tpetra/test/BlockGmres/CMakeLists.txt

@@ -44,7 +44,10 @@ ENDIF()
 TRIBITS_ADD_EXECUTABLE_AND_TEST(
   Tpetra_BlockGMRES_hb_test
   SOURCES test_bl_gmres_hb.cpp
-  ARGS "--verbose"
+  ARGS 
+    "--verbose --ortho-type=DGKS"
+    "--verbose --ortho-type=ICGS"
+    "--verbose --ortho-type=IMGS"
   COMM serial mpi
   )
 

packages/belos/tpetra/test/BlockGmres/test_bl_gmres_hb.cpp

@@ -156,6 +156,8 @@ int main(int argc, char *argv[]) {
     belosList.set( "Maximum Iterations", maxiters );       // Maximum number of iterations allowed
     belosList.set( "Convergence Tolerance", tol );         // Relative convergence tolerance requested
     belosList.set( "Orthogonalization", ortho );           // Orthogonalization type
+    if ( ortho == "DGKS" )
+      belosList.set( "Orthogonalization Constant",  1.41421356);
 
     int verbLevel = Belos::Errors + Belos::Warnings;
     if (debug) {

packages/ifpack2/example/BlockTriDi.cpp

@@ -318,6 +318,8 @@ main (int argc, char* argv[])
   RCP<Time> precSetupTime = Teuchos::TimeMonitor::getNewTimer ("Preconditioner setup");
   RCP<Time> precComputeTime = Teuchos::TimeMonitor::getNewTimer ("Preconditioner compute");
   RCP<Time> solveTime = Teuchos::TimeMonitor::getNewTimer ("Solve");
+  RCP<Time> normTime = Teuchos::TimeMonitor::getNewTimer ("Norm");
+  RCP<Time> warmupMatrixApplyTime = Teuchos::TimeMonitor::getNewTimer ("Preposition of the matrix on device");
   if(!args.useStackedTimer)
   {
     totalTime = Teuchos::TimeMonitor::getNewTimer ("Total");
@@ -365,6 +367,8 @@ main (int argc, char* argv[])
   RCP<IV> line_info;
 #if defined(HAVE_IFPACK2_XPETRA)
   if(args.matrixFilename == "") {
+    RCP<Time> matrixCreationTime = Teuchos::TimeMonitor::getNewTimer ("Create inline matrix");
+    Teuchos::TimeMonitor matrixCreationTimeMon (*matrixCreationTime);
     if (args.usePointMatrix) {
       std::string msg = "usePointMatrix with inline matrix is not yet implemented";
       throw std::runtime_error(msg);      
@@ -453,6 +457,8 @@ main (int argc, char* argv[])
   else
 #endif 
     {
+      RCP<Time> matrixReadingTime = Teuchos::TimeMonitor::getNewTimer ("Reading matrix input files");
+      Teuchos::TimeMonitor matrixReadingTimeMon (*matrixReadingTime);
       // Read map
       if(rank0) std::cout<<"Reading map file..."<<std::endl;
       RCP<const map_type> point_map = reader_type::readMapFile(args.mapFilename, comm);
@@ -496,7 +502,11 @@ main (int argc, char* argv[])
 
       // Convert Matrix to Block
       if(rank0) std::cout<<"Converting A from point to block..."<<std::endl;
-      Ablock = Tpetra::convertToBlockCrsMatrix<SC,LO,GO,NO>(*A, args.blockSize);
+      {
+        RCP<Time> matrixConversionTime = Teuchos::TimeMonitor::getNewTimer ("Matrix conversion");
+        Teuchos::TimeMonitor matrixConversionTimeMon (*matrixConversionTime);
+        Ablock = Tpetra::convertToBlockCrsMatrix<SC,LO,GO,NO>(*A, args.blockSize);
+      }
 
 
       // Read line information vector
@@ -523,12 +533,6 @@ main (int argc, char* argv[])
              << " rows with an implied block size of "<< ((double)numDomains / (double)numRows)<<std::endl;
   }
 
-  if(args.useStackedTimer)
-  {
-    stackedTimer = rcp(new StackedTimer("BlockTriDiagonalSolver"));
-    Teuchos::TimeMonitor::setStackedTimer(stackedTimer);
-  }
-
   // Initial Guess
   if(rank0) std::cout<<"Allocating initial guess..."<<std::endl;
   X = rcp(new MV(Ablock->getRangeMap(),1));
@@ -571,10 +575,18 @@ main (int argc, char* argv[])
 
   // Preposition the matrix on device by letting a matvec ensure a transfer
   {
+    Teuchos::TimeMonitor warmupMatrixApplyTimeMon (*warmupMatrixApplyTime);
+
     RCP<MV> temp = rcp(new MV(Ablock->getRangeMap(),1));
     Ablock->apply(*X,*temp);
   }
 
+  if(args.useStackedTimer)
+  {
+    stackedTimer = rcp(new StackedTimer("BlockTriDiagonalSolver"));
+    Teuchos::TimeMonitor::setStackedTimer(stackedTimer);
+  }
+
   // Create Ifpack2 preconditioner.
   if(rank0) std::cout<<"Creating preconditioner..."<<std::endl;
   RCP<BTDC> precond;
@@ -625,9 +637,12 @@ main (int argc, char* argv[])
       std::cout<<"  Norm0 = "<<norm0<<" NormF = "<<normF<<std::endl;
     }
 
-
-    X->norm2(normx);
-    B->norm2(normb);
+    {
+      Teuchos::TimeMonitor normTimeMon (*normTime);
+      X->norm2(normx);
+      B->norm2(normb);
+      Kokkos::DefaultExecutionSpace().fence();
+    }
     if(rank0) {
       std::cout<<"Final norm X = "<<normx[0]<<" norm B = "<<normb[0]<<std::endl;
     }