Merge Pull Request trilinos#13432 from trilinos/Trilinos/master_merge…

…_20240906_175822 Automatically Merged using Trilinos Master Merge AutoTester PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20240906_175822 branch to master' PR Author: trilinos-autotester
jennloe · Sep 7, 2024 · b895aa6 · b895aa6
2 parents b40a3bc + 869d1df
commit b895aa6
Show file tree

Hide file tree

Showing 203 changed files with 4,913 additions and 2,971 deletions.
diff --git a/.github/workflows/AT2.yml b/.github/workflows/AT2.yml
@@ -13,13 +13,27 @@ on:
     - develop
   workflow_dispatch:
 
+# actions: write needed by skip-duplicate-actions
 permissions:
+  actions: write
   contents: read
 
 jobs:
+  # Jobs depend on the output of pre-checks to run
+  pre-checks:
+        runs-on: ubuntu-latest
+        outputs:
+            should_skip: ${{ steps.skip_check.outputs.should_skip }}
+        steps:
+        - id: skip_check
+          uses: fkirc/skip-duplicate-actions@v5
+          with:
+            skip_after_successful_duplicate: 'true'
+
   gcc10-openmpi416-EXPERIMENTAL:
+    needs: pre-checks
     runs-on: [self-hosted, gcc-10.3.0_openmpi-4.1.6]
-    if: ${{ github.event.action == 'synchronize' || github.event.action == 'opened' || github.event.review.state == 'APPROVED' }}
+    if: ${{ needs.pre-checks.outputs.should_skip != 'true' && (github.event.action == 'synchronize' || github.event.action == 'opened' || github.event.review.state == 'APPROVED') }}
     steps:
       - name: env
         env:
@@ -71,19 +85,14 @@ jobs:
           export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/packages/framework/GenConfig
           export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/packages/framework/pr_tools
 
-          sed -i "/\[rhel8\]/a `cat /etc/hostname`" /home/runner/_work/Trilinos/Trilinos/packages/framework/ini-files/supported-systems.ini
           printf "\n\n\n"
 
           echo "image: ${AT2_IMAGE:-unknown}"
 
           python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/PullRequestLinuxDriverTest.py \
-            --source-repo-url ${GITHUB_WORKSPACE} \
-            --target-repo-url ${GITHUB_WORKSPACE} \
             --target-branch-name ${{ github.event.pull_request.base.ref }} \
-            --pullrequest-build-name PR-${{ github.event.pull_request.number }} \
             --genconfig-build-name rhel8_gcc-openmpi_debug_shared_no-kokkos-arch_no-asan_complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables \
             --pullrequest-number ${{ github.event.pull_request.number }} \
-            --jenkins-job-number 0 \
             --pullrequest-env-config-file ${GITHUB_WORKSPACE}/packages/framework/pr_tools/trilinos_pr.ini \
             --pullrequest-gen-config-file ${GITHUB_WORKSPACE}/packages/framework/GenConfig/src/gen-config.ini \
             --workspace-dir /home/runner/_work/Trilinos \
@@ -96,8 +105,9 @@ jobs:
             --filename-packageenables ./packageEnables.cmake
 
   gcc830-serial-EXPERIMENTAL:
+    needs: pre-checks
     runs-on: [self-hosted, gcc-8.3.0_serial]
-    if: ${{ github.event.action == 'synchronize' || github.event.action == 'opened' || github.event.review.state == 'APPROVED' }}
+    if: ${{ needs.pre-checks.outputs.should_skip != 'true' && (github.event.action == 'synchronize' || github.event.action == 'opened' || github.event.review.state == 'APPROVED') }}
     steps:
       - name: env
         env:
@@ -149,19 +159,14 @@ jobs:
           export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/packages/framework/GenConfig
           export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/packages/framework/pr_tools
 
-          sed -i "/\[rhel8\]/a `cat /etc/hostname`" /home/runner/_work/Trilinos/Trilinos/packages/framework/ini-files/supported-systems.ini
           printf "\n\n\n"
 
           echo "image: ${AT2_IMAGE:-unknown}"
 
           python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/PullRequestLinuxDriverTest.py \
-            --source-repo-url ${GITHUB_WORKSPACE} \
-            --target-repo-url ${GITHUB_WORKSPACE} \
             --target-branch-name ${{ github.event.pull_request.base.ref }} \
-            --pullrequest-build-name PR-${{ github.event.pull_request.number }} \
             --genconfig-build-name rhel8_gcc-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_no-mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables \
             --pullrequest-number ${{ github.event.pull_request.number }} \
-            --jenkins-job-number 0 \
             --pullrequest-env-config-file ${GITHUB_WORKSPACE}/packages/framework/pr_tools/trilinos_pr.ini \
             --pullrequest-gen-config-file ${GITHUB_WORKSPACE}/packages/framework/GenConfig/src/gen-config.ini \
             --workspace-dir /home/runner/_work/Trilinos \
@@ -174,8 +179,9 @@ jobs:
             --filename-packageenables ./packageEnables.cmake
 
   cuda11-uvm-EXPERIMENTAL:
+    needs: pre-checks
     runs-on: [self-hosted, cuda-11.4.2_gcc-10.3.0_openmpi-4.1.6]
