xpetra: 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/xpetra/src/CrsMatrix/Xpetra_CrsMatrix.hpp

@@ -273,7 +273,11 @@ class CrsMatrix
   //! @name Xpetra-specific routines
   //@{
 #ifdef HAVE_XPETRA_TPETRA
+#if KOKKOS_VERSION > 40799
+  using impl_scalar_type = typename KokkosKernels::ArithTraits<Scalar>::val_type;
+#else
   using impl_scalar_type = typename Kokkos::ArithTraits<Scalar>::val_type;
+#endif
   using execution_space  = typename node_type::device_type;
 
   // that is the local_graph_type in Tpetra::CrsGraph...

packages/xpetra/src/MultiVector/Xpetra_MultiVector_decl.hpp

@@ -23,7 +23,11 @@
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_DualView.hpp>
+#if KOKKOS_VERSION > 40799
+#include <KokkosKernels_ArithTraits.hpp>
+#else
 #include <Kokkos_ArithTraits.hpp>
+#endif
 
 namespace Xpetra {
 
@@ -231,7 +235,11 @@ class MultiVector
   //! Set multi-vector values to random numbers. XPetra implementation
   virtual void Xpetra_randomize(const Scalar& minVal, const Scalar& maxVal);
 
+#if KOKKOS_VERSION > 40799
+  using impl_scalar_type     = typename KokkosKernels::ArithTraits<Scalar>::val_type;
+#else
   using impl_scalar_type     = typename Kokkos::ArithTraits<Scalar>::val_type;
+#endif
   using dual_view_type       = Kokkos::DualView<impl_scalar_type**, Kokkos::LayoutStride, typename node_type::device_type, Kokkos::MemoryUnmanaged>;
   using dual_view_type_const = Kokkos::DualView<const impl_scalar_type**, Kokkos::LayoutStride, typename node_type::device_type, Kokkos::MemoryUnmanaged>;
   using host_execution_space = typename dual_view_type::host_mirror_space;

packages/xpetra/src/Utils/Xpetra_MatrixUtils_def.hpp

@@ -421,8 +421,16 @@ void MatrixUtils<Scalar, LocalOrdinal, GlobalOrdinal, Node>::CheckRepairMainDiag
 
         auto lclA = tpCrsAc->getTpetra_CrsMatrix()->getLocalMatrixDevice();
 
+#if KOKKOS_VERSION > 40799
+        using ATS      = KokkosKernels::ArithTraits<Scalar>;
+#else
         using ATS      = Kokkos::ArithTraits<Scalar>;
+#endif
+#if KOKKOS_VERSION > 40799
+        using impl_ATS = KokkosKernels::ArithTraits<typename ATS::val_type>;
+#else
         using impl_ATS = Kokkos::ArithTraits<typename ATS::val_type>;
+#endif
 
         LO lZeroDiags                                = 0;
         typename ATS::val_type impl_replacementValue = replacementValue;
@@ -451,8 +459,16 @@ void MatrixUtils<Scalar, LocalOrdinal, GlobalOrdinal, Node>::CheckRepairMainDiag
 
       auto lclA = tpCrsAc->getTpetra_CrsMatrix()->getLocalMatrixDevice();
 
+#if KOKKOS_VERSION > 40799
+      using ATS      = KokkosKernels::ArithTraits<Scalar>;
+#else
       using ATS      = Kokkos::ArithTraits<Scalar>;
+#endif
+#if KOKKOS_VERSION > 40799
+      using impl_ATS = KokkosKernels::ArithTraits<typename ATS::val_type>;
+#else
       using impl_ATS = Kokkos::ArithTraits<typename ATS::val_type>;
+#endif
 
       LO lZeroDiags = 0;