Merge Pull Request #13462 from trilinos/Trilinos/master_merge_2024092…

…0_175816

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

.github/workflows/AT2.yml

@@ -103,6 +103,23 @@ jobs:
             --ctest-drop-site sems-cdash-son.sandia.gov/cdash \
             --filename-subprojects ./package_subproject_list.cmake \
             --filename-packageenables ./packageEnables.cmake
+      - name: Summary
+        if: ${{ !cancelled() }}
+        shell: bash -l {0}
+        working-directory: /home/Trilinos/build
+        run: |
+          echo "## Image" >> $GITHUB_STEP_SUMMARY
+          echo "image: ${AT2_IMAGE:-unknown}" >> $GITHUB_STEP_SUMMARY
+          echo "## CDash Links" >> $GITHUB_STEP_SUMMARY
+          echo "### Current Build" >> $GITHUB_STEP_SUMMARY
+          AT2_URL=$(</home/runner/AT2_URL.txt)
+          echo $AT2_URL >> $GITHUB_STEP_SUMMARY
+          echo "### All Builds" >> $GITHUB_STEP_SUMMARY
+          AT2_ALL_BUILDS=$(</home/runner/AT2_ALL_BUILDS.txt)
+          echo $AT2_ALL_BUILDS >> $GITHUB_STEP_SUMMARY
+          echo "## Helpful Links" >> $GITHUB_STEP_SUMMARY
+          echo "https://github.com/trilinos/Trilinos/wiki/Containers" >> $GITHUB_STEP_SUMMARY
+          echo "https://gitlab-ex.sandia.gov/trilinos-project/trilinos-containers/-/wikis/Containers-at-Sandia" >> $GITHUB_STEP_SUMMARY
 
   gcc830-serial-EXPERIMENTAL:
     needs: pre-checks
@@ -177,6 +194,23 @@ jobs:
             --ctest-drop-site sems-cdash-son.sandia.gov/cdash \
             --filename-subprojects ./package_subproject_list.cmake \
             --filename-packageenables ./packageEnables.cmake
+      - name: Summary
+        if: ${{ !cancelled() }}
+        shell: bash -l {0}
+        working-directory: /home/Trilinos/build
+        run: |
+          echo "## Image" >> $GITHUB_STEP_SUMMARY
+          echo "image: ${AT2_IMAGE:-unknown}" >> $GITHUB_STEP_SUMMARY
+          echo "## CDash Links" >> $GITHUB_STEP_SUMMARY
+          echo "### Current Build" >> $GITHUB_STEP_SUMMARY
+          AT2_URL=$(</home/runner/AT2_URL.txt)
+          echo $AT2_URL >> $GITHUB_STEP_SUMMARY
+          echo "### All Builds" >> $GITHUB_STEP_SUMMARY
+          AT2_ALL_BUILDS=$(</home/runner/AT2_ALL_BUILDS.txt)
+          echo $AT2_ALL_BUILDS >> $GITHUB_STEP_SUMMARY
+          echo "## Helpful Links" >> $GITHUB_STEP_SUMMARY
+          echo "https://github.com/trilinos/Trilinos/wiki/Containers" >> $GITHUB_STEP_SUMMARY
+          echo "https://gitlab-ex.sandia.gov/trilinos-project/trilinos-containers/-/wikis/Containers-at-Sandia" >> $GITHUB_STEP_SUMMARY
 
   cuda11-uvm-EXPERIMENTAL:
     needs: pre-checks
@@ -252,3 +286,20 @@ jobs:
             --filename-packageenables ./packageEnables.cmake \
             --max-cores-allowed=96 \
             --num-concurrent-tests=96
+      - name: Summary
+        if: ${{ !cancelled() }}
+        shell: bash -l {0}
+        working-directory: /home/Trilinos/build
+        run: |
+          echo "## Image" >> $GITHUB_STEP_SUMMARY
+          echo "image: ${AT2_IMAGE:-unknown}" >> $GITHUB_STEP_SUMMARY
+          echo "## CDash Links" >> $GITHUB_STEP_SUMMARY
+          echo "### Current Build" >> $GITHUB_STEP_SUMMARY
+          AT2_URL=$(</home/runner/AT2_URL.txt)
+          echo $AT2_URL >> $GITHUB_STEP_SUMMARY
+          echo "### All Builds" >> $GITHUB_STEP_SUMMARY
+          AT2_ALL_BUILDS=$(</home/runner/AT2_ALL_BUILDS.txt)
+          echo $AT2_ALL_BUILDS >> $GITHUB_STEP_SUMMARY
+          echo "## Helpful Links" >> $GITHUB_STEP_SUMMARY
+          echo "https://github.com/trilinos/Trilinos/wiki/Containers" >> $GITHUB_STEP_SUMMARY
+          echo "https://gitlab-ex.sandia.gov/trilinos-project/trilinos-containers/-/wikis/Containers-at-Sandia" >> $GITHUB_STEP_SUMMARY

