shylu: update ArithTraits namespace for KOKKOS_VERSION > 40799

Compatibility update corresponding to kokkos/kokkos-kernels#2771

Signed-off-by: Nathan Ellingwood <ndellin@sandia.gov>

Author: ndellingwood

packages/shylu/shylu_node/fastilu/src/shylu_fastic.hpp

@@ -54,8 +54,16 @@ class FastICPrec
 
         typedef Kokkos::RangePolicy<ExecSpace> RangePolicy;
 
+#if KOKKOS_VERSION > 40799
+        using STS = KokkosKernels::ArithTraits<Scalar>;
+#else
         using STS = Kokkos::ArithTraits<Scalar>;
+#endif
+#if KOKKOS_VERSION > 40799
+        using RTS = KokkosKernels::ArithTraits<Real>;
+#else
         using RTS = Kokkos::ArithTraits<Real>;
+#endif
 
     private:
         double computeTime;

packages/shylu/shylu_node/fastilu/src/shylu_fastildl.hpp

@@ -57,8 +57,16 @@ class FastILDLPrec
 
         typedef Kokkos::RangePolicy<ExecSpace> RangePolicy;
 
+#if KOKKOS_VERSION > 40799
+        using STS = KokkosKernels::ArithTraits<Scalar>;
+#else
         using STS = Kokkos::ArithTraits<Scalar>;
+#endif
+#if KOKKOS_VERSION > 40799
+        using RTS = KokkosKernels::ArithTraits<Real>;
+#else
         using RTS = Kokkos::ArithTraits<Real>;
+#endif
 
     private:
         double computeTime;
@@ -156,7 +164,11 @@ class FastILDLPrec
             blkSzILDL = blkSzILDL_;
             blkSz = blkSz_;
 
+#if KOKKOS_VERSION > 40799
+            const Scalar one = KokkosKernels::ArithTraits<Scalar>::one();
+#else
             const Scalar one = Kokkos::ArithTraits<Scalar>::one();
+#endif
             onesVector = ScalarArray("onesVector", nRow_);
             Kokkos::deep_copy(onesVector, one);
 
