Skip to content

Commit

Permalink
Merge Pull Request #13041 from trilinos/Trilinos/master_merge_2024052…
Browse files Browse the repository at this point in the history
…4_175838

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20240524_175838 branch to master'
PR Author: trilinos-autotester
  • Loading branch information
trilinos-autotester authored May 25, 2024
2 parents bf2943a + 1ad4e3c commit aeccfde
Show file tree
Hide file tree
Showing 123 changed files with 5,094 additions and 2,630 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/AT2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
mkdir -p /home/Trilinos/src/Trilinos
mkdir -p /home/Trilinos/build
- name: Clone trilinos
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
with:
fetch-depth: 0
- name: Repo status
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
mkdir -p /home/Trilinos/src/Trilinos
mkdir -p /home/Trilinos/build
- name: Clone trilinos
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
with:
fetch-depth: 0
- name: Repo status
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: DoozyX/clang-format-lint-action@11b773b1598aa4ae3b32f023701bca5201c3817d # v0.17
with:
source: './packages/muelu ./packages/tempus ./packages/teko ./packages/xpetra'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ 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@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}
Expand All @@ -85,6 +85,6 @@ jobs:
make -j 2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ jobs:
egress-policy: audit

- name: 'Checkout Repository'
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- name: 'Dependency Review'
uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4.3.2
2 changes: 1 addition & 1 deletion .github/workflows/detect-git-lfs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/detect-mpi-comm-world.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
with:
fetch-depth: 0

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ jobs:

steps:
- name: "Checkout code"
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
with:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
with:
results_file: results.sarif
results_format: sarif
Expand Down Expand Up @@ -66,6 +66,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/spack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
with:
access_token: ${{ github.token }}
- name: Clone Trilinos
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
with:
fetch-depth: 1
- name: Spack build
Expand Down
14 changes: 7 additions & 7 deletions doc/build_ref/TrilinosBuildReferenceTemplate.rst
Original file line number Diff line number Diff line change
Expand Up @@ -189,26 +189,26 @@ To see more documentation for each of these options, run a configure with
Setting the C++ language standard for Trilinos
----------------------------------------------

Trilinos currently supports building with the C++14 language standard as
Trilinos currently supports building with the C++17 language standard as
supported by a wide range of C++ compilers. In addition, the library targets
imported from the installed ``<Package>Config.cmake`` files (also pulled in
through ``TrilinosConfig.cmake``) will automatically require downstream CMake
projects turn on C++14 or later standard support in the compiler options
projects turn on C++17 or later standard support in the compiler options
(using the CMake ``INTERFACE_COMPILE_FEATURES`` properties of the Trilinos
library targets). Building Trilinos with C++11 or lower C++ language
library targets). Building Trilinos with C++14 or lower C++ language
standards is not supported.

However, to try building Trilinos with a higher C++ language standard (with a
supporting compiler), set the CMake cache variable ``CMAKE_CXX_STANDARD`` to
an appropriate value. For example, to try building Trilinos with C++17 turned
an appropriate value. For example, to try building Trilinos with C++20 turned
on, configure with::

-D CMAKE_CXX_STANDARD:STRING=17
-D CMAKE_CXX_STANDARD:STRING=20

As mentioned above, that will also result in all downstream C++ software built
CMake to be built with C++17 compiler options turned on as well.
with CMake to be built with C++20 compiler options turned on as well.

However, Trilinos is currently only rigorously tested with C++14 compiler
However, Trilinos is currently only rigorously tested with C++17 compiler
options so trying to build and use with a higher language standard may not
give satisfactory results.

