trilinoscouplings: 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/trilinoscouplings/examples/fenl/BelosSolve.hpp

@@ -18,7 +18,11 @@
 #define KOKKOS_EXAMPLE_BELOS_SOLVE
 
 // Tpetra
+#if KOKKOS_VERSION > 40799
+#include "KokkosKernels_ArithTraits.hpp"
+#else
 #include "Kokkos_ArithTraits.hpp"
+#endif
 #include "Tpetra_MultiVector.hpp"
 #include "Tpetra_CrsMatrix.hpp"
 
@@ -97,8 +101,16 @@ belos_solve(
   const int use_mean_based,
   const Teuchos::RCP<Teuchos::ParameterList>& fenlParams,
   const unsigned max_iter = 200,
+#if KOKKOS_VERSION > 40799
+  const typename KokkosKernels::ArithTraits<SV>::mag_type tolerance =
+#else
   const typename Kokkos::ArithTraits<SV>::mag_type tolerance =
+#endif
+#if KOKKOS_VERSION > 40799
+    KokkosKernels::ArithTraits<SV>::epsilon())
+#else
     Kokkos::ArithTraits<SV>::epsilon())
+#endif
 {
   typedef Tpetra::Operator<SM,LO,GO,N> OperatorType;
   typedef Tpetra::MultiVector<SV,LO,GO,N> VectorType;
@@ -240,8 +252,16 @@ belos_solve(
   const int use_mean_based,
   const Teuchos::RCP<Teuchos::ParameterList>& fenlParams,
   const unsigned max_iter = 200,
+#if KOKKOS_VERSION > 40799
+  const typename KokkosKernels::ArithTraits<SV>::mag_type tolerance =
+#else
   const typename Kokkos::ArithTraits<SV>::mag_type tolerance =
+#endif
+#if KOKKOS_VERSION > 40799
+    KokkosKernels::ArithTraits<SV>::epsilon())
+#else
     Kokkos::ArithTraits<SV>::epsilon())