@@ -618,7 +630,11 @@ class FastILDLPrec
         void applyDiagonalScaling()
         {
             int anext = 0;
+#if KOKKOS_VERSION > 40799
+            const Real one = KokkosKernels::ArithTraits<Real>::one();
+#else
             const Real one = Kokkos::ArithTraits<Real>::one();
+#endif
             //First fill Aj and extract the diagonal scaling factors
             //Use diag array to store scaling factors since
             //it gets set to the correct value by findFactorPattern anyway.
@@ -659,7 +675,11 @@ class FastILDLPrec
 
         void applyManteuffelShift()
         {
+#if KOKKOS_VERSION > 40799
+            const Scalar one = KokkosKernels::ArithTraits<Scalar>::one();
+#else
             const Scalar one = Kokkos::ArithTraits<Scalar>::one();
+#endif
             //Scalar shift = 0.05;
             for (Ordinal i = 0; i < nRows; i++)
             {
@@ -759,7 +779,11 @@ class FastILDLPrec
 
         void compute()
         {
+#if KOKKOS_VERSION > 40799
+            const Scalar one = KokkosKernels::ArithTraits<Scalar>::one();
+#else
             const Scalar one = Kokkos::ArithTraits<Scalar>::one();
+#endif
             if((level > 0) && (guessFlag != 0))
             {
                 initGuessPrec->compute();
@@ -953,8 +977,16 @@ class FastILDLFunctor
         KOKKOS_INLINE_FUNCTION
             void operator()(const Ordinal blk_index) const
             {
+#if KOKKOS_VERSION > 40799
+                const Scalar zero = KokkosKernels::ArithTraits<Scalar>::zero();
+#else
                 const Scalar zero = Kokkos::ArithTraits<Scalar>::zero();
+#endif
+#if KOKKOS_VERSION > 40799
+                const Scalar one = KokkosKernels::ArithTraits<Scalar>::one();
+#else
                 const Scalar one = Kokkos::ArithTraits<Scalar>::one();
+#endif
 
                 Ordinal start = blk_index * blk_size;
                 Ordinal end = start + blk_size;

packages/shylu/shylu_node/fastilu/src/shylu_fastilu.hpp

@@ -64,7 +64,11 @@ void unfill_crs(View1& row_ptrs, View2& cols, View3& values)
 {
   using Scalar = typename View3::non_const_value_type;
   using Ordinal = typename View1::non_const_value_type;
+#if KOKKOS_VERSION > 40799
+  using STS = KokkosKernels::ArithTraits<Scalar>;
+#else
   using STS = Kokkos::ArithTraits<Scalar>;
+#endif
   const Scalar zero = STS::zero();
 
   const auto nrows = row_ptrs.size() - 1;
@@ -262,8 +266,16 @@ class FastILUPrec
         typedef typename OrdinalArray::host_mirror_type OrdinalArrayMirror;
         typedef typename ScalarArray::host_mirror_type  ScalarArrayMirror;
 
+#if KOKKOS_VERSION > 40799
+        using STS = KokkosKernels::ArithTraits<Scalar>;
+#else
         using STS = Kokkos::ArithTraits<Scalar>;
+#endif
+#if KOKKOS_VERSION > 40799
+        using RTS = KokkosKernels::ArithTraits<Real>;
+#else
         using RTS = Kokkos::ArithTraits<Real>;
+#endif
 
   template <typename T>
   struct IdentityFunctor
@@ -2256,7 +2268,11 @@ class FastICFunctor
         typedef Kokkos::View<Ordinal *, ExecSpace> ordinal_array_type;
         typedef Kokkos::View<Scalar *, ExecSpace> scalar_array_type;
 
+#if KOKKOS_VERSION > 40799
+        using STS = KokkosKernels::ArithTraits<Scalar>;
+#else
         using STS = Kokkos::ArithTraits<Scalar>;
+#endif
 
         FastICFunctor (Ordinal nNZ, Ordinal bs, ordinal_array_type Ap, ordinal_array_type Ai,
                 ordinal_array_type Aj, scalar_array_type Ax, ordinal_array_type Lp,
@@ -2436,7 +2452,11 @@ class FastILUFunctor
         typedef Kokkos::View<Ordinal *, ExecSpace> ordinal_array_type;
         typedef Kokkos::View<Scalar *, ExecSpace> scalar_array_type;
 
+#if KOKKOS_VERSION > 40799
+        using STS = KokkosKernels::ArithTraits<Scalar>;
+#else
         using STS = Kokkos::ArithTraits<Scalar>;
+#endif
 
         FastILUFunctor (Ordinal nNZ, Ordinal bs,
                 ordinal_array_type Ap, ordinal_array_type Ai, ordinal_array_type Aj, scalar_array_type Ax,

packages/shylu/shylu_node/hts/src/shylu_hts_impl_def.hpp

@@ -53,8 +53,12 @@ inline int omp_get_thread_num () { return 0; }
 #endif
 
 #ifdef HAVE_SHYLU_NODEHTS_KOKKOSKERNELS
+#if KOKKOS_VERSION > 40799
+# include <KokkosKernels_ArithTraits.hpp>
+#else
 # include <Kokkos_ArithTraits.hpp>
 #endif
+#endif
 
 #include "shylu_hts_impl.hpp"
 
@@ -1177,7 +1181,11 @@ Int partition_ir (const Int n, const Size* const ir, const Int nparts,
 
 template <typename T> inline T& conjugate (T& v) {
 #ifdef HAVE_SHYLU_NODEHTS_KOKKOSKERNELS
+#if KOKKOS_VERSION > 40799
+  v = KokkosKernels::ArithTraits<T>::conj(v);
+#else
   v = Kokkos::ArithTraits<T>::conj(v);
+#endif
 #else
   v = T(v.real(), -v.imag());
 #endif