exasim-project · greole · May 23, 2025 · May 20, 2025 · May 20, 2025 · May 20, 2025
diff --git a/.github/workflows/build_adapter.yaml b/.github/workflows/build_adapter.yaml
@@ -90,6 +90,7 @@ jobs:
          cmake --preset develop \
            -DNeoN_DEVEL_TOOLS=OFF \
            -DNeoN_BUILD_TESTS=OFF \
+           -DFOAMADAPTER_BUILD_BENCHMARKS=OFF \
            -DNeoN_ENABLE_MPI_WITH_THREAD_SUPPORT=OFF \
            -DFOAMADAPTER_NEON_VERSION=${{env.checkout}}
          cmake --build  --preset develop

diff --git a/.github/workflows/static_checks.yaml b/.github/workflows/static_checks.yaml
@@ -47,6 +47,7 @@ jobs:
         cmake --preset develop \
           -DNeoN_DEVEL_TOOLS=OFF \
           -DNeoN_WITH_GINKGO=OFF \
+          -DNeoN_WITH_SUNDIALS=OFF \
           -DCMAKE_CXX_COMPILER=clang++-18 \
           -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
           -DNeoN_ENABLE_MPI_WITH_THREAD_SUPPORT=OFF \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -180,3 +180,59 @@ if(NeoN_ENABLE_IWYU)
 endif()
 
 include(cmake/banner.cmake)
+
+install(
+  TARGETS NeoN NeoN_public_api NeoN_options NeoN_warnings
+  EXPORT NeoNTargets
+  INCLUDES
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+install(
+  EXPORT NeoNTargets
+  FILE NeoNTargets.cmake
+  NAMESPACE NeoN::
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/NeoN)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/NeoN/NeoN.hpp
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/NeoN)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/NeoN/
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/NeoN)
+
+include(CMakePackageConfigHelpers)
+configure_package_config_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/NeoNConfig.cmake.in
+  "${CMAKE_CURRENT_BINARY_DIR}/NeoNConfig.cmake"
+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/NeoN)
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/NeoNConfig.cmake"
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/NeoN)
+
+# install internal ginkgo version
+if(ginkgo_POPULATED)
+  install(
+    TARGETS ginkgo
+    EXPORT GinkgoTargets
+    INCLUDES
+    DESTINATION include)
+  install(EXPORT GinkgoTargets NAMESPACE Ginkgo::)
+endif()
+
+# install internal cpptrace version
+if(cpptrace_POPULATED)
+  install(
+    TARGETS cpptrace
+    EXPORT CpptraceTargets
+    INCLUDES
+    DESTINATION include)
+  install(EXPORT CpptraceTargets NAMESPACE cpptrace::)
+endif()
+
+# install internal sundials version if(sundials_POPULATED) install( TARGETS cvode nvec arkode
+# sundials_core_shared EXPORT SundialsTargets INCLUDES DESTINATION include) install(EXPORT
+# SundialsTargets NAMESPACE SUNDIALS::) endif()
+
+if(NOT kokkos_POPULATED)
+  export(EXPORT NeoNTargets FILE "${CMAKE_CURRENT_BINARY_DIR}/NeoNTargets.cmake")
+else()
+  message(WARNING "Unable to create NeoNTargets.cmake with bundled Kokkos")
+endif()
diff --git a/cmake/CxxThirdParty.cmake b/cmake/CxxThirdParty.cmake
@@ -1,6 +1,8 @@
 # SPDX-License-Identifier: Unlicense
 # SPDX-FileCopyrightText: 2023 NeoN authors
 
+# set(FETCHCONTENT_BASE_DIR ${CMAKE_BINARY_DIR}/cmake_packages)
+
 set(NeoN_KOKKOS_CHECKOUT_VERSION
     "4.3.00"
     CACHE STRING "Use specific version of Kokkos")
