Merge pull request #25 from Pressio/baseline_trilinos_traits_always_c…

…ompile trilinos baseline traits cases always are false if PRESSIO_ENABLE_TPL_TRILINOS off
Pressio · Nov 10, 2024 · 4d0dd62 · 4d0dd62
2 parents f9720d7 + efca0d1
commit 4d0dd62
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 17 deletions.
diff --git a/include/pressio/type_traits.hpp b/include/pressio/type_traits.hpp
@@ -61,31 +61,21 @@ template<class T, class Enable = void> struct Traits;
 //*** vector ****
 #include "type_traits/native_eigen_vector.hpp"
 #include "type_traits/native_kokkos_vector.hpp"
-#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 #include "type_traits/native_teuchos_vector.hpp"
 #include "type_traits/native_tpetra_block_vector.hpp"
 #include "type_traits/native_tpetra_vector.hpp"
-#ifdef PRESSIO_ENABLE_EPETRA
 #include "type_traits/native_epetra_vector.hpp"
-#endif // PRESSIO_ENABLE_EPETRA
-#endif // PRSSIO_ENABLE_TPL_TRILINOS
 
 //*** matrix ****
 #include "type_traits/native_kokkos_dense_matrix.hpp"
-#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 #include "type_traits/native_teuchos_dense_matrix.hpp"
-#endif
 #include "type_traits/native_eigen_dense_matrix.hpp"
 #include "type_traits/native_eigen_sparse_matrix.hpp"
 
 //*** multi vector ****
-#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 #include "type_traits/native_tpetra_block_multi_vector.hpp"
 #include "type_traits/native_tpetra_multi_vector.hpp"
-#ifdef PRESSIO_ENABLE_EPETRA
 #include "type_traits/native_epetra_multi_vector.hpp"
-#endif // PRESSIO_ENABLE_EPETRA
-#endif // PRSSIO_ENABLE_TPL_TRILINOS
 
 #include "type_traits/traits_tpl.hpp"
 

diff --git a/include/pressio/type_traits/native_epetra_multi_vector.hpp b/include/pressio/type_traits/native_epetra_multi_vector.hpp
@@ -49,20 +49,24 @@
 #ifndef PRESSIOOPS_TYPE_TRAITS_NATIVE_EPETRA_MULTI_VECTOR_HPP_
 #define PRESSIOOPS_TYPE_TRAITS_NATIVE_EPETRA_MULTI_VECTOR_HPP_
 
+#ifdef PRESSIO_ENABLE_EPETRA
 #include "Epetra_MultiVector.h"
+#endif
 
 namespace pressio{
 
 template <typename T, typename enable = void>
 struct is_multi_vector_epetra : std::false_type {};
 
+#ifdef PRESSIO_ENABLE_EPETRA
 template <typename T>
 struct is_multi_vector_epetra<T,
   typename
    std::enable_if<
     std::is_same<T,Epetra_MultiVector>::value
    >::type
   > : std::true_type{};
+#endif
 
 }//end namespace
 #endif  // PRESSIOOPS_TYPE_TRAITS_NATIVE_EPETRA_MULTI_VECTOR_HPP_
diff --git a/include/pressio/type_traits/native_epetra_vector.hpp b/include/pressio/type_traits/native_epetra_vector.hpp
@@ -49,21 +49,25 @@
 #ifndef PRESSIOOPS_TYPE_TRAITS_NATIVE_EPETRA_VECTOR_HPP_
 #define PRESSIOOPS_TYPE_TRAITS_NATIVE_EPETRA_VECTOR_HPP_
 
+#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 #include "Epetra_Vector.h"
 #include "Epetra_MultiVector.h"
+#endif
 
 namespace pressio{
 
 template <typename T, typename enable = void>
 struct is_vector_epetra : std::false_type {};
 
+#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 template <typename T>
 struct is_vector_epetra<T,
       typename
       std::enable_if<
 	std::is_same<T,Epetra_Vector>::value
 	>::type
       > : std::true_type{};
+#endif
 
 }//end namespace
 #endif  // PRESSIOOPS_TYPE_TRAITS_NATIVE_EPETRA_VECTOR_HPP_
diff --git a/include/pressio/type_traits/native_teuchos_dense_matrix.hpp b/include/pressio/type_traits/native_teuchos_dense_matrix.hpp
@@ -49,13 +49,16 @@
 #ifndef PRESSIOOPS_TYPE_TRAITS_NATIVE_TEUCHOS_DENSE_MATRIX_HPP_
 #define PRESSIOOPS_TYPE_TRAITS_NATIVE_TEUCHOS_DENSE_MATRIX_HPP_
 
+#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 #include <Teuchos_SerialDenseMatrix.hpp>
+#endif
 
 namespace pressio{
 
 template <typename T, typename enable = void>
 struct is_dense_matrix_teuchos : std::false_type {};
 
+#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 template <typename T>
 struct is_dense_matrix_teuchos<
   T,
@@ -66,11 +69,12 @@ struct is_dense_matrix_teuchos<
       >::value
     >::type
   > : std::true_type{};
-//-------------------------------------------------
+#endif
 
 template <typename T, typename enable = void>
 struct is_dense_matrix_teuchos_rcp : std::false_type {};
 
+#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 template <typename T>
 struct is_dense_matrix_teuchos_rcp<
   T,
@@ -79,7 +83,7 @@ struct is_dense_matrix_teuchos_rcp<
     is_dense_matrix_teuchos<typename T::element_type>::value
     >::type
   > : std::true_type{};
-
+#endif
 
 }//end namespace
 #endif  // PRESSIOOPS_TYPE_TRAITS_NATIVE_TEUCHOS_DENSE_MATRIX_HPP_
