New Python interface

.gitmodules

@@ -13,7 +13,7 @@
 	url = https://github.com/austinschneider/delabella.git
 [submodule "vendor/photospline"]
 	path = vendor/photospline
-	url = https://github.com/austinschneider/photospline.git
+	url = https://github.com/icecube/photospline.git
 [submodule "vendor/NamedType"]
 	path = vendor/NamedType
 	url = https://github.com/joboccara/NamedType.git

CMakeLists.txt

@@ -1,7 +1,11 @@
-cmake_minimum_required(VERSION 3.3.2 FATAL_ERROR)
-cmake_policy(VERSION 3.3.2)
+cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
+cmake_policy(VERSION 3.20)
 
 if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Darwin")
+    set(CMAKE_POLICY_DEFAULT_CMP0042 NEW)
+    cmake_policy(SET CMP0042 NEW)
+    set(CMAKE_POLICY_DEFAULT_CMP0068 NEW)
+    cmake_policy(SET CMP0068 NEW)
     set(MACOSX TRUE)
 endif()
 
@@ -11,13 +15,14 @@ SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake ${CMAKE_CURRENT_LIST_DIR}/
 message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
 message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
 
-set(CIBUILDWHEEL $ENV{CIBUILDWHEEL})
+set(CIBUILDWHEEL "$ENV{CIBUILDWHEEL}")
 message(STATUS "CIBUILDWHEEL: ${CIBUILDWHEEL}")
-if(${CIBUILDWHEEL})
-    set(CI_INSTALL_PREFIX $ENV{CI_INSTALL_PREFIX})
+if(CIBUILDWHEEL STREQUAL "1")
+    set(CI_INSTALL_PREFIX "$ENV{CI_INSTALL_PREFIX}")
     message(STATUS "CI_INSTALL_PREFIX: ${CI_INSTALL_PREFIX}")
 endif()
 
+
 # parse pyproject.toml for the version
 include(pyproject)
 
@@ -31,21 +36,57 @@ SET(CMAKE_CXX_STANDARD 14)
 SET(CMAKE_C_STANDARD 99)
 
 # set the build type and appropriate flags
-option(CMAKE_BUILD_TYPE "" "Release")
-set(_FLAGS "-O2 -Wall -fPIC")
-set(_FLAGS_DEBUG "-g -O0 -Wall -fPIC")
-set(_FLAGS_RELEASE "-O2 -Wall -fPIC -s")
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(_FLAGS "${_FLAGS} -stdlib=libc++")
-    set(_FLAGS_DEBUG "${_FLAGS_DEBUG} -stdlib=libc++")
-    set(_FLAGS_RELEASE "${_FLAGS_RELEASE} -stdlib=libc++")
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Release")
 endif()
-set(CMAKE_CXX_FLAGS ${_FLAGS})
-set(CMAKE_CXX_FLAGS_DEBUG ${_FLAGS_DEBUG})
-set(CMAKE_CXX_FLAGS_RELEASE ${_FLAGS_RELEASE})
+
+function(apply_siren_compile_options target)
+    # Check if the target is an INTERFACE target
+    get_target_property(target_type ${target} TYPE)
+    get_target_property(target_imported ${target} IMPORTED)
+
+    if("${target_type}" STREQUAL "INTERFACE_LIBRARY")
+        # Apply compile options to INTERFACE target
+        target_compile_options(${target} INTERFACE
+            -O2
+            -Wall
+            -fPIC
+            $<$<CONFIG:Debug>:-g>
+            $<$<CONFIG:Debug>:-O0>
+            $<$<CONFIG:Release>:-O2>
+            $<$<AND:$<COMPILE_LANG_AND_ID:CXX,GNU>,$<CONFIG:Release>>:-s>
+            $<$<COMPILE_LANG_AND_ID:CXX,Clang>:-stdlib=libc++>
+        )
+    elseif(target_imported)
+        # Apply compile options to non-INTERFACE target (PRIVATE or PUBLIC)
+        target_compile_options(${target} INTERFACE
+            -O2
+            -Wall
+            -fPIC
+            $<$<CONFIG:Debug>:-g>
+            $<$<CONFIG:Debug>:-O0>
+            $<$<CONFIG:Release>:-O2>
+            $<$<AND:$<COMPILE_LANG_AND_ID:CXX,GNU>,$<CONFIG:Release>>:-s>
+            $<$<COMPILE_LANG_AND_ID:CXX,Clang>:-stdlib=libc++>
+        )
+    else()
+        # Apply compile options to non-INTERFACE target (PRIVATE or PUBLIC)
+        target_compile_options(${target} PRIVATE
+            -O2
+            -Wall
+            -fPIC
+            $<$<CONFIG:Debug>:-g>
+            $<$<CONFIG:Debug>:-O0>
+            $<$<CONFIG:Release>:-O2>
+            $<$<AND:$<COMPILE_LANG_AND_ID:CXX,GNU>,$<CONFIG:Release>>:-s>
+            $<$<COMPILE_LANG_AND_ID:CXX,Clang>:-stdlib=libc++>
+        )
+    endif()
+endfunction()
+
 
 # override install locations when building python extensions