+#endif
 {
   TEUCHOS_TEST_FOR_EXCEPTION(true, std::runtime_error,
                              "Belos solver requested but not compiled!");

packages/trilinoscouplings/examples/fenl/CGSolve.hpp

@@ -22,7 +22,11 @@
 #include <Kokkos_Core.hpp>
 #include <KokkosSparse_CrsMatrix.hpp>
 #include <Kokkos_Timer.hpp>
+#if KOKKOS_VERSION > 40799
+#include <KokkosKernels_ArithTraits.hpp>
+#else
 #include <Kokkos_ArithTraits.hpp>
+#endif
 
 #include <Teuchos_CommHelpers.hpp>
 #include <Tpetra_CrsMatrix.hpp>
@@ -88,14 +92,26 @@ template<class CrsMatrix, class Vector>
 result_struct cg_solve(
   Teuchos::RCP<CrsMatrix> A, Teuchos::RCP<Vector> b, Teuchos::RCP<Vector> x,
   int max_iter = 200,
+#if KOKKOS_VERSION > 40799
+  typename KokkosKernels::ArithTraits<typename CrsMatrix::scalar_type>::mag_type tolerance =
+#else
   typename Kokkos::ArithTraits<typename CrsMatrix::scalar_type>::mag_type tolerance =
+#endif
+#if KOKKOS_VERSION > 40799
+    KokkosKernels::ArithTraits<typename CrsMatrix::scalar_type>::epsilon(),
+#else
     Kokkos::ArithTraits<typename CrsMatrix::scalar_type>::epsilon(),
+#endif
   int print = 0)
 {
   Kokkos::Timer total_timer;
 
   typedef typename CrsMatrix::scalar_type ScalarType;
+#if KOKKOS_VERSION > 40799
+  typedef KokkosKernels::ArithTraits<ScalarType> KAT;
+#else
   typedef Kokkos::ArithTraits<ScalarType> KAT;
+#endif
   typedef typename KAT::mag_type MagnitudeType;
   typedef typename CrsMatrix::local_ordinal_type LocalOrdinalType;
   Teuchos::RCP<Vector> r,p,Ap;

packages/trilinoscouplings/examples/fenl/SampleGrouping.hpp

@@ -16,7 +16,11 @@
 #include "Teuchos_Comm.hpp"
 #include "BoxElemFixture.hpp"
 #include "HexElement.hpp"
+#if KOKKOS_VERSION > 40799
+#include "KokkosKernels_ArithTraits.hpp"
+#else
 #include "Kokkos_ArithTraits.hpp"
+#endif
 
 namespace Kokkos {
 namespace Example {
@@ -133,10 +137,18 @@ class MaxAnisotropyGrouping : public virtual SampleGrouping<Scalar> {
       Kokkos::deep_copy( rv, hrv );
 
       Ordinal num_elem = m_max_min_functor.m_elem_node_ids.extent(0);
+#if KOKKOS_VERSION > 40799
+      Scalar local_coeff[2] = { 0.0,  KokkosKernels::ArithTraits<Scalar>::max() };
+#else
       Scalar local_coeff[2] = { 0.0,  Kokkos::ArithTraits<Scalar>::max() };
+#endif
       parallel_reduce( num_elem, m_max_min_functor, local_coeff );
 
+#if KOKKOS_VERSION > 40799
+      Scalar coeff[2] = { 0.0,  KokkosKernels::ArithTraits<Scalar>::max() };
+#else
       Scalar coeff[2] = { 0.0,  Kokkos::ArithTraits<Scalar>::max() };
+#endif
       Teuchos::reduceAll( *m_comm, Teuchos::REDUCE_MAX, 1, &local_coeff[0], &coeff[0] );
       Teuchos::reduceAll( *m_comm, Teuchos::REDUCE_MIN, 1, &local_coeff[1], &coeff[1] );
 
@@ -272,7 +284,11 @@ class MaxAnisotropyGrouping : public virtual SampleGrouping<Scalar> {
       // The diffusion coefficient must be positive, so initializing the
       // result to zero is safe
       dst[0] = 0.0;
+#if KOKKOS_VERSION > 40799
+      dst[1] = KokkosKernels::ArithTraits<Scalar>::max();
+#else
       dst[1] = Kokkos::ArithTraits<Scalar>::max();
+#endif
     }
 
   };

packages/trilinoscouplings/examples/fenl/fenl.hpp

@@ -34,7 +34,11 @@
 
 #include <Kokkos_Core.hpp>
 #include <KokkosSparse_CrsMatrix.hpp>
+#if KOKKOS_VERSION > 40799
+#include <KokkosKernels_ArithTraits.hpp>
+#else
 #include <Kokkos_ArithTraits.hpp>
+#endif
 
 #include <SGPreconditioner.hpp>
 

packages/trilinoscouplings/examples/fenl/fenl_impl.hpp

@@ -24,7 +24,11 @@
 #include <Kokkos_UnorderedMap.hpp>
 #include <KokkosSparse_CrsMatrix.hpp>
 #include <Kokkos_Timer.hpp>
+#if KOKKOS_VERSION > 40799
+#include <KokkosKernels_ArithTraits.hpp>
+#else
 #include <Kokkos_ArithTraits.hpp>
+#endif
 
 #include <Teuchos_CommHelpers.hpp>
 #include <Teuchos_ParameterList.hpp>
@@ -93,7 +97,11 @@ class Problem {
   typedef Device DeviceType;
   typedef BoxElemFixture< Device , ElemOrder >  FixtureType ;
 
+#if KOKKOS_VERSION > 40799
+  typedef typename KokkosKernels::ArithTraits<Scalar>::mag_type  Magnitude;
+#else
   typedef typename Kokkos::ArithTraits<Scalar>::mag_type  Magnitude;
+#endif
 
   typedef Tpetra::KokkosCompat::KokkosDeviceWrapperNode< Device >  NodeType;
 
@@ -712,7 +720,11 @@ Perf fenl(
   Teuchos::Array<Scalar>& response_gradient,
   const QuadratureData<Device>& qd = QuadratureData<Device>() )
 {
+#if KOKKOS_VERSION > 40799
+  typedef typename KokkosKernels::ArithTraits<Scalar>::mag_type  Magnitude;
+#else
   typedef typename Kokkos::ArithTraits<Scalar>::mag_type  Magnitude;
+#endif
 
   const unsigned  newton_iteration_limit =
     fenlParams->get("Max Nonlinear Iterations", 10) ;