Skip to content

Commit

Permalink
Merge Pull Request #13139 from trilinos/Trilinos/master_merge_2024062…
Browse files Browse the repository at this point in the history
…1_175845

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20240621_175845 branch to master'
PR Author: trilinos-autotester
  • Loading branch information
trilinos-autotester authored Jun 22, 2024
2 parents f1c2b5c + eb51111 commit 77005ad
Show file tree
Hide file tree
Showing 712 changed files with 12,302 additions and 38,098 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
27387a814f72487f5a3fbb634cd5d1b298dfe4c5
# clang-format for Tempus
586c87a8f1d21a837401aed54973689ac1177fba
# Removed CRs in cmake/ctest/drivers/ascicgpu031/drakify-email.pl
ca64fb4e4a495946d98e6e77060d5c03de6e21d7
6 changes: 3 additions & 3 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@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
fetch-depth: 0
- name: Repo status
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
mkdir -p /home/Trilinos/src/Trilinos
mkdir -p /home/Trilinos/build
- name: Clone trilinos
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
fetch-depth: 0
- name: Repo status
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:
mkdir -p /home/Trilinos/src/Trilinos
mkdir -p /home/Trilinos/build
- name: Clone trilinos
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
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 @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- 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@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
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@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
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@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: 'Dependency Review'
uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # v4.3.3
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@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
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@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
fetch-depth: 0

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

steps:
- name: "Checkout code"
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
persist-credentials: false

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@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
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@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
fetch-depth: 1
- name: Spack build
Expand Down
74 changes: 73 additions & 1 deletion RELEASE_NOTES
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,37 @@
# #
###############################################################################

A large number of packages have been marked as deprecated in this release.
We are planning to remove them in the fall of 2025. The list of packages is

- Amesos
- AztecOO
- Epetra
- EpetraExt
- Ifpack
- Intrepid
- Isorropia
- ML
- NewPackage
- Pliris
- PyTrilinos
- ShyLU_DDCore
- ThyraEpetraAdapters
- ThyraEpetraExtAdapters
- Triutils

If you are a user of one of these packages, please transition to the newer
software stack. If you need guidance with finding an adequate replacement
or are missing a particular feature, please open an issue or a discussion
on Github.


Amesos2

- Add interface to MKL cluster sparse solver.
https://github.com/trilinos/Trilinos/pull/13073


Framework

- Marked all deprecated packages as 'Secondary Tested'.
Expand All @@ -19,8 +50,49 @@ Framework
- Added deprecation warnings to all deprecated packages. The warnings are able
to be disabled via the `Trilinos_SHOW_DEPRECATED_WARNINGS` option (this is
also available as a per-package option). These warnings are intended to
notify users that pacakge capability they are using will be removed in upcoming
notify users that package capability they are using will be removed in upcoming
releases.
https://github.com/trilinos/Trilinos/pull/12828


Ifpack2

- RBILUK now supports Kokkos Kernels as a backend
https://github.com/trilinos/Trilinos/pull/12911


Kokkos, Kokkos Kernels

- Inclusion of version 4.3.1 of Kokkos and Kokkos Kernels
https://github.com/trilinos/Trilinos/pull/12995


NOX

- Added preconditioner reuse across multiple nonlinear solves.
https://github.com/trilinos/Trilinos/pull/12986


Teko

- Add Hierarchical Block Gauss-Seidel Capability
https://github.com/trilinos/Trilinos/pull/13040


Tpetra

- Some Tpetra features can be toggled via environment variables.
When an unrecognized variable is found, Tpetra now throws to alert
to potentially misspelled variables.
https://github.com/trilinos/Trilinos/pull/12944

- Add a test that checks that vendor TPLs for sparse matrix-vector product
are called.
https://github.com/trilinos/Trilinos/pull/13018

- Add team parallelism to kernels associated with matrix equilibration.
https://github.com/trilinos/Trilinos/pull/13017


###############################################################################
# #
Expand Down
Loading

0 comments on commit 77005ad

Please sign in to comment.