diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 90d3e6e..e2ea884 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -30,6 +30,10 @@ IF(CYTHON) COMMAND ${CYTHON} --cplus -o ${CMAKE_CURRENT_BINARY_DIR}/_project.cpp ${CMAKE_CURRENT_SOURCE_DIR}/_project.pyx DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/_project.pyx ${CMAKE_CURRENT_SOURCE_DIR}/project_tool.hpp ) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_cosmomath.cpp + COMMAND ${CYTHON} --cplus -o ${CMAKE_CURRENT_BINARY_DIR}/_cosmomath.cpp ${CMAKE_CURRENT_SOURCE_DIR}/_cosmomath.pyx + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/_cosmomath.pyx ) ENDIF(CYTHON) @@ -38,12 +42,13 @@ add_library(_cosmo_power MODULE ${CMAKE_CURRENT_BINARY_DIR}/_cosmo_power.cpp) add_library(_cosmo_cic MODULE ${CMAKE_CURRENT_BINARY_DIR}/_cosmo_cic.cpp) add_library(_fast_interp MODULE ${CMAKE_CURRENT_BINARY_DIR}/_fast_interp.cpp) add_library(_project MODULE ${CMAKE_CURRENT_BINARY_DIR}/_project.cpp) +add_library(_cosmomath MODULE ${CMAKE_CURRENT_BINARY_DIR}/_cosmomath.cpp) target_include_directories(_cosmotool PRIVATE ${PYTHON_INCLUDES}) target_include_directories(_cosmo_power PRIVATE ${PYTHON_INCLUDES}) target_include_directories(_cosmo_cic PRIVATE ${PYTHON_INCLUDES}) target_include_directories(_fast_interp PRIVATE ${PYTHON_INCLUDES}) target_include_directories(_project PRIVATE ${PYTHON_INCLUDES}) - +target_include_directories(_cosmomath PRIVATE ${PYTHON_INCLUDES}) SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Bsymbolic-functions") if(APPLE) @@ -53,10 +58,11 @@ endif() target_link_libraries(_cosmotool PRIVATE ${CosmoTool_local} ${GSL_LIBRARIES}) target_link_libraries(_cosmo_power PRIVATE ${CosmoTool_local} ${GSL_LIBRARIES}) target_link_libraries(_cosmo_cic PRIVATE ${CosmoTool_local} ${GSL_LIBRARIES}) +target_link_libraries(_cosmomath PRIVATE ${CosmoTool_local} ${GSL_LIBRARIES}) target_link_libraries(_project ) target_link_libraries(_fast_interp PRIVATE ${CosmoTool_local} ) -SET(ct_TARGETS _cosmotool _project _cosmo_power _cosmo_cic _fast_interp ) +SET(ct_TARGETS _cosmotool _project _cosmo_power _cosmo_cic _fast_interp _cosmomath) if (Boost_FOUND) message(STATUS "Building bispectrum support (path = ${Boost_INCLUDE_DIRS})") diff --git a/python/cosmotool/__init__.py b/python/cosmotool/__init__.py index c5b1c79..fd1eb0e 100644 --- a/python/cosmotool/__init__.py +++ b/python/cosmotool/__init__.py @@ -3,6 +3,7 @@ from ._project import * from ._cosmo_power import * from ._cosmo_cic import * from ._fast_interp import * +from ._cosmomath import * from .grafic import writeGrafic, writeWhitePhase, readGrafic, readWhitePhase from .borg import read_borg_vol from .cic import cicParticles