Pressio · fnrizzi · Mar 3, 2025 · Feb 28, 2025 · Feb 28, 2025 · Feb 28, 2025
diff --git a/.github/workflows/ci-baseline.yml b/.github/workflows/ci-baseline.yml
@@ -56,7 +56,6 @@ jobs:
     env:
       eigen_version: 3.4.0
       num_cpus: 2 # $(cat /proc/cpuinfo | grep processor -c)
-      PRESSIO_INSTALL_DIR: ${{ github.workspace }}/pressio_install
 
     steps:
       - uses: actions/checkout@v4
@@ -88,26 +87,6 @@ jobs:
           && mkdir -p /eigen \
           && tar -xf eigen-${{ env.eigen_version }}.tar.gz -C /eigen
 
-      - name: Configure
-        run: |
-          cmake -B builddir \
-            -D CMAKE_BUILD_TYPE:STRING=${{ matrix.build_type }} \
-            -D CMAKE_C_COMPILER=$CC \
-            -D CMAKE_CXX_COMPILER=$CXX \
-            -D CMAKE_CXX_FLAGS='-Wall -Werror' \
-            -D CMAKE_INSTALL_PREFIX:PATH=${PRESSIO_INSTALL_DIR} \
-            -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-            ${{ matrix.cmake_extra_args }} \
-            -D PRESSIO_ENABLE_TESTS:BOOL=ON \
-            -D PRESSIO_ENABLE_TPL_EIGEN:BOOL=ON \
-            -D EIGEN_INCLUDE_DIR=/eigen/eigen-${{ env.eigen_version }} \
-            -D PRESSIO_LOG_INCLUDE_DIR=${GITHUB_WORKSPACE}/pressio-log/include \
-            -D PRESSIO_OPS_INCLUDE_DIR=${GITHUB_WORKSPACE}/pressio-ops/include
-
-      - name: Build
-        run: |
-          cmake --build builddir --target install
-
       - name: Example - include only
         working-directory: examples
         run: |
@@ -117,7 +96,7 @@ jobs:
             -I/eigen/eigen-${{ env.eigen_version }} \
             -I${GITHUB_WORKSPACE}/pressio-log/include \
             -I${GITHUB_WORKSPACE}/pressio-ops/include \
-            -I${PRESSIO_INSTALL_DIR}/include \
+            -I${GITHUB_WORKSPACE}/pressio/include \
             -c main.cpp                \
           && $CXX --std=c++17 -o pressio-example main.o \
           && ./pressio-example
@@ -130,11 +109,30 @@ jobs:
             -I/eigen/eigen-${{ env.eigen_version }} \
             -I${GITHUB_WORKSPACE}/pressio-log/include \
             -I${GITHUB_WORKSPACE}/pressio-ops/include \
-            -I${PRESSIO_INSTALL_DIR}/include \
+            -I${GITHUB_WORKSPACE}/pressio/include \
             -c main_with_defines.cpp   \
           && $CXX --std=c++17 -o pressio-example main.o \
           && ./pressio-example
 
+      - name: Configure Tests
+        run: |
+          cmake -B builddir \
+            -D CMAKE_BUILD_TYPE:STRING=${{ matrix.build_type }} \
+            -D CMAKE_C_COMPILER=$CC \
+            -D CMAKE_CXX_COMPILER=$CXX \
+            -D CMAKE_CXX_FLAGS='-Wall -Werror' \
+            -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+            ${{ matrix.cmake_extra_args }} \
+            -D PRESSIO_ENABLE_TESTS:BOOL=ON \
+            -D PRESSIO_ENABLE_TPL_EIGEN:BOOL=ON \
+            -D EIGEN_INCLUDE_DIR=/eigen/eigen-${{ env.eigen_version }} \
+            -D PRESSIO_LOG_INCLUDE_DIR=${GITHUB_WORKSPACE}/pressio-log/include \
+            -D PRESSIO_OPS_INCLUDE_DIR=${GITHUB_WORKSPACE}/pressio-ops/include
+
+      - name: Build Tests
+        run: |
+          cmake --build builddir
+
       - name: Run small tests
         working-directory: builddir/tests/functional_small
         run: |

diff --git a/.github/workflows/ci-kokkos.yml b/.github/workflows/ci-kokkos.yml
@@ -47,7 +47,6 @@ jobs:
         password: ${{ secrets.github_token }}
     env:
       num_cpus: 4
-      PRESSIO_INSTALL_DIR: ${{ github.workspace }}/pressio_install
 
     steps:
       - uses: actions/checkout@v4
@@ -73,25 +72,6 @@ jobs:
           path: pressio-ops
           ref: develop
 
