belos: 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/belos/tpetra/src/BelosMultiVecTraits_Tpetra.hpp

@@ -21,7 +21,11 @@
 #include "Tpetra_Details_StaticView.hpp"
 #include "Teuchos_Array.hpp"
 #include "Teuchos_ScalarTraits.hpp"
+#if KOKKOS_VERSION > 40799
+#include "KokkosKernels_ArithTraits.hpp"
+#else
 #include "Kokkos_ArithTraits.hpp"
+#endif
 #include <map>
 #include <utility>
 #include <vector>
@@ -84,7 +88,11 @@ makeStaticLocalMultiVector (const MultiVectorType& gblMv,
     // them having been initialized.  ArithTraits lets us call nan()
     // even if the scalar type doesn't define it; it just returns some
     // undefined value in the latter case.
+#if KOKKOS_VERSION > 40799
+    const IST nan = KokkosKernels::ArithTraits<IST>::nan ();
+#else
     const IST nan = Kokkos::ArithTraits<IST>::nan ();
+#endif
     Kokkos::deep_copy (dv.view_device(), nan);
     Kokkos::deep_copy (dv.view_host(), nan);
   }

packages/belos/tpetra/src/solvers/Belos_Tpetra_Cg.hpp

@@ -46,9 +46,17 @@ class Cg: public Krylov <SC, MV, OP> {
     using std::endl;
     using dev_type = typename MV::device_type;
     using val_type = typename MV::dot_type;
+#if KOKKOS_VERSION > 40799
+    using ATS = KokkosKernels::ArithTraits<val_type>;
+#else
     using ATS = Kokkos::ArithTraits<val_type>;
+#endif
     using magnitude_type = typename ATS::mag_type;
+#if KOKKOS_VERSION > 40799
+    using ATM = KokkosKernels::ArithTraits<magnitude_type>;
+#else
     using ATM = Kokkos::ArithTraits<magnitude_type>;
+#endif
 
     const auto ONE  = ATS::one ();
 

packages/belos/tpetra/src/solvers/Belos_Tpetra_CgPipeline.hpp

@@ -46,9 +46,17 @@ class CgPipeline : public Krylov<SC, MV, OP> {
     using std::endl;
     using dev_type = typename MV::device_type;
     using val_type = typename MV::dot_type;
+#if KOKKOS_VERSION > 40799
+    using ATS = KokkosKernels::ArithTraits<val_type>;
+#else
     using ATS = Kokkos::ArithTraits<val_type>;
+#endif
     using magnitude_type = typename ATS::mag_type;
+#if KOKKOS_VERSION > 40799
+    using ATM = KokkosKernels::ArithTraits<magnitude_type>;
+#else
     using ATM = Kokkos::ArithTraits<magnitude_type>;
+#endif
 
     const auto ONE = ATS::one ();
 

packages/belos/tpetra/src/solvers/Belos_Tpetra_CgSingleReduce.hpp

@@ -45,9 +45,17 @@ class CgSingleReduce: public Krylov<SC, MV, OP> {
   {
     using std::endl;
     using dev_type = typename MV::device_type;
+#if KOKKOS_VERSION > 40799
+    using ATS = KokkosKernels::ArithTraits<SC>;
+#else
     using ATS = Kokkos::ArithTraits<SC>;
+#endif
     using magnitude_type = typename ATS::mag_type;
+#if KOKKOS_VERSION > 40799
+    using ATM = KokkosKernels::ArithTraits<magnitude_type>;
+#else
     using ATM = Kokkos::ArithTraits<magnitude_type>;
+#endif
     using dot_type = typename MV::dot_type;
 
     const SC ONE = ATS::one ();