Merge Pull Request #13329 from trilinos/Trilinos/master_merge_2024080…

…6_153426 Automatically Merged using Trilinos Master Merge AutoTester PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20240806_153426 branch to master' PR Author: trilinos-autotester
trilinos · Aug 7, 2024 · 2efaf2a · 2efaf2a
2 parents 19640f3 + a6da8e5
commit 2efaf2a
Show file tree

Hide file tree

Showing 2,052 changed files with 11,259 additions and 67,785 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -62,7 +62,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
+      uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -85,6 +85,6 @@ jobs:
           make -j 2
       
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
+      uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
+        uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
         with:
           egress-policy: audit
 

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -36,7 +36,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -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@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
+        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
         with:
           sarif_file: results.sarif
diff --git a/COPYRIGHT b/COPYRIGHT
@@ -0,0 +1,10 @@
+
+            Trilinos: An Object-Oriented Solver Framework
+                    Copyright (c) 2001-2024 NTESS
+
+Copyright 2001-2024 National Technology & Engineering Solutions of Sandia,
+LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the
+U.S. Government retains certain rights in this software.
+
+Copyright the Trilinos contributors.
+
diff --git a/Copyright.txt b/Copyright.txt
diff --git a/Copyright.txt b/Copyright.txt
@@ -0,0 +1 @@
+COPYRIGHT
diff --git a/LICENSE b/LICENSE
@@ -11,6 +11,8 @@ name>/LICENSE).
 
 For Trilinos (unless otherwise stated by package, directory and/or file),
 
+SPDX-License-Identifier: BSD-3-Clause
+
 Copyright (c) 2001-2024 NTESS and the Trilinos contributors.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README b/README