diff --git a/include/pressio/type_traits/native_teuchos_vector.hpp b/include/pressio/type_traits/native_teuchos_vector.hpp
@@ -49,13 +49,16 @@
 #ifndef PRESSIOOPS_TYPE_TRAITS_NATIVE_TEUCHOS_VECTOR_HPP_
 #define PRESSIOOPS_TYPE_TRAITS_NATIVE_TEUCHOS_VECTOR_HPP_
 
+#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 #include "Teuchos_SerialDenseVector.hpp"
+#endif
 
 namespace pressio{
 
 template <typename T, typename enable = void>
 struct is_dense_vector_teuchos : std::false_type {};
 
+#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 template <typename T>
 struct is_dense_vector_teuchos<
   T,
@@ -66,6 +69,7 @@ struct is_dense_vector_teuchos<
       >::value
     >
   > : std::true_type{};
+#endif
 
 }//end namespace
 #endif  // PRESSIOOPS_TYPE_TRAITS_NATIVE_TEUCHOS_VECTOR_HPP_
diff --git a/include/pressio/type_traits/native_tpetra_block_multi_vector.hpp b/include/pressio/type_traits/native_tpetra_block_multi_vector.hpp
@@ -49,13 +49,16 @@
 #ifndef PRESSIOOPS_TYPE_TRAITS_NATIVE_TPETRA_BLOCK_MULTI_VECTOR_HPP_
 #define PRESSIOOPS_TYPE_TRAITS_NATIVE_TPETRA_BLOCK_MULTI_VECTOR_HPP_
 
+#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 #include <Tpetra_BlockMultiVector_decl.hpp>
+#endif
 
-namespace pressio{ 
+namespace pressio{
 
 template <typename T, typename enable = void>
 struct is_multi_vector_tpetra_block : std::false_type {};
 
+#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 template <typename T>
 struct is_multi_vector_tpetra_block<
   T,
@@ -71,6 +74,7 @@ struct is_multi_vector_tpetra_block<
       >::value
     >
   > : std::true_type{};
+#endif
 
-}//end namespace 
+}//end namespace
 #endif  // PRESSIOOPS_TYPE_TRAITS_NATIVE_TPETRA_BLOCK_MULTI_VECTOR_HPP_
diff --git a/include/pressio/type_traits/native_tpetra_block_vector.hpp b/include/pressio/type_traits/native_tpetra_block_vector.hpp
@@ -49,13 +49,16 @@
 #ifndef PRESSIOOPS_TYPE_TRAITS_NATIVE_TPETRA_BLOCK_VECTOR_HPP_
 #define PRESSIOOPS_TYPE_TRAITS_NATIVE_TPETRA_BLOCK_VECTOR_HPP_
 
+#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 #include <Tpetra_BlockVector_decl.hpp>
+#endif
 
-namespace pressio{ 
+namespace pressio{
 
 template <typename T, typename enable = void>
 struct is_vector_tpetra_block : std::false_type {};
 
+#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 template <typename T>
 struct is_vector_tpetra_block<
   T,
@@ -72,6 +75,7 @@ struct is_vector_tpetra_block<
       >::value
     >::type
   > : std::true_type{};
+#endif
 
-}//end namespace 
+}//end namespace
 #endif  // PRESSIOOPS_TYPE_TRAITS_NATIVE_TPETRA_BLOCK_VECTOR_HPP_
diff --git a/include/pressio/type_traits/native_tpetra_multi_vector.hpp b/include/pressio/type_traits/native_tpetra_multi_vector.hpp
@@ -49,13 +49,16 @@
 #ifndef PRESSIOOPS_TYPE_TRAITS_NATIVE_TPETRA_MULTI_VECTOR_HPP_
 #define PRESSIOOPS_TYPE_TRAITS_NATIVE_TPETRA_MULTI_VECTOR_HPP_
 
+#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 #include <Tpetra_MultiVector_decl.hpp>
+#endif
 
 namespace pressio{
 
 template <typename T, typename enable = void>
 struct is_multi_vector_tpetra : std::false_type {};
 
+#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 template <typename T>
 struct is_multi_vector_tpetra<
   T,
@@ -72,6 +75,7 @@ struct is_multi_vector_tpetra<
       >::value
     >::type
   > : std::true_type{};
+#endif
 
-}//end namespace 
+}//end namespace
 #endif  // PRESSIOOPS_TYPE_TRAITS_NATIVE_TPETRA_MULTI_VECTOR_HPP_
diff --git a/include/pressio/type_traits/native_tpetra_vector.hpp b/include/pressio/type_traits/native_tpetra_vector.hpp
@@ -49,13 +49,16 @@
 #ifndef PRESSIOOPS_TYPE_TRAITS_NATIVE_TPETRA_VECTOR_HPP_
 #define PRESSIOOPS_TYPE_TRAITS_NATIVE_TPETRA_VECTOR_HPP_
 
+#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 #include "Tpetra_Vector.hpp"
+#endif
 
 namespace pressio{
 
 template <typename T, typename enable = void>
 struct is_vector_tpetra : std::false_type {};
 
+#ifdef PRESSIO_ENABLE_TPL_TRILINOS
 template <typename T>
 struct is_vector_tpetra<
   T,
@@ -72,6 +75,7 @@ struct is_vector_tpetra<
       >::value
     >::type
   > : std::true_type{};
+#endif
 
 }
 #endif  // PRESSIOOPS_TYPE_TRAITS_NATIVE_TPETRA_VECTOR_HPP_