.github/workflows/clang_format.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-    - uses: DoozyX/clang-format-lint-action@d7f6a5bada32b7ea520b5918416e92997678e3fd # v0.18
+    - uses: DoozyX/clang-format-lint-action@c71d0bf4e21876ebec3e5647491186f8797fde31 # v0.18.2
       with:
         source: './packages/muelu ./packages/tempus ./packages/teko ./packages/xpetra'
         exclude: './packages/tempus/examples'

.github/workflows/codeql.yml

@@ -62,7 +62,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+      uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
       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@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+      uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/dependency-review.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
         with:
           egress-policy: audit
 

.github/workflows/scorecards.yml

@@ -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@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
         with:
           sarif_file: results.sarif

.github/workflows/tpetra_muelu_label_to_project.yml

@@ -44,11 +44,11 @@ jobs:
       uses: srggrs/assign-one-project-github-action@65a8ddab497df42ef268001e67bbf976f8fd39e1 # 1.3.1
       if: contains(github.event.label.name, 'MueLu') || contains(github.event.issue.title, 'MueLu')
       with:
-        project: 'https://github.com/trilinos/Trilinos/projects/5'
+        project: 'https://github.com/orgs/trilinos/projects/8'
         column_name: 'Backlog'
     - name: Add to Tpetra Project
       uses: srggrs/assign-one-project-github-action@65a8ddab497df42ef268001e67bbf976f8fd39e1 # 1.3.1
       if: contains(github.event.label.name, 'Tpetra') || contains(github.event.issue.title, 'Tpetra')
       with:
-        project: 'https://github.com/trilinos/Trilinos/projects/2'
+        project: 'https://github.com/orgs/trilinos/projects/9'
         column_name: 'Needs Triage'

CMakeLists.txt

@@ -17,6 +17,8 @@ PROJECT(${PROJECT_NAME} NONE)
 # Set up to use ccache
 include("${CMAKE_CURRENT_LIST_DIR}/cmake/UseCCache.cmake")
 
+set(DEPRECATED_PACKAGES Amesos AztecOO Epetra EpetraExt Ifpack Intrepid Isorropia ML NewPackage Pliris PyTrilinos ShyLU_DDCore ThyraEpetraAdapters ThyraEpetraExtAdapters Triutils)
+
 # Set an env so we know we are in configure
 set(ENV{CMAKE_IS_IN_CONFIGURE_MODE} 1)
 
@@ -56,9 +58,8 @@ IF(${PROJECT_NAME}_ENABLE_YouCompleteMe)
   INCLUDE(CodeCompletion)
 ENDIF()
 
-set(deprecated_packages Amesos AztecOO Epetra EpetraExt Ifpack Intrepid Isorropia ML NewPackage Pliris PyTrilinos ShyLU_DDCore ThyraEpetraAdapters ThyraEpetraExtAdapters Triutils)
 set(enabled_deprecated_packages "")
-FOREACH(package ${deprecated_packages})
+FOREACH(package ${DEPRECATED_PACKAGES})
   IF(Trilinos_ENABLE_${package})
     set(enabled_deprecated_packages ${package} ${enabled_deprecated_packages})
   ENDIF()

RELEASE_NOTES

@@ -1,7 +1,55 @@
 
 ###############################################################################
 #                                                                             #
-# Trilinos Release 16.0 Release Notes                      TBD May/June, 2024 #
+# Trilinos Release 16.1 Release Notes                               TBD, 2024 #
+#                                                                             #
+###############################################################################
+
+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.
+
+
+Framework
+
+  - Added option `Trilinos_WARNINGS_MODE` that can control warnings useful
+    for development.  There is a list of warnings in
+    `cmake/WarningsErrorsPolicy.cmake` that can be applied as warnings or
+    errors by passing the `WARN` or `ERROR` value for that variable.  Turning
+    either of those settings on will also turn on a set of 'promoted' warnings
+    that will always be errors in any mode other than the default.  The Pull
+    Request testing will currently use the `WARN` setting for this mode,
+    meaning that any 'upcoming' warnings will show up as warnings, and any
+    'promoted' warnings will show up as errors.  You can also pass additional
+    'upcoming' warnings via the `Trilinos_ADDITIONAL_WARNINGS` option.  Lastly,
+    if either of these modes are enabled, all warnings are disabled for any
+    deprecated packages, in the interest of not spending effort cleaning them.
+    By default, no warnings or errors are added.
+
+
+###############################################################################
+#                                                                             #
+# Trilinos Release 16.0 Release Notes                           July 22, 2024 #
 #                                                                             #
 ###############################################################################
 

cmake/ProjectCompilerPostConfig.cmake

@@ -1,5 +1,29 @@
 tribits_get_package_enable_status(Kokkos  KokkosEnable "")
 