@@ -36,7 +38,7 @@ endif()
 
 find_package(Kokkos ${NeoN_KOKKOS_CHECKOUT_VERSION} QUIET)
 
-if(NOT ${Kokkos_FOUND})
+if(NOT Kokkos_FOUND)
   include(FetchContent)
   include(cmake/AutoEnableDevice.cmake)
 
@@ -63,14 +65,8 @@ cpmaddpackage(
   0.7.3
   SYSTEM)
 
-cpmaddpackage(
-  NAME
-  nlohmann_json
-  VERSION
-  3.11.3
-  URL
-  https://github.com/nlohmann/json/releases/download/v3.11.3/include.zip
-  SYSTEM)
+# currently unused cpmaddpackage( NAME nlohmann_json VERSION 3.11.3 URL
+# https://github.com/nlohmann/json/releases/download/v3.11.3/include.zip SYSTEM)
 
 if(${NeoN_WITH_ADIOS2})
 
@@ -141,35 +137,23 @@ if(${NeoN_WITH_SUNDIALS})
 
   cpmaddpackage(
     NAME
-    sundials
+    SUNDIALS
     GITHUB_REPOSITORY
     LLNL/sundials
     VERSION
-    7.1.1
+    7.3.0
     SYSTEM
     YES
     OPTIONS
     ${SUNDIALS_OPTIONS}
     ${SUNDIALS_CUDA_OPTIONS})
 endif()
 
-cpmaddpackage(
-  NAME
-  spdlog
-  URL
-  https://github.com/gabime/spdlog/archive/refs/tags/v1.13.0.zip
-  VERSION
-  1.13.0
-  SYSTEM)
+# currently no
AE88
t used cpmaddpackage( NAME spdlog URL
+# https://github.com/gabime/spdlog/archive/refs/tags/v1.13.0.zip VERSION 1.13.0 SYSTEM)
 
-cpmaddpackage(
-  NAME
-  cxxopts
-  URL
-  https://github.com/jarro2783/cxxopts/archive/refs/tags/v3.2.0.zip
-  VERSION
-  3.2.0
-  SYSTEM)
+# currently not used cpmaddpackage( NAME cxxopts URL
+# https://github.com/jarro2783/cxxopts/archive/refs/tags/v3.2.0.zip VERSION 3.2.0 SYSTEM)
 
 if(${NeoN_WITH_GINKGO})
   cpmaddpackage(

diff --git a/cmake/NeoNConfig.cmake.in b/cmake/NeoNConfig.cmake.in
@@ -0,0 +1,32 @@
+# SPDX-License-Identifier: Unlicense
+# SPDX-FileCopyrightText: 2025 NeoN authors
+
+@PACKAGE_INIT@
+
+#check_required_components(NeoN)
+
+include(CMakeFindDependencyMacro)
+
+set(NeoN_WITH_ADIOS2 @NeoN_WITH_ADIOS2@)
+set(NeoN_WITH_GINKGO @NeoN_WITH_GINKGO@)
+set(NeoN_WITH_SUNDIALS @NeoN_WITH_SUNDIALS@)
+set(NeoN_WITH_PETSC @NeoN_WITH_PETSC@)
+
+find_dependency(Kokkos REQUIRED)
+find_dependency(cpptrace REQUIRED)
+#find_dependency(nlohmann_json REQUIRED)
+#find_dependency(spdlog REQUIRED)
+
+if(${NeoN_WITH_GINKGO})
+find_dependency(Ginkgo REQUIRED)
+endif()
+
+if(${NeoN_WITH_SUNDIALS})
+find_dependency(SUNDIALS REQUIRED)
+endif()
+
+if(${NeoN_WITH_ADIOS2})
+find_dependency(adios2 REQUIRED)
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/NeoNTargets.cmake")
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -2,16 +2,14 @@
 # SPDX-FileCopyrightText: 2023 NeoN authors
 
 add_library(NeoN_public_api INTERFACE) # dummy target
+add_library(NeoN::NeoN_public_api ALIAS NeoN_public_api) # dummy target
 
-set_property(
-  TARGET NeoN_public_api
-  APPEND
-  PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}")
+# set_property( TARGET NeoN_public_api APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+# "${CMAKE_CURRENT_BINARY_DIR}")
 
-set_property(
-  TARGET NeoN_public_api
-  APPEND
-  PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}")
+target_include_directories(
+  NeoN_public_api INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:.>)
 
 if(NeoN_WITH_GINKGO)
   target_link_libraries(NeoN_public_api INTERFACE Ginkgo::ginkgo)
@@ -21,6 +19,16 @@ else()
   target_compile_definitions(NeoN_public_api INTERFACE NF_WITH_GINKGO=0)
 endif()
 
+if(NeoN_WITH_SUNDIALS)
+  target_compile_definitions(NeoN_public_api INTERFACE NN_WITH_SUNDIALS=1)
+  target_link_libraries(NeoN_public_api INTERFACE SUNDIALS::arkode SUNDIALS::nvecserial
+                                                  SUNDIALS::core)
+else()
+  target_compile_definitions(NeoN_public_api INTERFACE NN_WITH_SUNDIALS=0)
+endif()
+
+target_link_libraries(NeoN_public_api INTERFACE cpptrace::cpptrace Kokkos::kokkos)
+
 if(NeoN_WITH_PETSC)
   add_definitions(${PETSc_DEFINITIONS})
   target_link_libraries(NeoN_public_api INTERFACE ${PETSc_LIBRARIES})
@@ -55,7 +63,10 @@ if(NeoN_ENABLE_MPI_SUPPORT)
 endif()
 
 # Get list of some *.hpp files in folder include
-file(GLOB_RECURSE include_files *.hpp)
+file(
+  GLOB_RECURSE include_files
+  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/
+  *.hpp)
 
 # Convert the list of files into #includes
 foreach(include_file ${include_files})

diff --git a/include/NeoN/timeIntegration/rungeKutta.hpp b/include/NeoN/timeIntegration/rungeKutta.hpp
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#if NN_WITH_SUNDIALS
+
 #include <functional>
 #include <memory>
 
@@ -192,3 +194,5 @@ class RungeKutta :
 };
 
 } // namespace NeoN
