use config file instead of target compile definitions

This commit updates PCMS configuration options to use a configuration file. This should do a better job of ensuring that downstream applications are setting up the correct configuration options if they do not build with CMake. It also has the benefit of making it easier to identify what options PCMS was configured with without parsing the CMake package files.

Author: jacobmerson

CMakeLists.txt

@@ -25,7 +25,7 @@ option(PCMS_ENABLE_XGC "enable xgc field adapter" ON)
 option(PCMS_ENABLE_OMEGA_H "enable Omega_h field adapter" OFF)
 option(PCMS_ENABLE_C "Enable pcms C api" ON)
 
-option(PCMS_PRINT_ENABLED "PCMS print statements enabled" ON)
+option(PCMS_ENABLE_PRINT "PCMS print statements enabled" ON)
 option(PCMS_ENABLE_SPDLOG "use spdlog for logging" ON)
 
 if(PCMS_ENABLE_SPDLOG)

src/CMakeLists.txt

@@ -41,6 +41,9 @@ set(PCMS_SOURCES
     pcms/adapter/xgc/xgc_field_adapter.h)
 
 configure_file(pcms/version.h.in pcms/version.h)
+configure_file(pcms/configuration.h.in pcms/configuration.h)
+list(APPEND PCMS_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/pcms/version.h ${CMAKE_CURRENT_BINARY_DIR}/pcms/configuration.h)
+
 
 if(PCMS_ENABLE_XGC)
   list(APPEND PCMS_SOURCES pcms/adapter/xgc/xgc_reverse_classification.cpp)
@@ -70,25 +73,14 @@ target_link_libraries(pcms_core PUBLIC meshfields::meshfields redev::redev
                                        MPI::MPI_CXX Kokkos::kokkos perfstubs)
 if(PCMS_ENABLE_OMEGA_H)
   target_link_libraries(pcms_core PUBLIC Omega_h::omega_h)
-  target_compile_definitions(pcms_core PUBLIC -DPCMS_HAS_OMEGA_H)
-endif()
-if(PCMS_ENABLE_SERVER)
-  target_compile_definitions(pcms_core PUBLIC -DPCMS_HAS_SERVER)
 endif()
 
 if(PCMS_HAS_ASAN)
   target_compile_options(pcms_core PRIVATE -fsanitize=address
                                            -fno-omit-frame-pointer)
 endif()
 
-if(PCMS_PRINT_ENABLED)
-  add_definitions(-DPCMS_PRINT_ENABLED)
-  target_compile_definitions(pcms_core INTERFACE -DPCMS_PRINT_ENABLED)
-endif()
-
 if(PCMS_ENABLE_SPDLOG)
-  add_definitions(-DPCMS_SPDLOG_ENABLED)
-  target_compile_definitions(pcms_core INTERFACE -DPCMS_SPDLOG_ENABLED)
   target_link_libraries(pcms_core PUBLIC spdlog::spdlog)
 endif()
 

src/pcms.cpp

@@ -9,7 +9,7 @@ static_assert(std::is_same_v<LO, redev::LO>,
               "pcms and redev LO types must match");
 static_assert(std::is_same_v<GO, redev::GO>,
               "pcms and redev GO types must match");