-if(DEFINED SKBUILD)
+if(DEFINED SKBUILD_PLATLIB_DIR)
     cmake_path(RELATIVE_PATH SKBUILD_HEADERS_DIR BASE_DIRECTORY ${SKBUILD_PLATLIB_DIR} OUTPUT_VARIABLE CMAKE_INSTALL_INCLUDEDIR)
     cmake_path(RELATIVE_PATH SKBUILD_PLATLIB_DIR BASE_DIRECTORY ${SKBUILD_PLATLIB_DIR} OUTPUT_VARIABLE CMAKE_INSTALL_LIBDIR)
     message(STATUS "Setting include dir to: ${CMAKE_INSTALL_INCLUDEDIR}")
@@ -63,12 +104,46 @@ include(pybind11)
 
 # load project dependencies
 include(rk)
+if(TARGET rk_static)
+    apply_siren_compile_options(rk_static)
+endif()
+if(TARGET rk_shared)
+    apply_siren_compile_options(rk_shared)
+endif()
 include(cereal)
+if(TARGET cereal)
+    apply_siren_compile_options(cereal)
+endif()
 include(delabella)
+if(TARGET delabella_static)
+    apply_siren_compile_options(delabella_static)
+endif()
+if(TARGET delabella_shared)
+    apply_siren_compile_options(delabella_shared)
+endif()
 include(CFITSIO)
+if(TARGET CFITSIO)
+    apply_siren_compile_options(CFITSIO)
+endif()
 include(photospline)
+if(TARGET photospline)
+    apply_siren_compile_options(photospline)
+    target_link_libraries(photospline PUBLIC CFITSIO)
+endif()
 include(googletest)
+if(TARGET gtest)
+    apply_siren_compile_options(gtest)
+endif()
+if(TARGET gtest_main)
+    apply_siren_compile_options(gtest_main)
+endif()
+if(TARGET gmock)
+    apply_siren_compile_options(gmock)
+endif()
 include(NamedType)
+if(TARGET NamedType)
+    apply_siren_compile_options(NamedType)
+endif()
 
 # load macros for googletest
 include(testing)
@@ -87,8 +162,9 @@ add_subdirectory(projects/injection)
 # define the target library
 add_library(SIREN SHARED)
 set_property(TARGET SIREN PROPERTY POSITION_INDEPENDENT_CODE ON)
+apply_siren_compile_options(SIREN)
 
-if(${MACOSX})
+if(DEFINED MACOSX AND MACOSX)
 if(CMAKE_VERSION VERSION_LESS 3.13)
     target_link_libraries(SIREN PUBLIC "$<$<PLATFORM_ID:Darwin>:LINKER:-undefined,dynamic_lookup>")
 else()
