Merge pull request #17 from lanl/feature/reorg

first pass at reorganziing singularity-eos

Author: dholladay00

.gitignore

@@ -1,3 +1,5 @@
+bin
 .spack*
 spack.lock
+utils/variant
 *__pycache__*

CMakeLists.txt

@@ -84,9 +84,11 @@ execute_process(COMMAND patch -N -s -V never
 add_library (singularity-eos::flags INTERFACE IMPORTED GLOBAL)
 add_library (singularity-eos::libs INTERFACE IMPORTED)
 
+# TODO: Is this generator expression correct/needed?
 target_include_directories(singularity-eos::flags
                            INTERFACE
-                           $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>)
+                           $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
+                           $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/utils>)
 
 # xl fix
 target_compile_options(singularity-eos::flags INTERFACE
@@ -160,7 +162,10 @@ if (SINGULARITY_USE_KOKKOS)
         set(Kokkos_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE ON CACHE BOOL "" FORCE)
       endif()
       add_subdirectory(${PROJECT_SOURCE_DIR}/utils/kokkos)
-      #set(Kokkos_ROOT ${PROJECT_BINARY_DIR}/utils/kokkos)
+      install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/utils/kokkos"
+	DESTINATION "include"
+	FILES_MATCHING PATTERN "*.hpp"
+	)
     endif()
   endif()
   # cuda specific flags
@@ -190,9 +195,6 @@ if (SINGULARITY_USE_KOKKOS)
     endif()
   endif()
   target_link_libraries(singularity-eos::libs INTERFACE Kokkos::kokkos)
-else()
-  target_include_directories(singularity-eos::libs INTERFACE
-                             $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/utils/herumi-fmath>)
 endif ()
 
 # linear algebra library
@@ -248,8 +250,14 @@ if(SINGULARITY_USE_KOKKOSKERNELS)
                              SINGULARITY_USE_KOKKOSKERNELS)
 else()
   # Eigen
-  find_package(Eigen3 REQUIRED)
-  target_link_libraries(singularity-eos::flags INTERFACE Eigen3::Eigen)
+  if (NOT TARGET Eigen3::Eigen)
+    find_package(Eigen3 REQUIRED)
+    target_link_libraries(singularity-eos::flags INTERFACE Eigen3::Eigen)
+    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/utils/eigen"
+      DESTINATION "include"
+      FILES_MATCHING PATTERN "*.hpp"
+      )
+  endif()
 endif()
 
 if (SINGULARITY_USE_EOSPAC)
@@ -293,49 +301,77 @@ if(SINGULARITY_BUILD_TESTS)
   include(${PROJECT_SOURCE_DIR}/utils/spiner/Catch2/contrib/Catch.cmake)
 endif()
 
-add_subdirectory(eos)
+add_subdirectory(${PROJECT_SOURCE_DIR}/singularity-eos/eos)
 if (SINGULARITY_BUILD_TESTS)
   add_subdirectory(test)
 endif()
-if(SINGULARITY_BUILD_SESAME2SPINER)
-  add_subdirectory(utils)
-endif()
-# create the libbedroom_door.a library
+# create the libsingularity-eos.a library
 if(SINGULARITY_USE_FORTRAN)
   add_library(singularity-eos
               $<TARGET_OBJECTS:eos_f>
               $<TARGET_OBJECTS:eos_objs>)
+  install(DIRECTORY "${CMAKE_BINARY_DIR}/singularity-eos"
+    DESTINATION "include"
+    FILES_MATCHING PATTERN "*.mod")
 else()
   add_library(singularity-eos
               $<TARGET_OBJECTS:eos_objs>)
 endif()
 
 if (SINGULARITY_USE_HDF5 AND SINGULARITY_BUILD_STELLARCOLLAPSE2SPINER)
-   add_subdirectory(${PROJECT_SOURCE_DIR}/utils/stellarcollapse2spiner)
+   add_subdirectory(${PROJECT_SOURCE_DIR}/stellarcollapse2spiner)
    install(TARGETS stellarcollapse2spiner DESTINATION bin)
 endif()
 
-# install
 install(TARGETS eos singularity-eos DESTINATION lib)
 if(SINGULARITY_BUILD_SESAME2SPINER)
   if(SINGULARITY_USE_EOSPAC)
     if(SINGULARITY_USE_HDF5)
+      add_subdirectory(${PROJECT_SOURCE_DIR}/sesame2spiner)
       install(TARGETS sesame2spiner DESTINATION bin)
    endif()
   endif()
 endif()
 
-set(INSTALL_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/eos/eos.hpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/utils/sp5/singularity_eos_sp5.hpp)
-if(SINGULARITY_BUILD_CLOSURE)
-  list(APPEND INSTALL_FILES
-       ${CMAKE_CURRENT_SOURCE_DIR}/eos/singularity_eos.hpp
-       ${CMAKE_CURRENT_SOURCE_DIR}/closure/mixed_cell_models.hpp)
-  if(SINGULARITY_USE_FORTRAN)
-    list(APPEND INSTALL_FILES
-         ${CMAKE_BINARY_DIR}/eos/singularity_eos.mod
-         ${CMAKE_BINARY_DIR}/eos/singularity_eos_types.mod)
-  endif()
-endif()
-install(FILES ${INSTALL_FILES} DESTINATION include)
+# These are always needed.
+# TODO(JMM): Should always-needed utils be moved into a separate
+# directory? Or the optional ones be moved to something like
+# "external"?
+# TODO(JMM): Should I write a function so I'm not repeating all these
+# install calls?  More cmake wizardry than I have is required for
+# that, I think.
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/singularity-eos"
+  DESTINATION "include"
+  FILES_MATCHING PATTERN "*.hpp"
+  )
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/utils/fast-math"
+  DESTINATION "include"
+  FILES_MATCHING PATTERN "*.hpp"
+  )
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/utils/herumi-fmath"
+  DESTINATION "include"
+  FILES_MATCHING PATTERN "*.hpp"
+  )
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/utils/root-finding-1d"
+  DESTINATION "include"
+  FILES_MATCHING PATTERN "*.hpp"
+  )
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/utils/sp5"
+  DESTINATION "include"
+  FILES_MATCHING PATTERN "*.hpp"
+  )
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/utils/spiner"
+  DESTINATION "include"
+  FILES_MATCHING PATTERN "*.hpp"
+  )
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/utils/variant"
+  DESTINATION "include"
+  FILES_MATCHING PATTERN "*.hpp"
+  )
+install(CODE
+  "execute_process( \
+    COMMAND ${CMAKE_COMMAND} -E create_symlink \
+    ${CMAKE_INSTALL_PREFIX}/include/spiner/ports-of-call \
+    ${CMAKE_INSTALL_PREFIX}/include/ports-of-call \
+  )"
+  )

utils/sesame2spiner/.gitignore renamed to sesame2spiner/.gitignore

@@ -21,9 +21,10 @@ add_executable(sesame2spiner
               )
 
 target_include_directories(sesame2spiner PUBLIC  
-                           ${CMAKE_CURRENT_SOURCE_DIR}/../spiner
                            ${CMAKE_CURRENT_BINARY_DIR}
                            ${CMAKE_CURRENT_SOURCE_DIR}
                           )
 
 target_link_libraries(sesame2spiner nlohmann_json::nlohmann_json singularity-eos::libs singularity-eos::flags)
+
+# TODO: Add tests for sesame2spiner here.