Fix compile errors

trilinos · Aug 1, 2020 · fccf879 · fccf879
1 parent 0d1a380
commit fccf879
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/packages/ifpack2/src/Ifpack2_IlukGraph.hpp b/packages/ifpack2/src/Ifpack2_IlukGraph.hpp
@@ -176,16 +176,7 @@ class IlukGraph : public Teuchos::Describable {
   size_t getNumGlobalDiagonals() const { return NumGlobalDiagonals_; }
 
 private:
-  typedef typename GraphType::map_type map_type;
-
-  typedef typename crs_graph_type::local_graph_type local_graph_type;
-  typedef typename local_graph_type::size_type      size_type;
-  typedef typename local_graph_type::data_type      data_type;
-  typedef typename local_graph_type::array_layout   array_layout;
-  typedef typename local_graph_type::device_type    device_type;
-
-  typedef typename Kokkos::View<size_type*, array_layout, device_type> lno_row_view_t;
-  typedef typename Kokkos::View<data_type*, array_layout, device_type> lno_nonzero_view_t;  
+  typedef typename GraphType::map_type map_type;  
 
   /// \brief Copy constructor (UNIMPLEMENTED; DO NOT USE).
   ///
@@ -573,6 +564,15 @@ void IlukGraph<GraphType, KKHandleType>::initialize(const Teuchos::RCP<KKHandleT
   using Teuchos::REDUCE_SUM;
   using Teuchos::reduceAll;
 
+  typedef typename crs_graph_type::local_graph_type local_graph_type;
+  typedef typename local_graph_type::size_type      size_type;
+  typedef typename local_graph_type::data_type      data_type;
+  typedef typename local_graph_type::array_layout   array_layout;
+  typedef typename local_graph_type::device_type    device_type;
+
+  typedef typename Kokkos::View<size_type*, array_layout, device_type> lno_row_view_t;
+  typedef typename Kokkos::View<data_type*, array_layout, device_type> lno_nonzero_view_t;
+
   constructOverlapGraph();
 
   // FIXME (mfh 23 Dec 2013) Use size_t or whatever

diff --git a/packages/ifpack2/src/Ifpack2_LocalSparseTriangularSolver_def.hpp b/packages/ifpack2/src/Ifpack2_LocalSparseTriangularSolver_def.hpp
@@ -574,7 +574,7 @@ compute ()
     kh_->destroy_sptrsv_handle();
 #if defined(KOKKOSKERNELS_ENABLE_TPL_CUSPARSE) && defined(KOKKOS_ENABLE_CUDA)
     // CuSparse only supports int type ordinals
-    if (std::is_same<Kokkos::Cuda, typename local_matrix_device_type::execution_space>::value && std::is_same<int,local_ordinal_type >::value)
+    if (std::is_same<Kokkos::Cuda, HandleExecSpace>::value && std::is_same<int,local_ordinal_type >::value)
     {
       kh_->create_sptrsv_handle(KokkosSparse::Experimental::SPTRSVAlgorithm::SPTRSV_CUSPARSE, numRows, is_lower_tri);
     }

diff --git a/packages/ifpack2/src/Ifpack2_RILUK_def.hpp b/packages/ifpack2/src/Ifpack2_RILUK_def.hpp
@@ -43,8 +43,10 @@
 
 #include "Ifpack2_LocalFilter.hpp"
 #include "Tpetra_CrsMatrix.hpp"
+#include "Teuchos_StandardParameterEntryValidators.hpp"
 #include "Ifpack2_LocalSparseTriangularSolver.hpp"
 #include "Ifpack2_Details_getParamTryingTypes.hpp"
+#include "Kokkos_Sort.hpp"
 
 namespace Ifpack2 {