-      - name: Configure
-        run: |
-          cmake -B builddir \
-            -D CMAKE_BUILD_TYPE:STRING=${{ matrix.build_type }} \
-            -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-            -D CMAKE_C_COMPILER:FILEPATH=$CC \
-            -D CMAKE_CXX_COMPILER:FILEPATH=$CXX \
-            -D PRESSIO_ENABLE_TESTS:BOOL=ON \
-            -D PRESSIO_ENABLE_TPL_EIGEN:BOOL=OFF \
-            -D PRESSIO_ENABLE_TPL_MPI:BOOL=OFF \
-            -D PRESSIO_ENABLE_TPL_KOKKOS:BOOL=ON \
-            -D Kokkos_ROOT=/kokkos/install \
-            -D KokkosKernels_ROOT=/kokkos-kernels/install \
-            -D CMAKE_INSTALL_PREFIX:PATH=${PRESSIO_INSTALL_DIR} \
-            -D CMAKE_CXX_FLAGS='-Wall -Werror'
-
-      - name: Build
-        run: cmake --build builddir -j $num_cpus --target install
-
       - name: Example - include only
         working-directory: examples
         run: |
@@ -102,7 +82,7 @@ jobs:
             -I/kokkos-kernels/install/include \
             -I${GITHUB_WORKSPACE}/pressio-log/include \
             -I${GITHUB_WORKSPACE}/pressio-ops/include \
-            -I${PRESSIO_INSTALL_DIR}/include \
+            -I${GITHUB_WORKSPACE}/pressio/include \
             -c main.cpp
 
       - name: Example - include only with embedded definitions
@@ -115,9 +95,27 @@ jobs:
             -I/kokkos-kernels/install/include \
             -I${GITHUB_WORKSPACE}/pressio-log/include \
             -I${GITHUB_WORKSPACE}/pressio-ops/include \
-            -I${PRESSIO_INSTALL_DIR}/include \
+            -I${GITHUB_WORKSPACE}/pressio/include \
             -c main_with_defines.cpp
 
+      - name: Configure Tests
+        run: |
+          cmake -B builddir \
+            -D CMAKE_BUILD_TYPE:STRING=${{ matrix.build_type }} \
+            -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+            -D CMAKE_C_COMPILER:FILEPATH=$CC \
+            -D CMAKE_CXX_COMPILER:FILEPATH=$CXX \
+            -D PRESSIO_ENABLE_TESTS:BOOL=ON \
+            -D PRESSIO_ENABLE_TPL_EIGEN:BOOL=OFF \
+            -D PRESSIO_ENABLE_TPL_MPI:BOOL=OFF \
+            -D PRESSIO_ENABLE_TPL_KOKKOS:BOOL=ON \
+            -D Kokkos_ROOT=/kokkos/install \
+            -D KokkosKernels_ROOT=/kokkos-kernels/install \
+            -D CMAKE_CXX_FLAGS='-Wall -Werror'
+
+      - name: Build Tests
+        run: cmake --build builddir -j $num_cpus
+
       - name: Test
         working-directory: builddir
         run: |

diff --git a/.github/workflows/ci-trilinos.yml b/.github/workflows/ci-trilinos.yml
@@ -45,7 +45,6 @@ jobs:
       eigen_version: 3.4.0
       num_cpus: 4
       trilinos_dir: /home/pressio_builds/trilinos/install
-      PRESSIO_INSTALL_DIR: ${{ github.workspace }}/pressio_install
 
     steps:
     - uses: actions/checkout@v4
@@ -78,56 +77,56 @@ jobs:
         && mkdir -p /eigen \
         && tar -xf eigen-${{ env.eigen_version }}.tar.gz -C /eigen
 
-    - name: Configure
-      run: |
-        cmake -B builddir \
-          -D CMAKE_BUILD_TYPE:STRING=${{ matrix.build_type }} \
-          -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-          -D CMAKE_C_COMPILER:FILEPATH=/usr/bin/mpicc \
-          -D CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/mpic++ \
-          -D MPI_Fortran_COMPILER:FILEPATH=/usr/bin/mpif90 \
-          -D PRESSIO_ENABLE_TESTS:BOOL=ON \
-          -D PRESSIO_ENABLE_TPL_EIGEN:BOOL=ON \
-          -D PRESSIO_ENABLE_TPL_MPI:BOOL=ON \
-          -D PRESSIO_ENABLE_TPL_TRILINOS:BOOL=ON \
-          -D PRESSIO_ENABLE_TPL_KOKKOS:BOOL=ON \
-          -D PRESSIO_ENABLE_TPL_BLAS:BOOL=ON \
-          -D PRESSIO_ENABLE_TPL_LAPACK:BOOL=ON \
-          -D EIGEN_INCLUDE_DIR=/eigen/eigen-${{ env.eigen_version }} \
-          -D Trilinos_DIR=${{ env.trilinos_dir }}/lib/cmake/Trilinos \
-          -D CMAKE_INSTALL_PREFIX:PATH=${PRESSIO_INSTALL_DIR} \
-          -D CMAKE_CXX_FLAGS='-Wall'
-
-    - name: Build
-      run: cmake --build builddir -j $num_cpus --target install
 
     - name: Example - include only
       working-directory: examples
       run: |