@@ -128,11 +204,11 @@ target_link_libraries(SIREN
 endif()
 
 # define the install path normally or for python package
-if(DEFINED SKBUILD)
+if(DEFINED SKBUILD_PLATLIB_DIR)
     set_target_properties(SIREN PROPERTIES
             BUILD_WITH_INSTALL_RPATH FALSE
             LINK_FLAGS "-Wl,-rpath,\\\$ORIGIN")
-    if(${CIBUILDWHEEL})
+    if(DEFINED CIBUILDWHEEL AND CIBUILDWHEEL)
         message(STATUS "Setting SIREN install lib dir to: ${CI_INSTALL_PREFIX}/lib")
         message(STATUS "Setting SIREN install include dir to: ${CI_INSTALL_PREFIX}/include")
         install(TARGETS SIREN
@@ -183,7 +259,7 @@ else()
 endif()
 
 # optionally package runtime dependencies
-if((DEFINED SKBUILD) AND (PACKAGE_SHARED_DEPS))
+if((DEFINED SKBUILD_PLATLIB_DIR) AND (PACKAGE_SHARED_DEPS))
     install(CODE "set(SIREN_LIB_FILE \"${PROJECT_BINARY_DIR}/${CMAKE_SHARED_MODULE_PREFIX}SIREN${CMAKE_SHARED_MODULE_SUFFIX}\")")
     install(CODE "set(PYTHON_DEP_LIB_DESTINATION \"${SKBUILD_PLATLIB_DIR}/siren.libs/\")")
     install(CODE [[
@@ -209,7 +285,7 @@ if((DEFINED SKBUILD) AND (PACKAGE_SHARED_DEPS))
 endif()
 
 # install the python extensions
-if(DEFINED SKBUILD)
+if(DEFINED SKBUILD_PLATLIB_DIR)
     install(TARGETS utilities
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/siren)
     install(TARGETS math
@@ -241,15 +317,18 @@ write_basic_package_version_file(
   VERSION ${PROJECT_VERSION}
   COMPATIBILITY AnyNewerVersion
 )
-export(EXPORT ${PROJECT_NAME}Config FILE ${PROJECT_NAME}Config.cmake)
+export(EXPORT ${PROJECT_NAME}Config FILE "${PROJECT_NAME}Config.cmake"
+       NAMESPACE ${PROJECT_NAME}::)
 
 # Make importable from install location
 set(_config_dir share/${PROJECT_NAME}/cmake)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
   DESTINATION ${_config_dir}
 )
 install(EXPORT ${PROJECT_NAME}Config
-  DESTINATION ${_config_dir}
+  FILE "${PROJECT_NAME}Config.cmake"
+  NAMESPACE ${PROJECT_NAME}::
+  DESTINATION "${_config_dir}"
 )
 
 MESSAGE("")

cmake/Packages/CFITSIO.cmake

@@ -12,55 +12,105 @@
 #   CFITSIO_LDFLAGS                                                            #
 ################################################################################
 
-SET (CFITSIO_FIND_QUIETLY TRUE)
-SET (CFITSIO_FIND_REQUIRED TRUE)
-
-IF (NOT CFITSIO_FOUND)
-
-  # Search user environment for headers, then default paths; extract version
-  FIND_PATH (CFITSIO_INCLUDE_DIR fitsio.h
-    PATHS $ENV{CFITSIOROOT}/include
-    NO_DEFAULT_PATH)
-  FIND_PATH (CFITSIO_INCLUDE_DIR fitsio.h)
-  if(CFITSIO_INCLUDE_DIR)
-    GET_FILENAME_COMPONENT (CFITSIOROOT ${CFITSIO_INCLUDE_DIR} PATH)
-  else()
-    FIND_PATH (CFITSIO_INCLUDE_DIR cfitsio/fitsio.h
-      PATHS $ENV{CFITSIOROOT}/include
-      )
-    SET(CFITSIO_INCLUDE_DIR "${CFITSIO_INCLUDE_DIR}/cfitsio" CACHE PATH "Path to cfitsio headers" FORCE)
-  endif()
-
-  SET (CFITSIO_VERSION 0)
-  IF (CFITSIO_INCLUDE_DIR)
-    FILE (READ "${CFITSIO_INCLUDE_DIR}/fitsio.h" _cfitsio_VERSION)
-    STRING (REGEX REPLACE ".*define CFITSIO_VERSION ([0-9]+\\.[0-9]+).*" "\\1"
-            CFITSIO_VERSION "${_cfitsio_VERSION}")
-  ENDIF (CFITSIO_INCLUDE_DIR)
-
-  # Search user environment for libraries, then default paths
-  FIND_LIBRARY (CFITSIO_LIBRARIES NAMES cfitsio
-    PATHS $ENV{CFITSIOROOT}/lib
-    NO_DEFAULT_PATH)
-  FIND_LIBRARY (CFITSIO_LIBRARIES NAMES cfitsio)
-  GET_FILENAME_COMPONENT (CFITSIO_LIB_DIR ${CFITSIO_LIBRARIES} PATH)
-
-  # Set CFITSIO_FOUND and error out if cfitsio is not found
-  INCLUDE (FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS (CFITSIO
-    DEFAULT_MSG CFITSIO_LIBRARIES CFITSIO_INCLUDE_DIR)
-  ADD_DEFINITIONS ("-I${CFITSIO_INCLUDE_DIR}")
-
-  IF (CFITSIO_FOUND)
-    # Set flags and print a status message
-    MESSAGE (STATUS "CFITSIO version ${CFITSIO_VERSION} found:")
-
-    SET (CFITSIO_CPPFLAGS "-I${CFITSIO_INCLUDE_DIR}")
-    SET (CFITSIO_LDFLAGS "${CFITSIO_LIBRARIES}")
-
-    MESSAGE (STATUS "  * includes: ${CFITSIO_INCLUDE_DIR}")
-    MESSAGE (STATUS "  * libs:     ${CFITSIO_LIBRARIES}")
-  ENDIF (CFITSIO_FOUND)
-
-ENDIF (NOT CFITSIO_FOUND)
+include(FindPackageHandleStandardArgs)
+
+set(CFITSIO_FIND_QUIETLY TRUE)
+set(CFITSIO_FIND_REQUIRED TRUE)
+
+if (NOT CFITSIO_FOUND)
+    # Manually parse CPLUS_INCLUDE_PATH to add paths to search
+    if (DEFINED ENV{CPLUS_INCLUDE_PATH})
+        string(REPLACE ":" ";" CFITSIO_INCLUDE_SEARCH_PATH_LIST "$ENV{CPLUS_INCLUDE_PATH}")
+    else()
+        set(CFITSIO_INCLUDE_SEARCH_PATH_LIST "")
+    endif()
+
+    list(PREPEND CFITSIO_INCLUDE_SEARCH_PATH_LIST
+        $ENV{CFITSIOROOT}/include
+    )
+
+    # Search user environment for headers, then default paths; extract version
+    find_path(CFITSIO_INCLUDE_DIR fitsio.h
+        PATHS ${CFITSIO_INCLUDE_SEARCH_PATH_LIST}
+        NO_DEFAULT_PATH
+    )
+    if(NOT CFITSIO_INCLUDE_DIR)
+        unset(CFITSIO_INCLUDE_DIR)
+        find_path(CFITSIO_INCLUDE_DIR fitsio.h)
+    endif()
+
+    if(NOT CFITSIO_INCLUDE_DIR)
+        unset(CFITSIO_INCLUDE_DIR)
+        find_path(CFITSIO_INCLUDE_DIR cfitsio/fitsio.h
+            PATHS ${CFITSIO_INCLUDE_SEARCH_PATH_LIST}
+            NO_DEFAULT_PATH
+        )
+        if(CFITSIO_INCLUDE_DIR)
+            set(CFITSIO_INCLUDE_DIR "${CFITSIO_INCLUDE_DIR}/cfitsio" CACHE PATH "Path to cfitsio headers" FORCE)
+        endif()
+    endif()
+
+    if(NOT CFITSIO_INCLUDE_DIR)
+        unset(CFITSIO_INCLUDE_DIR)
+        find_path(CFITSIO_INCLUDE_DIR cfitsio/fitsio.h)
+        if(CFITSIO_INCLUDE_DIR)
+            set(CFITSIO_INCLUDE_DIR "${CFITSIO_INCLUDE_DIR}/cfitsio" CACHE PATH "Path to cfitsio headers" FORCE)
+        endif()
+    endif()
+
+    if (CFITSIO_INCLUDE_DIR AND EXISTS "${CFITSIO_INCLUDE_DIR}/fitsio.h")
+        get_filename_component(CFITSIOROOT ${CFITSIO_INCLUDE_DIR} PATH)
+        set(CFITSIO_VERSION 0)
+        file(STRINGS "${CFITSIO_INCLUDE_DIR}/fitsio.h" _cfitsio_VERSION REGEX "#define CFITSIO_VERSION[ \t]+([0-9]+\.[0-9]+)")
+        string(REGEX REPLACE ".*#define CFITSIO_VERSION[ \t]+([0-9]+\.[0-9]+).*" "\\1" CFITSIO_VERSION "${_cfitsio_VERSION}")
+    else()
+        set(CFITSIO_INCLUDE_DIR "CFITSIO_INCLUDE_DIR-NOTFOUND")
+    endif()
+
+    if (DEFINED ENV{LD_LIBRARY_PATH})
+        string(REPLACE ":" ";" CFITSIO_LIBRARY_SEARCH_PATH_LIST "$ENV{LD_LIBRARY_PATH}")
+    else()
+        set(CFITSIO_LIBRARY_SEARCH_PATH_LIST "")
+    endif()
+
+    # Search user environment for libraries, then default paths
+    find_library(CFITSIO_LIBRARIES cfitsio
+        PATHS ${CFITSIO_LIBRARY_SEARCH_PATH_LIST}
+        NO_DEFAULT_PATH
+    )
+
+    if(NOT CFITSIO_LIBRARIES)
+        find_library(CFITSIO_LIBRARIES NAMES cfitsio)
+    endif()
+
+    if (CFITSIO_LIBRARIES)
+        get_filename_component(CFITSIO_LIB_DIR ${CFITSIO_LIBRARIES} PATH)
+    else()
+        set(CFITSIO_LIBRARIES "CFITSIO_LIBRARIES-NOTFOUND")
+    endif()
+
+    # Set CFITSIO_FOUND and error out if cfitsio is not found
+    find_package_handle_standard_args(CFITSIO
+        REQUIRED_VARS CFITSIO_LIBRARIES CFITSIO_INCLUDE_DIR
+        VERSION_VAR CFITSIO_VERSION
+    )
+
+    if (CFITSIO_FOUND)
+        # Set flags and print a status message
+        message(STATUS "CFITSIO version ${CFITSIO_VERSION} found:")
+
+        set(CFITSIO_CPPFLAGS "-I${CFITSIO_INCLUDE_DIR}")
+        set(CFITSIO_LDFLAGS "${CFITSIO_LIBRARIES}")
+
+        message(STATUS "  * includes: ${CFITSIO_INCLUDE_DIR}")
+        message(STATUS "  * libs:     ${CFITSIO_LIBRARIES}")
+
+        add_library(CFITSIO SHARED IMPORTED)
+        target_include_directories(CFITSIO INTERFACE ${CFITSIO_INCLUDE_DIR})
+        set_target_properties(CFITSIO PROPERTIES
+            IMPORTED_LOCATION ${CFITSIO_LIBRARIES})
+    else()
+        message(WARNING "CFITSIO not found. Please ensure CFITSIO is installed and the environment variables CFITSIOROOT, CPLUS_INCLUDE_PATH, LIBRARY_PATH, and LD_LIBRARY_PATH are set correctly.")
+    endif()
+endif()
 

projects/dataclasses/CMakeLists.txt

@@ -16,12 +16,14 @@ target_include_directories(SIREN_dataclasses PUBLIC
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/SIREN/dataclasses/>
 )
 
-target_link_libraries(SIREN_dataclasses PUBLIC
+target_link_libraries(SIREN_dataclasses
+    PUBLIC
     photospline
-    SIREN_serialization
     SIREN_utilities
+    SIREN_serialization
     SIREN_math
 )
+apply_siren_compile_options(SIREN_dataclasses)
 
 install(DIRECTORY "${PROJECT_SOURCE_DIR}/projects/dataclasses/public/"
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}