diff --git a/README.md b/README.md
@@ -35,6 +35,15 @@ unique design feature of Trilinos is its focus on packages.
   documentation for that package. Links to these can be found down the
   right side of any page on the website and at [the package website](https://trilinos.github.io/packages.html).
 
+- Sample build scripts for various platforms can be found in the
+  sampleScripts directory.  Please note that these sample scripts are
+  only a starting point for you to develop a script that works for
+  your own platform.
+
+- If you have questions, please submit an issue on the Trilinos repo 
+  [GitHub Issues page](https://github.com/trilinos/Trilinos/issues).
+
+
 ### License
 
 Trilinos is licensed on a per-package basis. Most packages are now

diff --git a/cmake/CallbackDefineProjectPackaging.cmake b/cmake/CallbackDefineProjectPackaging.cmake
@@ -8,7 +8,7 @@ MACRO(TRIBITS_PROJECT_DEFINE_PACKAGING)
   # generator, but it doesn't hurt to do it for other generators as
   # well.
   TRIBITS_COPY_INSTALLER_RESOURCE(Trilinos_README
-    "${Trilinos_SOURCE_DIR}/README"
+    "${Trilinos_SOURCE_DIR}/README.md"
     "${Trilinos_BINARY_DIR}/README.txt")
   TRIBITS_COPY_INSTALLER_RESOURCE(Trilinos_LICENSE
     "${Trilinos_SOURCE_DIR}/LICENSE"

diff --git a/cmake/TPLs/FindTPLCSS_MKL.cmake b/cmake/TPLs/FindTPLCSS_MKL.cmake
@@ -1,58 +1,3 @@
-# @HEADER
-# ************************************************************************
-#
-#            Trilinos: An Object-Oriented Solver Framework
-#                 Copyright (2001) Sandia Corporation
-#
-#
-# Copyright (2001) Sandia Corporation. Under the terms of Contract
-# DE-AC04-94AL85000, there is a non-exclusive license for use of this
-# work by or on behalf of the U.S. Government.  Export of this program
-# may require a license from the United States Government.
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# 3. Neither the name of the Corporation nor the names of the
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# NOTICE:  The United States Government is granted for itself and others
-# acting on its behalf a paid-up, nonexclusive, irrevocable worldwide
-# license in this data to reproduce, prepare derivative works, and
-# perform publicly and display publicly.  Beginning five (5) years from
-# July 25, 2001, the United States Government is granted for itself and
-# others acting on its behalf a paid-up, nonexclusive, irrevocable
-# worldwide license in this data to reproduce, prepare derivative works,
-# distribute copies to the public, perform publicly and display
-# publicly, and to permit others to do so.
-#
-# NEITHER THE UNITED STATES GOVERNMENT, NOR THE UNITED STATES DEPARTMENT
-# OF ENERGY, NOR SANDIA CORPORATION, NOR ANY OF THEIR EMPLOYEES, MAKES
-# ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY LEGAL LIABILITY OR
-# RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR USEFULNESS OF ANY
-# INFORMATION, APPARATUS, PRODUCT, OR PROCESS DISCLOSED, OR REPRESENTS
-# THAT ITS USE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS.
-#
-# ************************************************************************
-# @HEADER
-
 
 TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( CSS_MKL
   REQUIRED_HEADERS mkl_pardiso.h mkl_cluster_sparse_solver.h

diff --git a/packages/PyTrilinos2/LICENSE b/packages/PyTrilinos2/LICENSE
@@ -1,3 +1,4 @@
+SPDX-License-Identifier: BSD-3-Clause
 
 Copyright (c) 2022 NTESS and the PyTrilinos2 contributors.
 

diff --git a/packages/TrilinosInstallTests/LICENSE b/packages/TrilinosInstallTests/LICENSE
@@ -1,3 +1,4 @@
+SPDX-License-Identifier: BSD-3-Clause
 
 Copyright (c) 2001-2024 NTESS and the Trilinos contributors.
 

diff --git a/packages/adelus/LICENSE b/packages/adelus/LICENSE
@@ -1,3 +1,4 @@
+SPDX-License-Identifier: BSD-3-Clause
 
 Copyright (c) 2020 NTESS and the Adelus contributors.
 

diff --git a/packages/adelus/src/Adelus_solve.hpp b/packages/adelus/src/Adelus_solve.hpp
@@ -583,12 +583,12 @@ template<class HandleType, class ZViewType, class RHSViewType>
 inline
 void back_solve6(HandleType& ahandle, ZViewType& Z, RHSViewType& RHS)
 {
-  if (ahandle.get_nrhs() <= ahandle.get_nprocs_row()) {
-    back_solve_rhs_pipelined_comm(ahandle, Z, RHS);
-  }
-  else {
+  //if (ahandle.get_nrhs() <= ahandle.get_nprocs_row()) {
+  //  back_solve_rhs_pipelined_comm(ahandle, Z, RHS);
+  //}
+  //else {
     back_solve_currcol_bcast(ahandle, Z, RHS);
-  }
+  //}
 }
 
 }//namespace Adelus

diff --git a/packages/amesos2/LICENSE b/packages/amesos2/LICENSE
@@ -1,3 +1,4 @@
+SPDX-License-Identifier: BSD-3-Clause
 
 Copyright (c) 2011 NTESS and the Amesos2 contributors.
 

diff --git a/packages/amesos2/doc/design_review/amesos2_review.tex b/packages/amesos2/doc/design_review/amesos2_review.tex
@@ -93,7 +93,7 @@
 
 \begin{frame}[plain]
   \titlepage
-  \footnote{\tiny{Sandia is a multiprogram laboratory operated by Sandia Corporation, a wholly owned subsidiary of Lockheed Martin, for the United States Department of Energy'’s National Nuclear Security Administration under contract DE-AC04-94AL85000.}}
+  \footnote{\tiny{Sandia National Laboratories is a multi mission laboratory managed and operated by National Technology and Engineering Solutions of Sandia, LLC., a wholly owned subsidiary of Honeywell International, Inc., for the U.S. Department of Energy’s National Nuclear Security Administration under contract DE-NA0003525.}}
 \end{frame}
 
 \section{Introduction}

diff --git a/packages/amesos2/src/Amesos2_Factory.hpp b/packages/amesos2/src/Amesos2_Factory.hpp
@@ -1,44 +1,10 @@
 // @HEADER
-//
-// ***********************************************************************
-//
+// *****************************************************************************
 //           Amesos2: Templated Direct Sparse Solver Package
-//                  Copyright 2011 Sandia Corporation
-//
-// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-// the U.S. Government retains certain rights in this software.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the Corporation nor the names of the
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Questions? Contact Michael A. Heroux ([email protected])
-//
-// ***********************************************************************
 //
+// Copyright 2011 NTESS and the Amesos2 contributors.
+// SPDX-License-Identifier: BSD-3-Clause
+// *****************************************************************************
 // @HEADER
 
 /**

diff --git a/packages/amesos2/src/KLU2/LICENSE b/packages/amesos2/src/KLU2/LICENSE
@@ -1,3 +1,4 @@
+SPDX-License-Identifier: LGPL-2.1-or-later
 
 Copyright (c) 2011 NTESS and the KLU2 contributors.
 

diff --git a/packages/amesos2/src/basker/LICENSE b/packages/amesos2/src/basker/LICENSE
@@ -1,3 +1,4 @@
+SPDX-License-Identifier: LGPL-2.1-or-later
 
 Copyright (c) 2011 NTESS and the Basker contributors.
 

diff --git a/packages/anasazi/LICENSE b/packages/anasazi/LICENSE
@@ -1,3 +1,4 @@
+SPDX-License-Identifier: BSD-3-Clause
 
 Copyright (c) 2004 NTESS and the Anasazi contributors.
 

diff --git a/packages/anasazi/epetra/util/ModeLaplace/ModeLaplace3DQ1.cpp b/packages/anasazi/epetra/util/ModeLaplace/ModeLaplace3DQ1.cpp
@@ -6,6 +6,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // *****************************************************************************
 // @HEADER
+
 //**************************************************************************
 //
 //                                 NOTICE
@@ -23,9 +24,6 @@
 // This notice shall be marked on anY reproduction of this software, in whole or
 // in part.
 //
-// Under terms of Contract DE-AC04-94AL85000, there is a non-exclusive
-// license for use of this work by or on behalf of the U.S. Government.
-//
 // This program is distributed in the hope that it will be useful, but
 // WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

diff --git a/packages/anasazi/epetra/util/ModeLaplace/ModeLaplace3DQ2.cpp b/packages/anasazi/epetra/util/ModeLaplace/ModeLaplace3DQ2.cpp
@@ -6,6 +6,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // *****************************************************************************
 // @HEADER
+
 //**************************************************************************
 //
 //                                 NOTICE
@@ -23,9 +24,6 @@
 // This notice shall be marked on anY reproduction of this software, in whole or
 // in part.
 //
-// Under terms of Contract DE-AC04-94AL85000, there is a non-exclusive
-// license for use of this work by or on behalf of the U.S. Government.
-//
 // This program is distributed in the hope that it will be useful, but
 // WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		SPDX-License-Identifier: BSD-3-Clause

		Copyright (c) 2022 NTESS and the PyTrilinos2 contributors.

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		SPDX-License-Identifier: BSD-3-Clause

		Copyright (c) 2001-2024 NTESS and the Trilinos contributors.

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		SPDX-License-Identifier: BSD-3-Clause

		Copyright (c) 2020 NTESS and the Adelus contributors.

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		SPDX-License-Identifier: BSD-3-Clause

		Copyright (c) 2011 NTESS and the Amesos2 contributors.

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		SPDX-License-Identifier: LGPL-2.1-or-later

		Copyright (c) 2011 NTESS and the KLU2 contributors.

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		SPDX-License-Identifier: LGPL-2.1-or-later

		Copyright (c) 2011 NTESS and the Basker contributors.

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		SPDX-License-Identifier: BSD-3-Clause

		Copyright (c) 2004 NTESS and the Anasazi contributors.

Expand Down