minitensor: 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/minitensor/src/MiniTensor_LinearAlgebra.t.h

@@ -7,7 +7,11 @@
 // *****************************************************************************
 // @HEADER
 
+#if KOKKOS_VERSION > 40799
+#include "KokkosKernels_ArithTraits.hpp"
+#else
 #include "Kokkos_ArithTraits.hpp"
+#endif
 #if !defined(MiniTensor_LinearAlgebra_t_h)
 #define MiniTensor_LinearAlgebra_t_h
 
@@ -4216,7 +4220,11 @@ polar_rotation(Tensor<T, N> const & A)
   tol_scale = 0.01;
 
   T const tol_conv =
+#if KOKKOS_VERSION > 40799
+      KokkosKernels::ArithTraits<Index>::sqrt(dimension) * machine_epsilon<T>();
+#else
       Kokkos::ArithTraits<Index>::sqrt(dimension) * machine_epsilon<T>();
+#endif
 
   Tensor<T, N>
   X = A;

packages/minitensor/src/MiniTensor_TensorBase.i.h

@@ -346,23 +346,43 @@ TensorBase<T, ST>::fill(Filler const value)
   case Filler::ZEROS:
     for (Index i = 0; i < number_components; ++i) {
       auto & entry = (*this)[i];
+#if KOKKOS_VERSION > 40799
+      fill_AD<T>(entry, KokkosKernels::ArithTraits<S>::zero());
+#else
       fill_AD<T>(entry, Kokkos::ArithTraits<S>::zero());
+#endif
+#if KOKKOS_VERSION > 40799
+      entry = KokkosKernels::ArithTraits<S>::zero();
+#else
       entry = Kokkos::ArithTraits<S>::zero();
+#endif
     }
     break;
 
   case Filler::ONES:
     for (Index i = 0; i < number_components; ++i) {
       auto & entry = (*this)[i];
+#if KOKKOS_VERSION > 40799
+      fill_AD<T>(entry, KokkosKernels::ArithTraits<S>::zero());
+#else
       fill_AD<T>(entry, Kokkos::ArithTraits<S>::zero());
+#endif
+#if KOKKOS_VERSION > 40799
+      entry = KokkosKernels::ArithTraits<S>::one();
+#else
       entry = Kokkos::ArithTraits<S>::one();
+#endif
     }
     break;
 
   case Filler::SEQUENCE:
     for (Index i = 0; i < number_components; ++i) {
       auto & entry = (*this)[i];
+#if KOKKOS_VERSION > 40799
+      fill_AD<T>(entry, KokkosKernels::ArithTraits<S>::zero());
+#else
       fill_AD<T>(entry, Kokkos::ArithTraits<S>::zero());
+#endif
       entry = static_cast<S>(i);
     }
     break;
@@ -379,7 +399,11 @@ TensorBase<T, ST>::fill(Filler const value)
     KOKKOS_IF_ON_HOST((
     for (Index i = 0; i < number_components; ++i) {
       auto & entry = (*this)[i];
+#if KOKKOS_VERSION > 40799
+      fill_AD<T>(entry, KokkosKernels::ArithTraits<S>::zero());
+#else
       fill_AD<T>(entry, Kokkos::ArithTraits<S>::zero());
+#endif
       entry = random<S>();
     }
     break;
@@ -392,7 +416,11 @@ TensorBase<T, ST>::fill(Filler const value)
     KOKKOS_IF_ON_HOST((
     for (Index i = 0; i < number_components; ++i) {
       auto & entry = (*this)[i];
+#if KOKKOS_VERSION > 40799
+      fill_AD<T>(entry, KokkosKernels::ArithTraits<S>::zero());
+#else
       fill_AD<T>(entry, Kokkos::ArithTraits<S>::zero());
+#endif
       entry = random_uniform<S>();
     }
     break;
@@ -405,7 +433,11 @@ TensorBase<T, ST>::fill(Filler const value)
     KOKKOS_IF_ON_HOST((
     for (Index i = 0; i < number_components; ++i) {
       auto & entry = (*this)[i];
+#if KOKKOS_VERSION > 40799
+      fill_AD<T>(entry, KokkosKernels::ArithTraits<S>::zero());
+#else
       fill_AD<T>(entry, Kokkos::ArithTraits<S>::zero());
+#endif
       entry = random_normal<S>();
     }
     break;
@@ -438,7 +470,11 @@ TensorBase<T, ST>::fill(T const & s)
 
   for (Index i = 0; i < number_components; ++i) {
     auto & entry = (*this)[i];
+#if KOKKOS_VERSION > 40799
+    fill_AD<T>(entry, KokkosKernels::ArithTraits<S>::zero());
+#else
     fill_AD<T>(entry, Kokkos::ArithTraits<S>::zero());
+#endif
     entry = s;
   }
 

packages/minitensor/src/MiniTensor_Utilities.i.h

@@ -13,7 +13,11 @@
 #include <cfloat>
 #include <cmath>
 #include <limits>
+#if KOKKOS_VERSION > 40799
+#include "KokkosKernels_ArithTraits.hpp"
+#else
 #include "Kokkos_ArithTraits.hpp"
+#endif
 #include "Teuchos_ScalarTraits.hpp"
 
 namespace minitensor {
@@ -101,7 +105,11 @@ typename Sacado::ScalarType<T>::type
 not_a_number()
 {
   using S = typename Sacado::ScalarType<T>::type;
+#if KOKKOS_VERSION > 40799
+  return KokkosKernels::ArithTraits<S>::nan();
+#else
   return Kokkos::ArithTraits<S>::nan();
+#endif
 }
 
 //
@@ -116,7 +124,11 @@ typename Sacado::ScalarType<T>::type
 machine_epsilon()
 {
   using S = typename Sacado::ScalarType<T>::type;
+#if KOKKOS_VERSION > 40799
+  return KokkosKernels::ArithTraits<S>::epsilon();
+#else
   return Kokkos::ArithTraits<S>::epsilon();
+#endif
 }
 
 //

packages/minitensor/src/MiniTensor_Vector.i.h

@@ -7,7 +7,11 @@
 // *****************************************************************************
 // @HEADER
 
+#if KOKKOS_VERSION > 40799
+#include "KokkosKernels_ArithTraits.hpp"
+#else
 #include "Kokkos_ArithTraits.hpp"
+#endif
 #if !defined(MiniTensor_Vector_i_h)
 #define MiniTensor_Vector_i_h