+
+#endif
diff --git a/include/NeoN/timeIntegration/sundials.hpp b/include/NeoN/timeIntegration/sundials.hpp
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#if NN_WITH_SUNDIALS
+
 #include <concepts>
 #include <functional>
 #include <memory>
@@ -487,3 +489,5 @@ class SKVector
     SKVectorVariant vector_; /**< Variant storing executor-specific vector implementation */
 };
 }
+
+#endif
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2,6 +2,7 @@
 # SPDX-FileCopyrightText: 2023 NeoN authors
 
 add_library(NeoN ${NeoN_LIB_TYPE})
+add_library(NeoN::NeoN ALIAS NeoN) # dummy target
 
 include(GNUInstallDirs)
 
@@ -64,8 +65,7 @@ enable_sanitizers(NeoN NeoN_ENABLE_SANITIZE_ADDRESS NeoN_ENABLE_SANITIZE_LEAK
                   NeoN_ENABLE_SANITIZE_UB NeoN_ENABLE_SANITIZE_THREAD NeoN_ENABLE_SANITIZE_MEMORY)
 
 target_link_libraries(NeoN PRIVATE NeoN_warnings NeoN_options)
-target_link_libraries(NeoN PUBLIC NeoN_public_api Kokkos::kokkos sundials_core sundials_arkode
-                                  sundials_nvecserial cpptrace::cpptrace)
+target_link_libraries(NeoN PUBLIC NeoN_public_api)
 
 if(NeoN_ENABLE_MPI_SUPPORT)
   target_link_libraries(NeoN PUBLIC MPI::MPI_CXX)
