make PETSc optional for now

exasim-project · Dec 26, 2024 · e869a66 · e869a66
1 parent 9579710
commit e869a66
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,8 +30,8 @@ option(NEOFOAM_BUILD_BENCHMARKS "Build benchmarks" OFF)
 option(NEOFOAM_BUILD_DOC "Build documentation" OFF)
 option(NEOFOAM_WITH_SUNDIALS "Build NeoFOAM with Sundials support [currently required]" ON)
 
-option(NEOFOAM_ENABLE_GINKGO "Enable using Ginkgo as linear algebra backend." ON)
-option(NEOFOAM_ENABLE_PETSC "Enable using PETSc as linear algebra backend." ON)
+option(NEOFOAM_WITH_GINKGO "Enable using Ginkgo as linear algebra backend." ON)
+option(NEOFOAM_WITH_PETSC "Enable using PETSc as linear algebra backend." OFF)
 
 option(NEOFOAM_ENABLE_SANITIZE_ADDRESS "Enable address sanitizer" OFF)
 option(NEOFOAM_ENABLE_SANITIZE_LEAK "Enable leak sanitizer" OFF)

diff --git a/cmake/CxxThirdParty.cmake b/cmake/CxxThirdParty.cmake
@@ -97,7 +97,7 @@ cpmaddpackage(
   3.2.0
   SYSTEM)
 
-if(NEOFOAM_ENABLE_GINKGO)
+if(NEOFOAM_WITH_GINKGO)
   set(GINKGO_BUILD_TESTS
       OFF
       CACHE INTERNAL "")
@@ -119,7 +119,7 @@ if(NEOFOAM_ENABLE_GINKGO)
     SYSTEM)
 endif()
 
-if(NEOFOAM_ENABLE_PETSC)
+if(NEOFOAM_WITH_PETSC)
   find_package(PkgConfig REQUIRED)
   pkg_search_module(PETSc REQUIRED IMPORTED_TARGET PETSc)
 endif()

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -13,18 +13,18 @@ set_property(
   APPEND
   PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}")
 
-if(NEOFOAM_ENABLE_GINKGO)
+if(NEOFOAM_WITH_GINKGO)
   target_link_libraries(NeoFOAM_public_api INTERFACE Ginkgo::ginkgo)
   target_compile_definitions(NeoFOAM_public_api INTERFACE NF_WITH_GINKGO=1)
 else()
-  target_compile_definitions(NeoFOAM_public_api INTERFACE NF_WITH_GINKGO=1)
+  target_compile_definitions(NeoFOAM_public_api INTERFACE NF_WITH_GINKGO=0)
 endif()
 
-if(NEOFOAM_ENABLE_PETSC)
+if(NEOFOAM_WITH_PETSC)
   target_link_libraries(NeoFOAM_public_api INTERFACE PkgConfig::PETSc)
   target_compile_definitions(NeoFOAM_public_api INTERFACE NF_WITH_PETSC=1)
 else()
-  target_compile_definitions(NeoFOAM_public_api INTERFACE NF_WITH_PETSC=1)
+  target_compile_definitions(NeoFOAM_public_api INTERFACE NF_WITH_PETSC=0)
 endif()
 
 if(${CMAKE_BUILD_TYPE} MATCHES Debug)

diff --git a/test/catch2/test_main.cpp b/test/catch2/test_main.cpp
@@ -10,7 +10,9 @@
 
 #include <Kokkos_Core.hpp>
 
+#if NF_WITH_PETSC
 #include <petsc.h>
+#endif
 
 int main(int argc, char* argv[])
 {
@@ -19,7 +21,9 @@ int main(int argc, char* argv[])
     Kokkos::initialize(argc, argv);
 
     // Initialize Petsc
+#if NF_WITH_PETSC
     PetscCall(PetscInitialize(&argc, &argv, nullptr, nullptr));
+#endif
 
     // ensure any kokkos initialization output will appear first
     std::cout << std::flush;

diff --git a/test/core/CMakeLists.txt b/test/core/CMakeLists.txt
@@ -7,7 +7,6 @@ endif()
 
 add_subdirectory(primitives)
 add_subdirectory(database)
-add_subdirectory(linearAlgebra)
 
 neofoam_unit_test(dictionary)
 neofoam_unit_test(tokenList)