Fix warnings

kokkos · Sep 26, 2022 · 7bd9420 · 7bd9420
1 parent 81c8e14
commit 7bd9420
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 29 deletions.
diff --git a/batched/sparse/impl/KokkosBatched_CG_TeamVector_Impl.hpp b/batched/sparse/impl/KokkosBatched_CG_TeamVector_Impl.hpp
@@ -75,13 +75,6 @@ KOKKOS_INLINE_FUNCTION int TeamVectorCG<MemberType>::invoke(
   const size_t maximum_iteration = handle.get_max_iteration();
   const MagnitudeType tolerance  = handle.get_tolerance();
 
-  using ScratchPadNormViewType = Kokkos::View<
-      MagnitudeType*,
-      typename VectorViewType::execution_space::scratch_memory_space>;
-  using ScratchPadVectorViewType = Kokkos::View<
-      typename VectorViewType::non_const_value_type**,
-      typename VectorViewType::array_layout,
-      typename VectorViewType::execution_space::scratch_memory_space>;
   using TeamVectorCopy1D = TeamVectorCopy<MemberType, Trans::NoTranspose, 1>;
 
   const OrdinalType numMatrices = _X.extent(0);

diff --git a/batched/sparse/impl/KokkosBatched_CG_Team_Impl.hpp b/batched/sparse/impl/KokkosBatched_CG_Team_Impl.hpp
@@ -73,13 +73,6 @@ KOKKOS_INLINE_FUNCTION int TeamCG<MemberType>::invoke(
   size_t maximum_iteration      = handle.get_max_iteration();
   const MagnitudeType tolerance = handle.get_tolerance();
 
-  using ScratchPadNormViewType = Kokkos::View<
-      MagnitudeType*,
-      typename VectorViewType::execution_space::scratch_memory_space>;
-  using ScratchPadVectorViewType = Kokkos::View<
-      typename VectorViewType::non_const_value_type**,
-      typename VectorViewType::array_layout,
-      typename VectorViewType::execution_space::scratch_memory_space>;
   using TeamCopy1D = TeamCopy<MemberType, Trans::NoTranspose, 1>;
 
   const OrdinalType numMatrices = _X.extent(0);

diff --git a/batched/sparse/impl/KokkosBatched_GMRES_TeamVector_Impl.hpp b/batched/sparse/impl/KokkosBatched_GMRES_TeamVector_Impl.hpp
@@ -78,10 +78,6 @@ KOKKOS_INLINE_FUNCTION int TeamVectorGMRES<MemberType>::invoke(
       typename VectorViewType::non_const_value_type>::mag_type MagnitudeType;
   typedef Kokkos::Details::ArithTraits<MagnitudeType> ATM;
 
-  using ScratchPadVectorViewType = Kokkos::View<
-      typename VectorViewType::non_const_value_type**,
-      typename VectorViewType::array_layout,
-      typename VectorViewType::execution_space::scratch_memory_space>;
   using TeamVectorCopy1D = TeamVectorCopy<MemberType, Trans::NoTranspose, 1>;
 
   const OrdinalType numMatrices = _X.extent(0);

diff --git a/batched/sparse/impl/KokkosBatched_GMRES_Team_Impl.hpp b/batched/sparse/impl/KokkosBatched_GMRES_Team_Impl.hpp
@@ -77,10 +77,6 @@ KOKKOS_INLINE_FUNCTION int TeamGMRES<MemberType>::invoke(
       typename VectorViewType::non_const_value_type>::mag_type MagnitudeType;
   typedef Kokkos::Details::ArithTraits<MagnitudeType> ATM;
 
-  using ScratchPadVectorViewType = Kokkos::View<
-      typename VectorViewType::non_const_value_type**,
-      typename VectorViewType::array_layout,
-      typename VectorViewType::execution_space::scratch_memory_space>;
   using TeamCopy1D = TeamCopy<MemberType, Trans::NoTranspose, 1>;
 
   const OrdinalType numMatrices = _X.extent(0);

diff --git a/batched/sparse/impl/KokkosBatched_Spmv_TeamVector_Impl.hpp b/batched/sparse/impl/KokkosBatched_Spmv_TeamVector_Impl.hpp
@@ -98,7 +98,7 @@ KOKKOS_INLINE_FUNCTION int TeamVectorSpmvInternal::invoke(
     const OrdinalType ys1) {
 #if !defined(__CUDA_ARCH__) && !defined(__HIP_DEVICE_COMPILE__)
   if (member.team_size() == 1) {
-    if (N_team != 0 && valuess0 == 1) {
+    if (N_team > 1 && valuess0 == 1) {
       /*
         Left layout as valuess0 = 1 and non-zero vector length given at
         compilation time. Here we use the SIMD data type which is using Intel

diff --git a/batched/sparse/src/KokkosBatched_Spmv.hpp b/batched/sparse/src/KokkosBatched_Spmv.hpp
@@ -216,7 +216,7 @@ struct TeamSpmv {
 ///
 
 template <typename MemberType, typename ArgTrans = Trans::NoTranspose,
-          unsigned N_team = 0>
+          unsigned N_team = 1>
 struct TeamVectorSpmv {
   template <typename ValuesViewType, typename IntView, typename xViewType,
             typename yViewType, typename alphaViewType, typename betaViewType,

diff --git a/batched/sparse/unit_test/Test_Batched_TeamVectorSpmv.hpp b/batched/sparse/unit_test/Test_Batched_TeamVectorSpmv.hpp
@@ -79,11 +79,10 @@ struct Functor_TestBatchedTeamVectorSpmv {
                               alphaViewType, betaViewType, dobeta>(
           member, alpha, d, _r, _c, x, beta, y);
     else
-      KokkosBatched::TeamVectorSpmv<
-          MemberType, typename ParamTagType::trans,
-          0>::template invoke<ValuesViewType, IntView, xViewType, yViewType,
-                              alphaViewType, betaViewType, dobeta>(
-          member, alpha, d, _r, _c, x, beta, y);
+      KokkosBatched::TeamVectorSpmv<MemberType, typename ParamTagType::trans>::
+          template invoke<ValuesViewType, IntView, xViewType, yViewType,
+                          alphaViewType, betaViewType, dobeta>(
+              member, alpha, d, _r, _c, x, beta, y);
   }
 
   inline void run() {