@@ -77,5 +77,3 @@ if(WIN32)
                LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<0:>
                ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/$<0:>)
 endif()
-
-install(TARGETS NeoN)
diff --git a/src/timeIntegration/rungeKutta.cpp b/src/timeIntegration/rungeKutta.cpp
@@ -3,6 +3,8 @@
 
 #include "NeoN/timeIntegration/rungeKutta.hpp"
 
+#if NN_WITH_SUNDIALS
+
 namespace NeoN::timeIntegration
 {
 
@@ -146,3 +148,5 @@ void RungeKutta<SolutionVectorType>::initODEMemory(const scalar t)
 
 template class RungeKutta<finiteVolume::cellCentred::VolumeField<scalar>>;
 }
+
+#endif
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -27,6 +27,7 @@ function(NeoN_unit_test TEST)
   endif()
 
   add_executable(${NeoN_COMMAND} "${TEST}.cpp")
+  install(TARGETS ${NeoN_COMMAND})
 
   if(NeoN_WITH_PETSC)
     target_link_libraries(${NeoN_COMMAND} PRIVATE ${PETSc_LIBRARIES})
@@ -39,8 +40,7 @@ function(NeoN_unit_test TEST)
   target_include_directories(${NeoN_COMMAND} PRIVATE "${TEST_CATCH2_DIR}")
   set_target_properties(${NeoN_COMMAND} PROPERTIES OUTPUT_NAME ${TEST})
 
-  target_link_libraries(${NeoN_COMMAND} PRIVATE NeoN_warnings NeoN_options Kokkos::kokkos NeoN
-                                                cpptrace::cpptrace)
+  target_link_libraries(${NeoN_COMMAND} PRIVATE NeoN_warnings NeoN_options NeoN cpptrace::cpptrace)
   if(NOT NeoN_MPI_SIZE)
     target_link_libraries(${NeoN_COMMAND} PRIVATE NeoN_catch_main)
   else()

diff --git a/test/core/CMakeLists.txt b/test/core/CMakeLists.txt
@@ -19,7 +19,7 @@ neon_unit_test(segmentedVector)
 
 add_executable(runTimeSelectionFactory "runTimeSelectionFactory.cpp")
 target_link_libraries(runTimeSelectionFactory PRIVATE Catch2::Catch2WithMain cpptrace::cpptrace
-                                                      NeoN_public_api)
+                                                      NeoN::NeoN_public_api)
 if(WIN32)
   set_target_properties(
     runTimeSelectionFactory

diff --git a/test/core/runTimeSelectionFactory.cpp b/test/core/runTimeSelectionFactory.cpp
@@ -9,6 +9,7 @@
 #include <catch2/catch_template_test_macros.hpp>
 #include <catch2/catch_approx.hpp>
 
+// #include "NeoN/NeoN.hpp"
 #include "NeoN/core/runtimeSelectionFactory.hpp"
 
 class BaseClass : public NeoN::RuntimeSelectionFactory<BaseClass, NeoN::Parameters<>>

diff --git a/test/linearAlgebra/sparsityPattern.cpp b/test/linearAlgebra/sparsityPattern.cpp
@@ -35,7 +35,6 @@ TEST_CASE("SparsityPattern")
 
     SECTION("has correct diagOffs" + execName)
     {
-        auto sp = SparsityPattern {mesh};
         auto diagOffs = sp.diagOffset().copyToHost();
         auto diagOffsS = diagOffs.view();
 

diff --git a/test/timeIntegration/CMakeLists.txt b/test/timeIntegration/CMakeLists.txt
@@ -3,6 +3,6 @@
 
 neon_unit_test(timeIntegration)
 neon_unit_test(implicitTimeIntegration)
-if(NOT WIN32)
+if(NOT WIN32 AND NeoN_WITH_SUNDIALS)
   neon_unit_test(rungeKutta)
 endif()