#676: begin work pulling in separate pressio-ops repo

Pressio · Sep 26, 2024 · 0c5cc7a · 0c5cc7a
1 parent 7cd7536
commit 0c5cc7a
Show file tree

Hide file tree

Showing 103 changed files with 74 additions and 13,697 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,6 +36,25 @@ if(CMAKE_CXX_STANDARD STREQUAL "17"
   endif()
 endif()
 
+#=====================================================================
+# pull in pressio-ops
+#=====================================================================
+include(FetchContent)
+
+message("${Green}-- Fetching pressio-ops...")
+
+FetchContent_Declare(
+  pressio-ops
+  GIT_REPOSITORY https:github.com/Pressio/pressio-ops.git
+  GIT_TAG        fix-compatibility-with-pressio
+  GIT_PROGRESS   TRUE
+  GIT_SHALLOW    TRUE
+)
+
+FetchContent_MakeAvailable(pressio-ops)
+
+message("${Green}-- Done.")
+
 ################################################################################
 
 include(GNUInstallDirs)
@@ -53,6 +72,8 @@ target_include_directories(
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
+target_link_libraries(pressio INTERFACE pressioops)
+
 install(
   TARGETS pressio
   EXPORT pressioTargets

diff --git a/include/pressio/expressions.hpp b/include/pressio/expressions.hpp
diff --git a/include/pressio/macros.hpp b/include/pressio/macros.hpp
@@ -49,27 +49,12 @@
 #ifndef PRESSIO_MACROS_HPP_
 #define PRESSIO_MACROS_HPP_
 
+#include "pressio/ops_macros.hpp"
+
 #define PRESSIO_MAJOR_VERSION 0
 #define PRESSIO_MINOR_VERSION 14
 #define PRESSIO_PATCH_VERSION 0
 
-// ----------------------------------------
-// compiler version
-// ----------------------------------------
-#ifdef _MSVC_LANG
-#define _PRESSIO_CPLUSPLUS _MSVC_LANG
-#else
-#define _PRESSIO_CPLUSPLUS __cplusplus
-#endif
-
-#define PRESSIO_CXX_STD_17 201703L
-#define PRESSIO_CXX_STD_20 202002L
-static_assert(_PRESSIO_CPLUSPLUS >= PRESSIO_CXX_STD_17, "PRESSIO requires C++17 or greater.");
-
-#if defined PRESSIO_ENABLE_CXX20
-#define PRESSIO_ENABLE_CXX17
-#endif
-
 // ----------------------------------------
 // logging macros
 // ----------------------------------------
@@ -96,24 +81,4 @@ static_assert(_PRESSIO_CPLUSPLUS >= PRESSIO_CXX_STD_17, "PRESSIO requires C++17
 //DEBUG_PRINT is off and LOG_ACTIVE_MIN_LEVEL=on, nothing to do
 #endif
 
-// ----------------------------------------
-// TPL macros
-// ----------------------------------------
-#if defined PRESSIO_ENABLE_TPL_TRILINOS
-// if trilinos enabled, kokkos and MPI should be too
-#if !defined PRESSIO_ENABLE_TPL_KOKKOS
-#define PRESSIO_ENABLE_TPL_KOKKOS
-#endif
-#if !defined PRESSIO_ENABLE_TPL_MPI
-#define PRESSIO_ENABLE_TPL_MPI
-#endif
-#if !defined PRESSIO_ENABLE_TEUCHOS_TIMERS
-#define PRESSIO_ENABLE_TEUCHOS_TIMERS
-#endif
-#endif
-
-#ifndef PRESSIO_ENABLE_TPL_EIGEN
-static_assert(false, "Eigen is not enabled.");
-#endif
-
 #endif
diff --git a/include/pressio/mpl.hpp b/include/pressio/mpl.hpp
diff --git a/include/pressio/ode_advancers.hpp b/include/pressio/ode_advancers.hpp
@@ -49,9 +49,9 @@
 #ifndef PRESSIO_ODE_ADVANCERS_HPP_
 #define PRESSIO_ODE_ADVANCERS_HPP_
 
-#include "./mpl.hpp"
+#include "pressio/mpl.hpp"
 #include "./utils.hpp"
-#include "./type_traits.hpp"
+#include "pressio/type_traits.hpp"
 
 #include "./ode_concepts.hpp"
 #include "./ode/exceptions.hpp"

diff --git a/include/pressio/ode_concepts.hpp b/include/pressio/ode_concepts.hpp
@@ -49,10 +49,10 @@
 #ifndef PRESSIO_ODE_CONCEPTS_TOPLEVEL_INC_HPP_
 #define PRESSIO_ODE_CONCEPTS_TOPLEVEL_INC_HPP_
 
-#include "./mpl.hpp"
+#include "pressio/mpl.hpp"
 #include "./utils.hpp"
-#include "./type_traits.hpp"
-#include "./ops.hpp"
+#include "pressio/type_traits.hpp"
+#include "pressio/ops.hpp"
 
 #include "./ode/ode_strong_types.hpp"
 #include "./ode/ode_enum_and_tags.hpp"

diff --git a/include/pressio/ode_steppers_explicit.hpp b/include/pressio/ode_steppers_explicit.hpp
@@ -49,10 +49,10 @@
 #ifndef PRESSIO_ODE_STEPPERS_EXPLICIT_HPP_
 #define PRESSIO_ODE_STEPPERS_EXPLICIT_HPP_
 
-#include "./mpl.hpp"
+#include "pressio/mpl.hpp"
 #include "./utils.hpp"
-#include "./type_traits.hpp"
-#include "./ops.hpp"
+#include "pressio/type_traits.hpp"
+#include "pressio/ops.hpp"
 #include "./solvers.hpp"
 
 #include "./ode_concepts.hpp"

diff --git a/include/pressio/ode_steppers_implicit.hpp b/include/pressio/ode_steppers_implicit.hpp
@@ -49,10 +49,10 @@
 #ifndef PRESSIO_ODE_STEPPERS_IMPLICIT_HPP_
 #define PRESSIO_ODE_STEPPERS_IMPLICIT_HPP_
 
-#include "./mpl.hpp"
+#include "pressio/mpl.hpp"
 #include "./utils.hpp"
-#include "./type_traits.hpp"
-#include "./ops.hpp"
+#include "pressio/type_traits.hpp"
+#include "pressio/ops.hpp"
 #include "./solvers.hpp"
 
 #include "./ode_concepts.hpp"