Merge branch 'develop' into ifpack2-riluk-kkspiluk-kksptrsv-use-strea…

…ms-rcm
vqd8a · Mar 14, 2024 · acc252a · acc252a
2 parents 4e21402 + 38999ab
commit acc252a
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 14 deletions.
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -24,4 +24,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@0efb1d1d84fc9633afcdaad14c485cbbc90ef46c # v2.5.1
+        uses: actions/dependency-review-action@9129d7d40b8c12c1ed0f60400d00c92d437adcce # v4.1.3
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@99c53751e09b9529366343771cc321ec74e9bd3d # v2.0.6
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
         with:
           results_file: results.sarif
           results_format: sarif

diff --git a/.github/workflows/tpetra_muelu_label_to_project.yml b/.github/workflows/tpetra_muelu_label_to_project.yml
@@ -41,13 +41,13 @@ jobs:
             labels: ["pkg: Tpetra"]
           })          
     - name: Add to MueLu Project
-      uses: srggrs/assign-one-project-github-action@37de3321023f8c12ea85372d748ab2017b995bfd # 1.3.0
+      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'
         column_name: 'Backlog'
     - name: Add to Tpetra Project
-      uses: srggrs/assign-one-project-github-action@37de3321023f8c12ea85372d748ab2017b995bfd # 1.3.0    
+      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'