-#ifdef PCMS_HAS_OMEGA_H
+#ifdef PCMS_ENABLE_OMEGA_H
 static_assert(std::is_same_v<Real, Omega_h::Real>,
               "pcms and Omega_h real types must match");
 static_assert(std::is_same_v<LO, Omega_h::LO>,

src/pcms.h

@@ -1,6 +1,7 @@
 #ifndef PCMS_H_
 #define PCMS_H_
 
+#include "pcms/configuration.h"
 #include "pcms/common.h"
 #include "pcms/field_communicator.h"
 #include "pcms/adapter/omega_h/omega_h_field.h"

src/pcms/adapter/xgc/xgc_reverse_classification.h

@@ -8,8 +8,9 @@
 #include "mdspan/mdspan.hpp"
 #include "pcms/arrays.h"
 #include "pcms/memory_spaces.h"
+#include "pcms/configuration.h"
 // #include <filesystem>
-#ifdef PCMS_HAS_OMEGA_H
+#ifdef PCMS_ENABLE_OMEGA_H
 #include <Omega_h_mesh.hpp>
 #include "pcms/assert.h"
 #endif
@@ -86,7 +87,7 @@ ReverseClassificationVertex ReadReverseClassificationVertex(std::string,
                                                             MPI_Comm,
                                                             int root = 0);
 
-#ifdef PCMS_HAS_OMEGA_H
+#ifdef PCMS_ENABLE_OMEGA_H
 enum class IndexBase
 {
   Zero = 0,

src/pcms/capi/client.cpp

@@ -13,13 +13,7 @@ namespace pcms
 using FieldAdapterVariant =
   std::variant<std::monostate, pcms::XGCFieldAdapter<double>,
                pcms::XGCFieldAdapter<float>, pcms::XGCFieldAdapter<int>,
-               pcms::XGCFieldAdapter<long>, pcms::DummyFieldAdapter
-               // #ifdef PCMS_HAS_OMEGA_H
-               //                ,
-               //                pcms::OmegaHFieldAdapter<double>,
-               //                pcms::OmegaHFieldAdapter<int>
-               // #endif
-               >;
+               pcms::XGCFieldAdapter<long>, pcms::DummyFieldAdapter>;
 
 } // namespace pcms
 

src/pcms/configuration.h.in

@@ -0,0 +1,8 @@
+#cmakedefine PCMS_ENABLE_SERVER
+#cmakedefine PCMS_ENABLE_CLIENT
+#cmakedefine PCMS_ENABLE_XGC
+#cmakedefine PCMS_ENABLE_OMEGA_H
+#cmakedefine PCMS_ENABLE_C
+#cmakedefine PCMS_ENABLE_PRINT
+#cmakedefine PCMS_ENABLE_SPDLOG
+#cmakedefine PCMS_ENABLE_Fortran

src/pcms/print.h

@@ -1,7 +1,7 @@
 #ifndef PCMS_PRINT_H
 #define PCMS_PRINT_H
 
-#ifdef PCMS_SPDLOG_ENABLED
+#ifdef PCMS_ENABLE_SPDLOG
 #include "spdlog/spdlog.h"
 #include <spdlog/fmt/bundled/printf.h>
 #endif
@@ -25,24 +25,24 @@ void setStderr(FILE* err);
 template <typename... Args>
 void printError(const char* fmt, const Args&... args)
 {
-#if defined(PCMS_SPDLOG_ENABLED) && defined(PCMS_PRINT_ENABLED)
+#if defined(PCMS_ENABLE_SPDLOG) && defined(PCMS_ENABLE_PRINT)
   spdlog::error("{}", fmt::sprintf(fmt, args...));
-#elif defined(PCMS_PRINT_ENABLED)
+#elif defined(PCMS_ENABLE_PRINT)
   fprintf(getStdout(), fmt, args...);
 #endif
 }
 
 template <typename... Args>
 KOKKOS_INLINE_FUNCTION void printInfo(const char* fmt, const Args&... args)
 {
-#if defined(PCMS_SPDLOG_ENABLED) && defined(PCMS_PRINT_ENABLED) &&             \
+#if defined(PCMS_ENABLE_SPDLOG) && defined(PCMS_ENABLE_PRINT) &&               \
   !defined(ACTIVE_GPU_EXECUTION)
   spdlog::info("{}", fmt::sprintf(fmt, args...));
-#elif defined(PCMS_PRINT_ENABLED) && !defined(ACTIVE_GPU_EXECUTION)
+#elif defined(PCMS_ENABLE_PRINT) && !defined(ACTIVE_GPU_EXECUTION)
   fprintf(getStdout(), fmt, args...);
 #endif
 }
 
 } // namespace pcms
 
-#endif // PCMS_PRINT_H
+#endif // PCMS_PRINT_H