fix/update for building with kokkos 3.1, remove deprecated use of old…

… Kokkos API
pkestene · May 27, 2020 · 45aba1b · 45aba1b
1 parent 7bb7258
commit 45aba1b
Show file tree

Hide file tree

Showing 22 changed files with 132 additions and 122 deletions.
diff --git a/src/mood/MoodBaseFunctor.h b/src/mood/MoodBaseFunctor.h
@@ -80,9 +80,9 @@ class MoodBaseFunctor : public PolynomialEvaluator<dim,degree>
    */
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void computePrimitives(const typename Kokkos::Impl::enable_if<dim_==2, HydroState>::type& u,
+  void computePrimitives(const typename std::enable_if<dim_==2, HydroState>::type& u,
 			 real_t* c,
-			 typename Kokkos::Impl::enable_if<dim_==2, HydroState>::type& q) const
+			 typename std::enable_if<dim_==2, HydroState>::type& q) const
   {
     real_t gamma0 = params.settings.gamma0;
     real_t smallr = params.settings.smallr;
@@ -117,9 +117,9 @@ class MoodBaseFunctor : public PolynomialEvaluator<dim,degree>
    */
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void computePrimitives(const typename Kokkos::Impl::enable_if<dim_==3, HydroState>::type& u,
+  void computePrimitives(const typename std::enable_if<dim_==3, HydroState>::type& u,
 			 real_t* c,
-			 typename Kokkos::Impl::enable_if<dim_==3, HydroState>::type& q) const
+			 typename std::enable_if<dim_==3, HydroState>::type& q) const
   {
     real_t gamma0 = params.settings.gamma0;
     real_t smallr = params.settings.smallr;
@@ -157,7 +157,7 @@ class MoodBaseFunctor : public PolynomialEvaluator<dim,degree>
    */
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  int isValid(const typename Kokkos::Impl::enable_if<dim_==2, HydroState>::type& u) const
+  int isValid(const typename std::enable_if<dim_==2, HydroState>::type& u) const
   {
 
     int isValid_ = 1;
@@ -189,7 +189,7 @@ class MoodBaseFunctor : public PolynomialEvaluator<dim,degree>
    */
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  int isValid(const typename Kokkos::Impl::enable_if<dim_==3, HydroState>::type& u) const
+  int isValid(const typename std::enable_if<dim_==3, HydroState>::type& u) const
   {
 
     int isValid_ = 1;

diff --git a/src/mood/MoodDtFunctor.h b/src/mood/MoodDtFunctor.h
@@ -55,7 +55,7 @@ namespace mood {
 //   template<int dim_ = dim>
 //   KOKKOS_INLINE_FUNCTION
 //   void operator()(const typename
-// 		  Kokkos::Impl::enable_if<dim_==2, int>::type& index,
+// 		  std::enable_if<dim_==2, int>::type& index,
 // 		  real_t &invDt) const
 //   {
 //     const int isize = this->params.isize;
@@ -97,7 +97,7 @@ namespace mood {
 //   template<int dim_ = dim>
 //   KOKKOS_INLINE_FUNCTION
 //   void operator()(const typename
-// 		  Kokkos::Impl::enable_if<dim_==3, int>::type& index,
+// 		  std::enable_if<dim_==3, int>::type& index,
 // 		  real_t &invDt) const
 //   {
 //     const int isize = this->params.isize;

diff --git a/src/mood/MoodFluxesFunctors.h b/src/mood/MoodFluxesFunctors.h
@@ -76,7 +76,7 @@ class ComputeFluxesFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 2d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==2, int>::type& index)  const
+  void operator()(const typename std::enable_if<dim_==2, int>::type& index)  const
   {
 
     const int isize = this->params.isize;
@@ -343,7 +343,7 @@ class ComputeFluxesFunctor : public MoodBaseFunctor<dim,degree>
   /************* UNFINISHED - TODO ***************/
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==3, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==3, int>::type& index) const
   {
     const int isize = this->params.isize;
     const int jsize = this->params.jsize;
@@ -789,7 +789,7 @@ class RecomputeFluxesFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 2d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==2, int>::type& index)  const
+  void operator()(const typename std::enable_if<dim_==2, int>::type& index)  const
   {
 
     const int isize = this->params.isize;
@@ -914,7 +914,7 @@ class RecomputeFluxesFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 3d
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==3, int>::type& index)  const
+  void operator()(const typename std::enable_if<dim_==3, int>::type& index)  const
   {
 
     const int isize = this->params.isize;

diff --git a/src/mood/MoodInitFunctors.h b/src/mood/MoodInitFunctors.h
@@ -50,7 +50,7 @@ class InitImplodeFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 2d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==2, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==2, int>::type& index) const
   {
 
     const int isize = this->params.isize;
@@ -92,7 +92,7 @@ class InitImplodeFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 3d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==3, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==3, int>::type& index) const
   {
 
     const int isize = this->params.isize;
@@ -167,7 +167,7 @@ class InitBlastFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 2d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==2, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==2, int>::type& index) const
   {
 
     const int isize = this->params.isize;
@@ -221,7 +221,7 @@ class InitBlastFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 3d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==3, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==3, int>::type& index) const
   {
 
     const int isize = this->params.isize;
@@ -320,7 +320,7 @@ class InitFourQuadrantFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 2d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==2, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==2, int>::type& index) const
   {
 
     const int isize = this->params.isize;
@@ -376,7 +376,7 @@ class InitFourQuadrantFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 3d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==3, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==3, int>::type& index) const
   {
 
     const int isize = this->params.isize;
@@ -476,7 +476,7 @@ class InitKelvinHelmholtzFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 2d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==2, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==2, int>::type& index) const
   {
 
     // get random number state
@@ -572,7 +572,7 @@ class InitKelvinHelmholtzFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 3d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==3, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==3, int>::type& index) const
   {
 
     // get random number generator state
@@ -720,7 +720,7 @@ class InitWedgeFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 2d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==2, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==2, int>::type& index) const
   {
 
     const int isize = this->params.isize;
@@ -767,7 +767,7 @@ class InitWedgeFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 3d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==3, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==3, int>::type& index) const
   {
 
     const int isize = this->params.isize;
@@ -1057,7 +1057,7 @@ class InitIsentropicVortexFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 2d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==2, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==2, int>::type& index) const
   {
 
     const int isize = this->params.isize;
@@ -1094,7 +1094,7 @@ class InitIsentropicVortexFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 3d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==3, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==3, int>::type& index) const
   {
 
     const int isize = this->params.isize;

diff --git a/src/mood/MoodPolynomialReconstructionFunctors.h b/src/mood/MoodPolynomialReconstructionFunctors.h
@@ -81,7 +81,7 @@ class ComputeReconstructionPolynomialFunctor : public MoodBaseFunctor<dim,degree
   //! functor for 2d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==2, int>::type& index)  const
+  void operator()(const typename std::enable_if<dim_==2, int>::type& index)  const
   {
 
     const int isize = this->params.isize;
@@ -118,9 +118,9 @@ class ComputeReconstructionPolynomialFunctor : public MoodBaseFunctor<dim,degree
 	// retrieve reconstruction polynomial coefficients in current cell
 	coefs_t coefs_c;
 	coefs_c[0] = Udata(i,j,ivar);
-	for (int icoef=0; icoef<mat_pi.dimension_0(); ++icoef) {
+	for (int icoef=0; icoef<mat_pi.extent(0); ++icoef) {
 	  real_t tmp = 0;
-	  for (int ik=0; ik<mat_pi.dimension_1(); ++ik) {
+	  for (int ik=0; ik<mat_pi.extent(1); ++ik) {
 	    tmp += mat_pi(icoef,ik) * rhs[ik];
 	  }
 	  coefs_c[icoef+1] = tmp;
@@ -139,7 +139,7 @@ class ComputeReconstructionPolynomialFunctor : public MoodBaseFunctor<dim,degree
   //! functor for 3d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==3, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==3, int>::type& index) const
   {
     const int isize = this->params.isize;
     const int jsize = this->params.jsize;
@@ -179,9 +179,9 @@ class ComputeReconstructionPolynomialFunctor : public MoodBaseFunctor<dim,degree
 	// retrieve reconstruction polynomial coefficients in current cell
 	coefs_t coefs_c;
 	coefs_c[0] = Udata(i,j,k,ivar);
-	for (int icoef=0; icoef<mat_pi.dimension_0(); ++icoef) {
+	for (int icoef=0; icoef<mat_pi.extent(0); ++icoef) {
 	  real_t tmp = 0;
-	  for (int ik=0; ik<mat_pi.dimension_1(); ++ik) {
+	  for (int ik=0; ik<mat_pi.extent(1); ++ik) {
 	    tmp += mat_pi(icoef,ik) * rhs[ik];
 	  }
 	  coefs_c[icoef+1] = tmp;

diff --git a/src/mood/MoodTestReconstruction.h b/src/mood/MoodTestReconstruction.h
@@ -66,7 +66,7 @@ class TestReconstructionFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 2d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==2, int>::type& index)  const
+  void operator()(const typename std::enable_if<dim_==2, int>::type& index)  const
   {
 
     const int isize = this->params.isize;
@@ -209,7 +209,7 @@ class TestReconstructionFunctor : public MoodBaseFunctor<dim,degree>
   /************* UNFINISHED - TODO ***************/
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==3, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==3, int>::type& index) const
   {
 
   }  // end functor 3d

diff --git a/src/mood/MoodUpdateFunctors.h b/src/mood/MoodUpdateFunctors.h
@@ -45,7 +45,7 @@ class UpdateFunctor
   //! functor for 2d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==2, int>::type& index)  const
+  void operator()(const typename std::enable_if<dim_==2, int>::type& index)  const
   {
     const int isize = params.isize;
     const int jsize = params.jsize;
@@ -96,7 +96,7 @@ class UpdateFunctor
   //! functor for 3d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==3, int>::type& index)  const
+  void operator()(const typename std::enable_if<dim_==3, int>::type& index)  const
   {
     const int isize = params.isize;
     const int jsize = params.jsize;
@@ -211,7 +211,7 @@ class UpdateFunctor_ssprk2
   //! functor for 2d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==2, int>::type& index)  const
+  void operator()(const typename std::enable_if<dim_==2, int>::type& index)  const
   {
     const int isize = params.isize;
     const int jsize = params.jsize;
@@ -262,7 +262,7 @@ class UpdateFunctor_ssprk2
   //! functor for 3d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==3, int>::type& index)  const
+  void operator()(const typename std::enable_if<dim_==3, int>::type& index)  const
   {
     const int isize = params.isize;
     const int jsize = params.jsize;
@@ -384,7 +384,7 @@ class UpdateFunctor_weight
   //! functor for 2d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==2, int>::type& index)  const
+  void operator()(const typename std::enable_if<dim_==2, int>::type& index)  const
   {
     const int isize = params.isize;
     const int jsize = params.jsize;
@@ -436,7 +436,7 @@ class UpdateFunctor_weight
   //! functor for 3d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==3, int>::type& index)  const
+  void operator()(const typename std::enable_if<dim_==3, int>::type& index)  const
   {
     const int isize = params.isize;
     const int jsize = params.jsize;
@@ -555,7 +555,7 @@ class ComputeMoodFlagsUpdateFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 2d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==2, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==2, int>::type& index) const
   {
     const int isize = this->params.isize;
     const int jsize = this->params.jsize;
@@ -626,7 +626,7 @@ class ComputeMoodFlagsUpdateFunctor : public MoodBaseFunctor<dim,degree>
   //! functor for 3d 
   template<int dim_ = dim>
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename Kokkos::Impl::enable_if<dim_==3, int>::type& index) const
+  void operator()(const typename std::enable_if<dim_==3, int>::type& index) const
   {
 
     const int isize = this->params.isize;