amesos2: 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/amesos2/src/Amesos2_SolverCore_def.hpp

@@ -19,7 +19,11 @@
 #ifndef AMESOS2_SOLVERCORE_DEF_HPP
 #define AMESOS2_SOLVERCORE_DEF_HPP
 
+#if KOKKOS_VERSION > 40799
+#include "KokkosKernels_ArithTraits.hpp"
+#else
 #include "Kokkos_ArithTraits.hpp"
+#endif
 
 #include "Amesos2_MatrixAdapter_def.hpp"
 #include "Amesos2_MultiVecAdapter_def.hpp"
@@ -238,7 +242,11 @@ SolverCore<ConcreteSolver,Matrix,Vector>::solve_ir(const Teuchos::Ptr<      Vect
                                                    const int maxNumIters,
                                                    const bool verbose) const
 {
+#if KOKKOS_VERSION > 40799
+  using KAT              = KokkosKernels::ArithTraits<scalar_type>;
+#else
   using KAT              = Kokkos::ArithTraits<scalar_type>;
+#endif
   using impl_scalar_type = typename KAT::val_type;
   using magni_type       = typename KAT::mag_type;
   using host_execution_space = Kokkos::DefaultHostExecutionSpace;

packages/amesos2/src/Amesos2_Util.hpp

@@ -394,7 +394,11 @@ namespace Amesos2 {
                          EStorage_Ordering ordering)
       {
         typedef typename M::global_ordinal_t mat_go_t;
+#if KOKKOS_VERSION > 40799
+        typedef typename KokkosKernels::ArithTraits<typename M::scalar_t>::val_type mat_scalar_t;
+#else
         typedef typename Kokkos::ArithTraits<typename M::scalar_t>::val_type mat_scalar_t;
+#endif
         typedef typename Kokkos::View<mat_scalar_t*, Kokkos::HostSpace> KV_TMP;
         size_t i, size = nzvals.extent(0);
         KV_TMP nzvals_tmp(Kokkos::ViewAllocateWithoutInitializing("nzvals_tmp"), size);