Expand Down
17 changes: 15 additions & 2 deletions packages/belos/doc/DoxyfileWeb
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,20 @@ EXAMPLE_PATH = ../epetra/example \
../epetra/example/GCRODR/GCRODREpetraExFile.cpp \
../epetra/example/GCRODR/PrecGCRODREpetraExFile.cpp \
../epetra/example/RCG/RCGEpetraExFile.cpp \
../epetra/example/TFQMR/TFQMREpetraExFile.cpp
../epetra/example/PCPG/PCPGEpetraExFile.cpp \
../epetra/example/TFQMR/TFQMREpetraExFile.cpp \
../epetra/example/TFQMR/PseudoBlockTFQMREpetraExFile.cpp \
../tpetra/example \
../tpetra/example/BlockCG/BlockCGTpetraExFile.cpp \
../tpetra/example/BlockCG/PseudoBlockCGTpetraExFile.cpp \
../tpetra/example/BlockGmres/PseudoBlockGmresTpetraExFile.cpp \
../tpetra/example/BlockGmres/BlockGmresTpetraExFile.cpp \
../tpetra/example/BlockGmres/BlockGmresTpetraGaleriEx.cpp \
../tpetra/example/RCG/RCGTpetraExFile.cpp \
../tpetra/example/PCPG/PCPGTpetraExFile.cpp \
../tpetra/example/GCRODR/GCRODRTpetraExFile.cpp \
../tpetra/example/TFQMR/TFQMRTpetraExFile.cpp \
../tpetra/example/TFQMR/PseudoBlockTFQMREpetraExFile.cpp
EXAMPLE_PATTERNS = *.cpp *.hpp
IMAGE_PATH =
INPUT_FILTER =
Expand Down Expand Up @@ -166,4 +179,4 @@ GENERATE_LATEX = NO
GENERATE_RTF = NO
GENERATE_MAN = NO
GENERATE_XML = NO
HTML_FOOTER = ../../common/footer.html
HTML_FOOTER = ../../common/footer.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @HEADER
// ***********************************************************************
//
// Belos: Block Eigensolvers Package
// Belos: Block Linear Solvers Package
// Copyright 2004 Sandia Corporation
//
// Under terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @HEADER
// ***********************************************************************
//
// Belos: Block Eigensolvers Package
// Belos: Block Linear Solvers Package
// Copyright 2004 Sandia Corporation
//
// Under terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
Expand Down
4 changes: 2 additions & 2 deletions packages/belos/src/BelosBiCGStabSolMgr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@
#include "Teuchos_TimeMonitor.hpp"
#endif

/** \example BiCGStab/BiCGStabExFile.cpp
/** \example epetra/example/BiCGStab/BiCGStabExFile.cpp
This is an example of how to use the Belos::BiCGStabSolMgr solver manager.
*/
/** \example BiCGStab/PrecBiCGStabExFile.cpp
/** \example epetra/example/BiCGStab/PrecBiCGStabExFile.cpp
This is an example of how to use the Belos::BiCGStabSolMgr solver manager with an Ifpack preconditioner.
*/

Expand Down
9 changes: 6 additions & 3 deletions packages/belos/src/BelosBlockCGSolMgr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,13 @@
#endif // defined(HAVE_TEUCHOSCORE_CXX11)
#include <algorithm>

/** \example BlockCG/BlockCGEpetraExFile.cpp
This is an example of how to use the Belos::BlockCGSolMgr solver manager.
/** \example epetra/example/BlockCG/BlockCGEpetraExFile.cpp
This is an example of how to use the Belos::BlockCGSolMgr solver manager in Epetra.
*/
/** \example BlockCG/BlockPrecCGEpetraExFile.cpp
/** \example tpetra/example/BlockCG/BlockCGTpetraExFile.cpp
This is an example of how to use the Belos::BlockCGSolMgr solver manager in Tpetra.
*/
/** \example epetra/example/BlockCG/BlockPrecCGEpetraExFile.cpp
This is an example of how to use the Belos::BlockCGSolMgr solver manager with an Ifpack preconditioner.
*/

Expand Down
14 changes: 10 additions & 4 deletions packages/belos/src/BelosBlockGmresSolMgr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,21 @@
#include "Teuchos_TimeMonitor.hpp"
#endif

/** \example BlockGmres/BlockGmresEpetraExFile.cpp
This is an example of how to use the Belos::BlockGmresSolMgr solver manager.
/** \example epetra/example/BlockGmres/BlockGmresEpetraExFile.cpp
This is an example of how to use the Belos::BlockGmresSolMgr solver manager using Epetra.
*/
/** \example BlockGmres/BlockPrecGmresEpetraExFile.cpp
/** \example epetra/example/BlockGmres/BlockPrecGmresEpetraExFile.cpp
This is an example of how to use the Belos::BlockGmresSolMgr solver manager with an Ifpack preconditioner.
*/
/** \example BlockGmres/BlockFlexGmresEpetraExFile.cpp
/** \example epetra/example/BlockGmres/BlockFlexGmresEpetraExFile.cpp
This is an example of how to use the Belos::BlockGmresSolMgr solver manager with flexible Gmres.
*/
/** \example tpetra/example/BlockGmres/BlockGmresTpetraExFile.cpp
This is an example of how to use the Belos::BlockGmresSolMgr solver manager using Tpetra.
*/
/** \example tpetra/example/BlockGmres/BlockGmresTpetraGaleriEx.cpp
This is an example of how to use the Belos::BlockGmresSolMgr solver manager using Tpetra and Galeri.
*/