diff --git a/packages/stokhos/src/sacado/kokkos/pce/linalg/Kokkos_CrsMatrix_UQ_PCE.hpp b/packages/stokhos/src/sacado/kokkos/pce/linalg/Kokkos_CrsMatrix_UQ_PCE.hpp
@@ -1470,6 +1470,9 @@ namespace KokkosSparse {
 template <
 #if KOKKOSKERNELS_VERSION >= 40199
           typename ExecutionSpace,
+#endif
+#if KOKKOSKERNELS_VERSION >= 40299
+          typename Handle,
 #endif
           typename AlphaType,
           typename BetaType,
@@ -1481,19 +1484,30 @@ template <
 typename std::enable_if<
   Kokkos::is_view_uq_pce< Kokkos::View< InputType, InputP... > >::value &&
   Kokkos::is_view_uq_pce< Kokkos::View< OutputType, OutputP... > >::value
+#if KOKKOSKERNELS_VERSION >= 40299
+  && KokkosSparse::is_crs_matrix_v<MatrixType>
+  && (Kokkos::View< OutputType, OutputP... >::rank() == 1)
+#endif
   >::type
 spmv(
 #if KOKKOSKERNELS_VERSION >= 40199
   const ExecutionSpace& space,
 #endif
+#if KOKKOSKERNELS_VERSION < 40299
   KokkosKernels::Experimental::Controls,
+#else
+  Handle* handle,
+#endif
   const char mode[],
   const AlphaType& a,
   const MatrixType& A,
   const Kokkos::View< InputType, InputP... >& x,
   const BetaType& b,
-  const Kokkos::View< OutputType, OutputP... >& y,
-  const RANK_ONE)
+  const Kokkos::View< OutputType, OutputP... >& y
+#if KOKKOSKERNELS_VERSION < 40299
+  , const RANK_ONE
+#endif
+  )
 {
   typedef Kokkos::View< OutputType, OutputP... > OutputVectorType;
   typedef Kokkos::View< InputType, InputP... > InputVectorType;
@@ -1531,6 +1545,9 @@ spmv(
 template <
 #if KOKKOSKERNELS_VERSION >= 40199
           typename ExecutionSpace,
+#endif
+#if KOKKOSKERNELS_VERSION >= 40299
+          typename Handle,
 #endif
           typename AlphaType,
           typename BetaType,
@@ -1542,19 +1559,30 @@ template <
 typename std::enable_if<
   Kokkos::is_view_uq_pce< Kokkos::View< InputType, InputP... > >::value &&
   Kokkos::is_view_uq_pce< Kokkos::View< OutputType, OutputP... > >::value
+#if KOKKOSKERNELS_VERSION >= 40299
+  && KokkosSparse::is_crs_matrix_v<MatrixType>
+  && (Kokkos::View< OutputType, OutputP... >::rank() == 2)
+#endif
   >::type
 spmv(
 #if KOKKOSKERNELS_VERSION >= 40199
   const ExecutionSpace& space,
 #endif
+#if KOKKOSKERNELS_VERSION < 40299
   KokkosKernels::Experimental::Controls,
+#else
+  Handle* handle,
+#endif
   const char mode[],
   const AlphaType& a,
   const MatrixType& A,
   const Kokkos::View< InputType, InputP... >& x,
   const BetaType& b,
-  const Kokkos::View< OutputType, OutputP... >& y,
-  const RANK_TWO)
+  const Kokkos::View< OutputType, OutputP... >& y
+#if KOKKOSKERNELS_VERSION < 40299
+  , const RANK_TWO
+#endif
+  )
 {
 #if KOKKOSKERNELS_VERSION >= 40199
   if(space != ExecutionSpace()) {
@@ -1569,7 +1597,9 @@ spmv(
   if (y.extent(1) == 1) {
     auto y_1D = subview(y, Kokkos::ALL(), 0);
     auto x_1D = subview(x, Kokkos::ALL(), 0);
-#if KOKKOSKERNELS_VERSION >= 40199
+#if KOKKOSKERNELS_VERSION >= 40299
+    spmv(space, handle, mode, a, A, x_1D, b, y_1D);
+#elif (KOKKOSKERNELS_VERSION < 40299) && (KOKKOSKERNELS_VERSION >= 40199)
     spmv(space, KokkosKernels::Experimental::Controls(), mode, a, A, x_1D, b, y_1D, RANK_ONE());
 #else
     spmv(KokkosKernels::Experimental::Controls(), mode, a, A, x_1D, b, y_1D, RANK_ONE());

diff --git a/packages/stokhos/src/sacado/kokkos/vector/linalg/Kokkos_CrsMatrix_MP_Vector.hpp b/packages/stokhos/src/sacado/kokkos/vector/linalg/Kokkos_CrsMatrix_MP_Vector.hpp
@@ -532,6 +532,9 @@ namespace KokkosSparse {
 template <
 #if KOKKOSKERNELS_VERSION >= 40199
           typename ExecutionSpace,
+#endif
+#if KOKKOSKERNELS_VERSION >= 40299
+          typename Handle,
 #endif
           typename AlphaType,
           typename BetaType,
@@ -543,19 +546,30 @@ template <
 typename std::enable_if<
   Kokkos::is_view_mp_vector< Kokkos::View< InputType, InputP... > >::value &&
   Kokkos::is_view_mp_vector< Kokkos::View< OutputType, OutputP... > >::value
+#if KOKKOSKERNELS_VERSION >= 40299
+  && KokkosSparse::is_crs_matrix_v<MatrixType>
+  && (Kokkos::View< OutputType, OutputP... >::rank() == 1)
+#endif
   >::type
 spmv(
 #if KOKKOSKERNELS_VERSION >= 40199
   const ExecutionSpace& space,
 #endif
+#if KOKKOSKERNELS_VERSION < 40299
   KokkosKernels::Experimental::Controls,
+#else
+  Handle* handle,
+#endif
   const char mode[],
   const AlphaType& a,
   const MatrixType& A,
   const Kokkos::View< InputType, InputP... >& x,
   const BetaType& b,
-  const Kokkos::View< OutputType, OutputP... >& y,
-  const RANK_ONE)
+  const Kokkos::View< OutputType, OutputP... >& y
+#if KOKKOSKERNELS_VERSION < 40299
+  , const RANK_ONE
+#endif
+)
 {
   typedef Kokkos::View< OutputType, OutputP... > OutputVectorType;
   typedef Kokkos::View< InputType, InputP... > InputVectorType;
@@ -629,6 +643,9 @@ spmv(
 template <
 #if KOKKOSKERNELS_VERSION >= 40199
           typename ExecutionSpace,
+#endif
+#if KOKKOSKERNELS_VERSION >= 40299
+          typename Handle,
 #endif
           typename AlphaType,
           typename BetaType,
@@ -640,19 +657,30 @@ template <
 typename std::enable_if<
   Kokkos::is_view_mp_vector< Kokkos::View< InputType, InputP... > >::value &&
   Kokkos::is_view_mp_vector< Kokkos::View< OutputType, OutputP... > >::value
+#if KOKKOSKERNELS_VERSION >= 40299
+  && KokkosSparse::is_crs_matrix_v<MatrixType>
+  && (Kokkos::View< OutputType, OutputP... >::rank() == 2)
+#endif
   >::type
 spmv(
 #if KOKKOSKERNELS_VERSION >= 40199
   const ExecutionSpace& space,
 #endif
+#if KOKKOSKERNELS_VERSION < 40299
   KokkosKernels::Experimental::Controls,
+#else
+  Handle* handle,
+#endif
   const char mode[],
   const AlphaType& a,
   const MatrixType& A,
   const Kokkos::View< InputType, InputP... >& x,
   const BetaType& b,
-  const Kokkos::View< OutputType, OutputP... >& y,
-  const RANK_TWO)
+  const Kokkos::View< OutputType, OutputP... >& y
+#if KOKKOSKERNELS_VERSION < 40299
+  , const RANK_TWO
+#endif
+  )
 {
 #if KOKKOSKERNELS_VERSION >= 40199
   if(space != ExecutionSpace()) {
@@ -667,7 +695,9 @@ spmv(
   if (y.extent(1) == 1) {
     auto y_1D = subview(y, Kokkos::ALL(), 0);
     auto x_1D = subview(x, Kokkos::ALL(), 0);
-#if KOKKOSKERNELS_VERSION >= 40199
+#if KOKKOSKERNELS_VERSION >= 40299
+    spmv(space, handle, mode, a, A, x_1D, b, y_1D);
+#elif (KOKKOSKERNELS_VERSION < 40299) && (KOKKOSKERNELS_VERSION >= 40199)
     spmv(space, KokkosKernels::Experimental::Controls(), mode, a, A, x_1D, b, y_1D, RANK_ONE());
 #else
     spmv(KokkosKernels::Experimental::Controls(), mode, a, A, x_1D, b, y_1D, RANK_ONE());