-        $CXX \
+          $CXX \
           --std=c++17 \
           -DPRESSIO_ENABLE_TPL_EIGEN    \
           -DPRESSIO_ENABLE_TPL_TRILINOS \
           -I/eigen/eigen-${{ env.eigen_version }} \
           -I$trilinos_dir/include       \
           -I${GITHUB_WORKSPACE}/pressio-log/include \
           -I${GITHUB_WORKSPACE}/pressio-ops/include \
-          -I${PRESSIO_INSTALL_DIR}/include \
+          -I${GITHUB_WORKSPACE}/pressio/include \
           -c main.cpp
 
     - name: Example - include only with embedded definitions
       working-directory: examples
       run: |
-        $CXX \
+          $CXX \
           --std=c++17 \
           -DPRESSIO_ENABLE_TPL_TRILINOS \
           -I/eigen/eigen-${{ env.eigen_version }} \
           -I$trilinos_dir/include       \
           -I${GITHUB_WORKSPACE}/pressio-log/include \
           -I${GITHUB_WORKSPACE}/pressio-ops/include \
-          -I${PRESSIO_INSTALL_DIR}/include \
+          -I${GITHUB_WORKSPACE}/pressio/include \
           -c main_with_defines.cpp
 
+    - name: Configure Tests
+      run: |
+        cmake -B builddir \
+          -D CMAKE_BUILD_TYPE:STRING=${{ matrix.build_type }} \
+          -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+          -D CMAKE_C_COMPILER:FILEPATH=/usr/bin/mpicc \
+          -D CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/mpic++ \
+          -D MPI_Fortran_COMPILER:FILEPATH=/usr/bin/mpif90 \
+          -D PRESSIO_ENABLE_TESTS:BOOL=ON \
+          -D PRESSIO_ENABLE_TPL_EIGEN:BOOL=ON \
+          -D PRESSIO_ENABLE_TPL_MPI:BOOL=ON \
+          -D PRESSIO_ENABLE_TPL_TRILINOS:BOOL=ON \
+          -D PRESSIO_ENABLE_TPL_KOKKOS:BOOL=ON \
+          -D PRESSIO_ENABLE_TPL_BLAS:BOOL=ON \
+          -D PRESSIO_ENABLE_TPL_LAPACK:BOOL=ON \
+          -D EIGEN_INCLUDE_DIR=/eigen/eigen-${{ env.eigen_version }} \
+          -D Trilinos_DIR=${{ env.trilinos_dir }}/lib/cmake/Trilinos \
+          -D CMAKE_CXX_FLAGS='-Wall'
+
+    - name: Build Tests
+      run: cmake --build builddir -j $num_cpus
+
     - name: Test
       working-directory: builddir
       run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,115 +1,10 @@
 cmake_minimum_required(VERSION 3.18.0 FATAL_ERROR)
 project(pressio C CXX)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-include(colors)