+macro(disable_warnings_for_deprecated_packages)
+    message(STATUS "Disabling all warnings/errors for deprecated packages")
+    foreach(package ${DEPRECATED_PACKAGES})
+        set(${package}_CXX_FLAGS "-w ${${package}_CXX_FLAGS}")
+    endforeach()
+endmacro()
+
+
+macro(enable_warnings warnings)
+    message(STATUS "Trilinos warnings enabled: ${warnings}")
+    foreach(warning ${warnings})
+        set(CMAKE_CXX_FLAGS "-W${warning} -Wno-error=${warning} ${CMAKE_CXX_FLAGS}")
+    endforeach()
+endmacro()
+
+
+macro(enable_errors errors)
+    message(STATUS "Trilinos warnings-as-errors enabled: ${errors}")
+    foreach(error ${errors})
+        set(CMAKE_CXX_FLAGS "-Werror=${error} ${CMAKE_CXX_FLAGS}")
+    endforeach()
+endmacro()
+
+
 IF (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
   MESSAGE("-- " "Adding '-fp-model=precise' to C++ compiler flags because Trilinos needs it when using the Intel OneAPI C++ compiler.")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fp-model=precise")
@@ -17,3 +41,15 @@ IF (KokkosEnable)
   # NOTE: Setting TRILINOS_TOPLEVEL_CXX_FLAGS only has any impact if Kokkos is
   # being treated as an internal package.
 ENDIF()
+
+set(upcoming_warnings shadow ${Trilinos_ADDITIONAL_WARNINGS})
+set(promoted_warnings parentheses sign-compare unused-variable)
+
+if("${Trilinos_WARNINGS_MODE}" STREQUAL "WARN")
+    enable_warnings("${upcoming_warnings}")
+    enable_errors("${promoted_warnings}")
+    disable_warnings_for_deprecated_packages()
+elseif("${Trilinos_WARNINGS_MODE}" STREQUAL "ERROR")
+    enable_errors("${promoted_warnings};${upcoming_warnings}")
+    disable_warnings_for_deprecated_packages()
+endif()

cmake/SimpleTesting/cmake/ctest-cdash-setup.cmake

@@ -120,9 +120,18 @@ string(SUBSTRING ${build_stamp_tmp} 1 1024 build_stamp)
 generate_build_url1(build_url1 ${CTEST_DROP_SITE} ${URL_location} ${CTEST_PROJECT_NAME} ${CTEST_BUILD_NAME} ${build_stamp} ${machine_name})
 generate_build_url2(build_url2 ${CTEST_DROP_SITE} ${URL_location} ${CTEST_PROJECT_NAME} ${CTEST_BUILD_NAME} ${build_stamp})
 generate_build_url3(build_url3 ${CTEST_DROP_SITE} ${URL_location} ${CTEST_PROJECT_NAME} ${CTEST_BUILD_NAME} ${build_stamp})
+generate_build_url4(build_url4 ${CTEST_DROP_SITE} ${URL_location} ${CTEST_PROJECT_NAME} ${PULLREQUESTNUM})
 message(">>> CDash URL1 = ${build_url1}")
 message(">>> CDash URL2 = ${build_url2}")
 message(">>> CDash URL3 = ${build_url3}")
+message(">>> CDash URL4 = ${build_url4}")
+
+if (EXISTS /home/runner/)
+    # Write the URL into the filesystem so AT2 can read it later
+    message(">>> Writing URLs to /home/runner/AT2_URL.txt and AT2_ALL_BUILDS.txt")
+    file(WRITE /home/runner/AT2_URL.txt ${build_url3})
+    file(WRITE /home/runner/AT2_ALL_BUILDS.txt ${build_url4})
+endif()
 
 # -----------------------------------------------------------
 # -- Optionally update the repository

cmake/SimpleTesting/cmake/ctest-functions.cmake

@@ -194,6 +194,21 @@ function(generate_build_url3 url_output cdash_site cdash_location project_name b
 endfunction()
 
 
+# generate_build_url4 generates a link to view all builds for a particular PR
+function(generate_build_url4 url_output cdash_site cdash_location project_name pr_num)
+    banner("generate_build_url4() START")
+    message(">>> cdash_site    : ${cdash_site}")
+    message(">>> cdash_location: ${cdash_location}")
+    message(">>> project_name  : ${project_name}")
+    message(">>> pr_num        : ${pr_num}")
+    string(REPLACE " " "%20" url_output_tmp
+        "https://${cdash_site}${cdash_location}index.php?project=${project_name}&display=project&begin=2024-01-01&end=now&filtercount=1&showfilters=1&field1=buildname&compare1=65&value1=PR-${pr_num}"
+    )
+    set(${url_output} ${url_output_tmp} PARENT_SCOPE)
+    banner("generate_build_url4() FINISH")
+endfunction()
+
+
 message("+--------------------------------------+")
 message("| ctest-functions.cmake FINISH         |")
 message("+--------------------------------------+")