namespace Belos {

Expand Down
9 changes: 6 additions & 3 deletions packages/belos/src/BelosGCRODRSolMgr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,13 @@
# include <type_traits>
#endif // defined(HAVE_TEUCHOSCORE_CXX11)

/** \example GCRODR/GCRODREpetraExFile.cpp
This is an example of how to use the Belos::GCRODRSolMgr solver manager.
/** \example epetra/example/GCRODR/GCRODREpetraExFile.cpp
This is an example of how to use the Belos::GCRODRSolMgr solver manager using Epetra.
*/
/** \example GCRODR/PrecGCRODREpetraExFile.cpp
/** \example tpetra/example/GCRODR/GCRODRTpetraExFile.cpp
This is an example of how to use the Belos::GCRODRSolMgr solver manager using Tpetra.
*/
/** \example epetra/example/GCRODR/PrecGCRODREpetraExFile.cpp
This is an example of how to use the Belos::GCRODRSolMgr solver manager with an Ifpack preconditioner.
*/

Expand Down
4 changes: 3 additions & 1 deletion packages/belos/src/BelosGmresPolySolMgr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
#include "Teuchos_TimeMonitor.hpp"
#endif

/** \example epetra/example/BlockGmres/BlockGmresPolyEpetraExFile.cpp
This is an example of how to use the Belos::GmresPolySolMgr with Epetra.
*/

namespace Belos {

Expand Down Expand Up @@ -90,7 +93,6 @@ class GmresPolySolMgrPolynomialFailure : public BelosError {public:
/// \brief Hybrid block GMRES iterative linear solver.
/// \author Heidi Thornquist and Jennifer Loe
/// \ingroup belos_solver_framework
/// \example BlockGmres/BlockGmresPolyEpetraExFile.cpp
///
/// The GMRES polynomial solver manager can perform two types of linear
/// solves. First the solver runs block GMRES, storing the resulting
Expand Down
2 changes: 1 addition & 1 deletion packages/belos/src/BelosLSQRStatusTest.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#include "BelosStatusTest.hpp"
#include "BelosLSQRIter.hpp"

/*! \class LSQRStatusTest:
/*! \class Belos::LSQRStatusTest
\brief A Belos::StatusTest class for specifying convergence of LSQR. The outer status tests passes if an inner
status passes a user specified number of times consecutively. The inner status test depends on information
specific to LSQR iteration.
Expand Down
10 changes: 7 additions & 3 deletions packages/belos/src/BelosPCPGSolMgr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@
# include <type_traits>
#endif // defined(HAVE_TEUCHOSCORE_CXX11)

/** \example epetra/example/PCPG/PCPGEpetraExFile.cpp
This is an example of how to use the Belos::PCPGSolMgr with an ML preconditioner.
*/
/** \example tpetra/example/PCPG/PCPGTpetraExFile.cpp
This is an example of how to use Belos::PCPGSolMgr with Tpetra.
*/

namespace Belos {

//! @name PCPGSolMgr Exceptions
Expand Down Expand Up @@ -124,9 +131,6 @@ namespace Belos {
/// One often sees PCPG in context with the FETI domain
/// decomposition method.
///
/// \example PCPG/PCPGEpetraExFile.cpp
///
/// The provided example uses PCPGSolMgr with an ML preconditioner.

// Partial specialization for complex ScalarType.
// This contains a trivial implementation.
Expand Down
9 changes: 6 additions & 3 deletions packages/belos/src/BelosPseudoBlockCGSolMgr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,13 @@
#include "Teuchos_TimeMonitor.hpp"
#endif

/** \example BlockCG/PseudoBlockCGEpetraExFile.cpp
This is an example of how to use the Belos::PseudoBlockCGSolMgr solver manager.
/** \example epetra/example/BlockCG/PseudoBlockCGEpetraExFile.cpp
This is an example of how to use the Belos::PseudoBlockCGSolMgr solver manager using Epetra.
*/
/** \example BlockCG/PseudoBlockPrecCGEpetraExFile.cpp
/** \example tpetra/example/BlockCG/PseudoBlockCGTpetraExFile.cpp
This is an example of how to use the Belos::PseudoBlockCGSolMgr solver manager using Tpetra.
*/
/** \example epetra/example/BlockCG/PseudoBlockPrecCGEpetraExFile.cpp
This is an example of how to use the Belos::PseudoBlockCGSolMgr solver manager with an Ifpack preconditioner.
*/

Expand Down
9 changes: 6 additions & 3 deletions packages/belos/src/BelosPseudoBlockGmresSolMgr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,15 @@
#include "Teuchos_TimeMonitor.hpp"
#endif

/** \example BlockGmres/PseudoBlockGmresEpetraExFile.cpp
This is an example of how to use the Belos::PseudoBlockGmresSolMgr solver manager.
/** \example epetra/example/BlockGmres/PseudoBlockGmresEpetraExFile.cpp
This is an example of how to use the Belos::PseudoBlockGmresSolMgr solver manager using Epetra.
*/
/** \example BlockGmres/PseudoBlockPrecGmresEpetraExFile.cpp
/** \example epetra/example/BlockGmres/PseudoBlockPrecGmresEpetraExFile.cpp
This is an example of how to use the Belos::PseudoBlockGmresSolMgr solver manager with an Ifpack preconditioner.
*/
/** \example tpetra/example/BlockGmres/PseudoBlockGmresTpetraExFile.cpp
This is an example of how to use the Belos::PseudoBlockGmresSolMgr solver manager using Tpetra.
*/

namespace Belos {

Expand Down
7 changes: 5 additions & 2 deletions packages/belos/src/BelosPseudoBlockTFQMRSolMgr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,11 @@
#include "Teuchos_TimeMonitor.hpp"
#endif

/** \example TFQMR/PseudoBlockTFQMREpetraExFile.cpp
This is an example of how to use the Belos::PseudoBlockTFQMRSolMgr solver manager.
/** \example epetra/example/TFQMR/PseudoBlockTFQMREpetraExFile.cpp
This is an example of how to use the Belos::PseudoBlockTFQMRSolMgr solver manager using Epetra.
*/
/** \example tpetra/example/TFQMR/PseudoBlockTFQMRTpetraExFile.cpp
This is an example of how to use the Belos::PseudoBlockTFQMRSolMgr solver manager using Tpetra.
*/

/*! \class Belos::PseudoBlockTFQMRSolMgr
Expand Down
7 changes: 7 additions & 0 deletions packages/belos/src/BelosRCGSolMgr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@
#include "Teuchos_TimeMonitor.hpp"
#endif

/** \example epetra/example/RCG/RCGEpetraExFile.cpp
This is an example of how to use the Belos::RCGSolMgr solver manager in Epetra.
*/
/** \example tpetra/example/RCG/RCGTpetraExFile.cpp
This is an example of how to use the Belos::RCGSolMgr solver manager in Tpetra.
*/

/*! \class Belos::RCGSolMgr
\brief Implementation of the RCG (Recycling Conjugate Gradient) iterative linear solver.
\ingroup belos_solver_framework
Expand Down
7 changes: 5 additions & 2 deletions packages/belos/src/BelosTFQMRSolMgr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,11 @@
#include "Teuchos_TimeMonitor.hpp"
#endif

/** \example TFQMR/TFQMREpetraExFile.cpp
This is an example of how to use the Belos::TFQMRSolMgr solver manager.
/** \example epetra/example/TFQMR/TFQMREpetraExFile.cpp
This is an example of how to use the Belos::TFQMRSolMgr solver manager using Epetra.
*/
/** \example tpetra/example/TFQMR/TFQMRTpetraExFile.cpp
This is an example of how to use the Belos::TFQMRSolMgr solver manager using Tpetra.
*/

/*! \class Belos::TFQMRSolMgr
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @HEADER
// ***********************************************************************
//
// Belos: Block Eigensolvers Package
// Belos: Block Linear Solvers Package
// Copyright 2004 Sandia Corporation
//
// Under terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
Expand Down
Loading

0 comments on commit aeccfde

Please sign in to comment.