-
-# pull in pressio-ops and read macros
-#=====================================================================
-if(PRESSIO_OPS_INCLUDE_DIR)
-  message("${Green}-- Using ${PRESSIO_OPS_INCLUDE_DIR}")
-else()
-  include(FetchContent)
-  message("${Green}-- PRESSIO_OPS_INCLUDE_DIR is not defined, so fetching pressio-ops...")
-  FetchContent_Declare(
-    pressio-ops
-    GIT_REPOSITORY https://github.com/Pressio/pressio-ops.git
-    GIT_TAG        develop
-    GIT_PROGRESS   TRUE
-    GIT_SHALLOW    TRUE
-  )
-  FetchContent_MakeAvailable(pressio-ops)
-  set(PRESSIO_OPS_INCLUDE_DIR ${pressio-ops_SOURCE_DIR}/include)
-endif()
-
-# logging
-#=====================================================================
-option(PRESSIO_ENABLE_LOGGING "Enable logging via pressio-log" ON)
-if (PRESSIO_ENABLE_LOGGING)
-  add_compile_definitions(PRESSIO_ENABLE_LOGGING=1)
-else()
-  add_compile_definitions(PRESSIO_ENABLE_LOGGING=0)
-endif()
-
-# get pressio-log (either find it or fetch it)
-message(STATUS "PRESSIO_ENABLE_LOGGING = ${PRESSIO_ENABLE_LOGGING}")
-if (PRESSIO_ENABLE_LOGGING)
-  if(PRESSIO_LOG_INCLUDE_DIR)
-    message("${Green}-- Using ${PRESSIO_LOG_INCLUDE_DIR}")
-  else()
-    include(FetchContent)
-    message("${Green}-- PRESSIO_LOG_INCLUDE_DIR is not defined, so fetching pressio-log...")
-    FetchContent_Declare(
-      pressio-log
-      GIT_REPOSITORY https://github.com/Pressio/pressio-log.git
-      GIT_TAG        main
-      GIT_PROGRESS   TRUE
-      GIT_SHALLOW    TRUE
-    )
-    FetchContent_MakeAvailable(pressio-log)
-    set(PRESSIO_LOG_INCLUDE_DIR ${pressio-log_SOURCE_DIR}/include)
-  endif()
-else()
-  message(STATUS "Logging has been disabled (PRESSIO_ENABLE_LOGGING=OFF)")
-endif()
-
-# versioning
-#=====================================================================
-# adapted from Eigen
-file(READ "${PRESSIO_OPS_INCLUDE_DIR}/pressio/ops_macros.hpp" _pressio_macros)
-
-string(REGEX MATCH "define[ \t]+PRESSIO_MAJOR_VERSION[ \t]+([0-9]+)" _pressio_major_version_match "${_pressio_macros}")
-set(PRESSIO_MAJOR_VERSION "${CMAKE_MATCH_1}")
-string(REGEX MATCH "define[ \t]+PRESSIO_MINOR_VERSION[ \t]+([0-9]+)" _pressio_minor_version_match "${_pressio_macros}")
-set(PRESSIO_MINOR_VERSION "${CMAKE_MATCH_1}")
-string(REGEX MATCH "define[ \t]+PRESSIO_PATCH_VERSION[ \t]+([0-9]+)" _pressio_patch_version_match "${_pressio_macros}")
-set(PRESSIO_PATCH_VERSION "${CMAKE_MATCH_1}")
-set(PRESSIO_VERSION_NUMBER ${PRESSIO_MAJOR_VERSION}.${PRESSIO_MINOR_VERSION}.${PRESSIO_PATCH_VERSION})
-message("${Magenta}>> PRESSIO: version = ${PRESSIO_VERSION_NUMBER} ${ColourReset}")
-
-# c++ standard
-#=====================================================================
-if (NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 17)
-  set(CMAKE_CXX_STANDARD_REQUIRED ON)
-  set(CMAKE_CXX_EXTENSIONS OFF)
-endif()
-
-message("${Magenta}>> PRESSIO: CMAKE_CXX_STANDARD is set to ${CMAKE_CXX_STANDARD} ${ColourReset}")
-
-if(CMAKE_CXX_STANDARD STREQUAL "17"
-    OR CMAKE_CXX_STANDARD STREQUAL "20")
-  if(NOT "cxx_std_${CMAKE_CXX_STANDARD}" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
-    message(FATAL_ERROR "Compiler does not support C++${CMAKE_CXX_STANDARD}. This is required.")
-  endif()
-endif()
-
-
-# install headers
-#=====================================================================
-include(GNUInstallDirs)
-
-install(
-  DIRECTORY include/pressio
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
 # tests
 #=====================================================================
+option(PRESSIO_ENABLE_TESTS "Enable testing for pressio" OFF)
 if(PRESSIO_ENABLE_TESTS)
-  add_library(pressio INTERFACE)
-
-  target_include_directories(
-    pressio INTERFACE
-    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include;${PRESSIO_OPS_INCLUDE_DIR}>"
-  )
-
-  if (PRESSIO_ENABLE_LOGGING)
-    target_include_directories(
-      pressio INTERFACE
-      "$<BUILD_INTERFACE:${PRESSIO_LOG_INCLUDE_DIR}>"
-    )
-  endif()
-
   enable_testing()
   add_subdirectory(tests)
 endif()
diff --git a/docs/source/components/ode_concepts.rst b/docs/source/components/ode_concepts.rst
@@ -9,20 +9,20 @@ Concepts
 System
 ~~~~~~
 
-.. literalinclude:: ../../../include/pressio/ode/concepts/ode_system_cxx20.hpp
+.. literalinclude:: ../../../include/pressio/ode/concepts/ode_system.hpp
    :language: cpp
    :lines: 8-101, 213
 
 Real-valued system refinement
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../../../include/pressio/ode/concepts/ode_system_cxx20.hpp
+.. literalinclude:: ../../../include/pressio/ode/concepts/ode_system.hpp
    :language: cpp
    :lines: 8-9, 105-154, 213
 
 Others
 ~~~~~~
 
-.. literalinclude:: ../../../include/pressio/ode/concepts/ode_others_cxx20.hpp
+.. literalinclude:: ../../../include/pressio/ode/concepts/ode_others.hpp
    :language: cpp
    :lines: 7-90