Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix logic for epetra #31

Merged
merged 1 commit into from
Nov 21, 2024
Merged

fix logic for epetra #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions include/pressio/ops_macros.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ static_assert(_PRESSIO_CPLUSPLUS >= PRESSIO_CXX_STD_17, "PRESSIO requires C++17
// ----------------------------------------
// TPL macros
// ----------------------------------------
#if defined PRESSIO_ENABLE_EPETRA
#if !defined PRESSIO_ENABLE_TPL_TRILINOS
#define PRESSIO_ENABLE_TPL_TRILINOS
#endif
#endif

#if defined PRESSIO_ENABLE_TPL_TRILINOS
// if trilinos enabled, kokkos and MPI should be too
#if !defined PRESSIO_ENABLE_TPL_KOKKOS
Expand Down
4 changes: 2 additions & 2 deletions include/pressio/type_traits/native_epetra_vector.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
#ifndef PRESSIOOPS_TYPE_TRAITS_NATIVE_EPETRA_VECTOR_HPP_
#define PRESSIOOPS_TYPE_TRAITS_NATIVE_EPETRA_VECTOR_HPP_

#ifdef PRESSIO_ENABLE_TPL_TRILINOS
#ifdef PRESSIO_ENABLE_TPL_EPETRA
#include "Epetra_Vector.h"
#include "Epetra_MultiVector.h"
#endif
Expand All @@ -59,7 +59,7 @@ namespace pressio{
template <typename T, typename enable = void>
struct is_vector_epetra : std::false_type {};

#ifdef PRESSIO_ENABLE_TPL_TRILINOS
#ifdef PRESSIO_ENABLE_TPL_EPETRA
template <typename T>
struct is_vector_epetra<T,
typename
Expand Down