sleipnirgroup-jormungandr 0.6.7.dev74__tar.gz → 0.6.7.dev76__tar.gz

{sleipnirgroup_jormungandr-0.6.7.dev74 → sleipnirgroup_jormungandr-0.6.7.dev76}/CMakeLists.txt

@@ -374,7 +374,7 @@ if(SLEIPNIR_BUILD_EXAMPLES)
             file(GLOB_RECURSE test_sources examples/${example}/test/*.cpp)
             add_executable(${example}_test ${sources} ${test_sources})
             compiler_flags(${example}_test)
-            target_compile_definitions(${example}_test PUBLIC RUNNING_TESTS)
+            target_compile_definitions(${example}_test PRIVATE RUNNING_TESTS)
             target_include_directories(
                 ${example}_test
                 PRIVATE
@@ -423,20 +423,30 @@ if(SLEIPNIR_BUILD_PYTHON)
 
     file(GLOB_RECURSE python_ext_src python/cpp/*.cpp)
 
-    # Build Sleipnir dependency directly into the wheel to avoid having to
-    # configure RPATHs
+    # Build Sleipnir directly into the module and manually inherit its compile
+    # definitions, include directories, and link libraries. This avoids having
+    # to configure RPATHs to a Sleipnir shared library.
+    #
+    # SLEIPNIR_IMPORTS is excluded because consumers may add it to Sleipnir's
+    # interface compile definitions. It declares Sleipnir's symbols are defined
+    # in a separate DLL, but they're compiled into the module here.
     nanobind_add_module(_sleipnir STABLE_ABI ${python_ext_src} ${Sleipnir_src})
     compiler_flags(_sleipnir)
-    target_compile_definitions(_sleipnir PRIVATE SLEIPNIR_PYTHON=1)
+    target_compile_definitions(
+        _sleipnir
+        PRIVATE
+            $<FILTER:$<TARGET_PROPERTY:Sleipnir,INTERFACE_COMPILE_DEFINITIONS>,EXCLUDE,^SLEIPNIR_IMPORTS$|^SLEIPNIR_IMPORTS=>
+            SLEIPNIR_PYTHON=1
+    )
     target_include_directories(
         _sleipnir
         PRIVATE
-            ${CMAKE_CURRENT_SOURCE_DIR}/include
+            $<TARGET_PROPERTY:Sleipnir,INTERFACE_INCLUDE_DIRECTORIES>
             ${CMAKE_CURRENT_SOURCE_DIR}/python/cpp
     )
     target_link_libraries(
         _sleipnir
-        PUBLIC Threads::Threads Eigen3::Eigen small_vector
+        PRIVATE $<TARGET_PROPERTY:Sleipnir,INTERFACE_LINK_LIBRARIES>
     )
 
     install(

{sleipnirgroup_jormungandr-0.6.7.dev74 → sleipnirgroup_jormungandr-0.6.7.dev76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sleipnirgroup-jormungandr
-Version: 0.6.7.dev74
+Version: 0.6.7.dev76
 Summary: Reverse mode autodiff library and NLP solver DSL
 License-Expression: BSD-3-Clause
 License-File: LICENSE.txt

{sleipnirgroup_jormungandr-0.6.7.dev74 → sleipnirgroup_jormungandr-0.6.7.dev76}/cmake/Pybind11Mkdoc.cmake

@@ -15,9 +15,11 @@ function(pybind11_mkdoc target headers)
         )
     endif()
 
-    # Target compiler flags
-    get_target_property(target_flags ${target} INCLUDE_DIRECTORIES)
-    list(TRANSFORM target_flags PREPEND "-I")
+    # Target compiler flags (evaluated at build time since the include
+    # directories may contain generator expressions)
+    set(target_flags
+        "-I$<JOIN:$<TARGET_PROPERTY:${target},INCLUDE_DIRECTORIES>,$<SEMICOLON>-I>"
+    )
 
     if(UNIX AND NOT APPLE)
         # Get default clang version
@@ -45,25 +47,11 @@ function(pybind11_mkdoc target headers)
         set(clang_flags -I/usr/lib/clang/${clang_version}/include)
     endif()
 
-    # Eigen compiler flags
-    get_target_property(eigen_flags Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)
-    list(FILTER eigen_flags INCLUDE REGEX "\\$<BUILD_INTERFACE:.*>")
-    list(TRANSFORM eigen_flags PREPEND "-I")
-
     # clang on Windows aarch64 failed to parse Eigen's NEON headers
-    list(APPEND eigen_flags "-DEIGEN_DONT_VECTORIZE")
-
-    # small_vector compiler flags
-    get_target_property(
-        small_vector_flags
-        small_vector
-        INTERFACE_INCLUDE_DIRECTORIES
-    )
-    list(FILTER small_vector_flags INCLUDE REGEX "\\$<BUILD_INTERFACE:.*>")
-    list(TRANSFORM small_vector_flags PREPEND "-I")
+    list(APPEND clang_flags -DEIGEN_DONT_VECTORIZE)
 
     # TODO: Remove when Python 3.15 makes UTF-8 the default
-    set(env_vars ${env_vars} PYTHONUTF8=1)
+    list(APPEND env_vars PYTHONUTF8=1)
 
     # Generate docstrings.hpp
     add_custom_command(
@@ -72,8 +60,7 @@ function(pybind11_mkdoc target headers)
             ${CMAKE_COMMAND} -E env ${env_vars} ${Python3_EXECUTABLE} -m
             pybind11_mkdoc ${headers} -o
             ${CMAKE_CURRENT_SOURCE_DIR}/python/cpp/docstrings.hpp
-            ${target_flags} ${clang_flags} ${eigen_flags} ${small_vector_flags}
-            -std=c++23
+            ${target_flags} ${clang_flags} -std=c++23
         COMMAND
             ${CMAKE_COMMAND}
             -DFILE=${CMAKE_CURRENT_SOURCE_DIR}/python/cpp/docstrings.hpp -P
@@ -81,6 +68,7 @@ function(pybind11_mkdoc target headers)
         DEPENDS
             ${headers}
             ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Pybind11MkdocPostprocess.cmake
+        COMMAND_EXPAND_LISTS
     )
 
     # Add docstrings target

{sleipnirgroup_jormungandr-0.6.7.dev74 → sleipnirgroup_jormungandr-0.6.7.dev76}/python/src/sleipnir/__init__.py

@@ -2,4 +2,4 @@
 
 from ._sleipnir import *
 
-__version__ = "0.6.7.dev74"
+__version__ = "0.6.7.dev76"