-    if: ${{ github.event.action == 'synchronize' || github.event.action == 'opened' || github.event.review.state == 'APPROVED' }}
+    if: ${{ needs.pre-checks.outputs.should_skip != 'true' && (github.event.action == 'synchronize' || github.event.action == 'opened' || github.event.review.state == 'APPROVED') }}
     steps:
       - name: env
         env:
@@ -226,19 +232,14 @@ jobs:
           export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/packages/framework/GenConfig
           export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/packages/framework/pr_tools
 
-          sed -i "/\[rhel8\]/a `cat /etc/hostname`" /home/runner/_work/Trilinos/Trilinos/packages/framework/ini-files/supported-systems.ini
           printf "\n\n\n"
 
           echo "image: ${AT2_IMAGE:-unknown}"
           type python
           python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/PullRequestLinuxDriverTest.py \
-            --source-repo-url ${GITHUB_WORKSPACE} \
-            --target-repo-url ${GITHUB_WORKSPACE} \
             --target-branch-name ${{ github.event.pull_request.base.ref }} \
-            --pullrequest-build-name PR-${{ github.event.pull_request.number }} \
             --genconfig-build-name rhel8_cuda-gcc-openmpi_release_static_Ampere80_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_no-package-enables \
             --pullrequest-number ${{ github.event.pull_request.number }} \
-            --jenkins-job-number 0 \
             --pullrequest-env-config-file ${GITHUB_WORKSPACE}/packages/framework/pr_tools/trilinos_pr.ini \
             --pullrequest-gen-config-file ${GITHUB_WORKSPACE}/packages/framework/GenConfig/src/gen-config.ini \
             --workspace-dir /home/runner/_work/Trilinos \

diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml
@@ -22,7 +22,7 @@ jobs:
     - run: git diff HEAD > format_patch.txt
     - run: if [ "$(cat format_patch.txt)" == "" ] ; then rm format_patch.txt ; else cat format_patch.txt; fi
 
-    - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
+    - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
       id: upload-artf
       if: ${{ hashFiles('format_patch.txt') != '' }}
       with:

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@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
+      uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
       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@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
+      uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -58,14 +58,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
+        uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
         with:
           sarif_file: results.sarif
diff --git a/packages/amesos2/src/Amesos2_Umfpack_FunctionMap.hpp b/packages/amesos2/src/Amesos2_Umfpack_FunctionMap.hpp
@@ -98,16 +98,16 @@ namespace Amesos2 {
 #ifdef HAVE_TEUCHOS_COMPLEX
 
   template <>
-  struct FunctionMap<Umfpack,std::complex<double>>
+  struct FunctionMap<Umfpack,Kokkos::complex<double>>
   {
-    typedef TypeMap<Umfpack,std::complex<double>> type_map;
+    typedef TypeMap<Umfpack,Kokkos::complex<double>> type_map;
 
     /**
      * \brief Binds to the appropriate Umfpack solver driver based on data type
      */
 
     static double * stdComplexToUmfpackDoubleConversion(
-    const std::complex<double> v [ ])
+    const Kokkos::complex<double> v [ ])
     {
       return (double*)(&v[0]);
     }
@@ -116,9 +116,9 @@ namespace Amesos2 {
     int sys,
     const int Ap [ ],
     const int Ai [ ],
-    const std::complex<double> Ax [ ],
-    std::complex<double> X [ ],
-    const std::complex<double> B [ ],
+    const Kokkos::complex<double> Ax [ ],
+    Kokkos::complex<double> X [ ],
+    const Kokkos::complex<double> B [ ],
     void *Numeric,
     const double Control [UMFPACK_CONTROL],
     double Info [UMFPACK_INFO])
@@ -133,7 +133,7 @@ namespace Amesos2 {
     static int umfpack_numeric(
     const int Ap [ ],
     const int Ai [ ],
-    const std::complex<double> Ax [ ],
+    const Kokkos::complex<double> Ax [ ],
     void *Symbolic,
     void **Numeric,
     const double Control[UMFPACK_CONTROL],
@@ -147,7 +147,7 @@ namespace Amesos2 {
     int n_col,
     const int Ap [ ],
     const int Ai [ ],
-    const std::complex<double> Ax [ ],
+    const Kokkos::complex<double> Ax [ ],
     void **Symbolic,
     const double Control [UMFPACK_CONTROL],
     double Info [UMFPACK_INFO])

diff --git a/packages/amesos2/src/Amesos2_Umfpack_TypeMap.hpp b/packages/amesos2/src/Amesos2_Umfpack_TypeMap.hpp
@@ -117,14 +117,14 @@ struct TypeMap<Umfpack,double>
 template <>
 struct TypeMap<Umfpack,std::complex<float> > // provide conversion from std::complex<float> to std::complex<double>
 {
-  typedef std::complex<double> type;
+  typedef Kokkos::complex<double> type;
   typedef double magnitude_type;
 };
 
 template <>
 struct TypeMap<Umfpack,std::complex<double> >
 {
-  typedef std::complex<double> type;
+  typedef Kokkos::complex<double> type;
   typedef double magnitude_type;
 };