Skip to content

Fix FSPS submodule inclusion in sdist and add build check #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dfm merged 2 commits into from
Oct 20, 2023
Merged

Fix FSPS submodule inclusion in sdist and add build check #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7326f4d
Fixing CI sdist build to include the submodule
dfm Oct 20, 2023
2bad7d9
Adding check to Cmake for submodule
dfm Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 0
- uses: actions/setup-python@v4
with:
Expand Down
113 changes: 59 additions & 54 deletions src/fsps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,74 +1,79 @@
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sps_vars.f90")
message(FATAL_ERROR "The source code in the FSPS submodule was not found."
"Please run 'git submodule update --init' to initialize the submodule.")
endif()

# Generate the f2py wrappers
set(F2PY_SOURCES
"${CMAKE_CURRENT_BINARY_DIR}/_fspsmodule.c"
"${CMAKE_CURRENT_BINARY_DIR}/_fsps-f2pywrappers2.f90"
"${CMAKE_CURRENT_BINARY_DIR}/_fspsmodule.c"
"${CMAKE_CURRENT_BINARY_DIR}/_fsps-f2pywrappers2.f90"
)
add_custom_command(
OUTPUT ${F2PY_SOURCES}
DEPENDS fsps.f90
VERBATIM
COMMAND "${Python_EXECUTABLE}" -m numpy.f2py
"${CMAKE_CURRENT_SOURCE_DIR}/fsps.f90" -m _fsps --lower
--build-dir "${CMAKE_CURRENT_BINARY_DIR}")
"${CMAKE_CURRENT_SOURCE_DIR}/fsps.f90" -m _fsps --lower
--build-dir "${CMAKE_CURRENT_BINARY_DIR}")

# List out the explicit FSPS sources; we don't use a glob here since
# the 'src' directory includes some executables that we don't want to
# include here.
set(
FSPS_SOURCES
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sps_vars.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sps_utils.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/add_agb_dust.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/add_bs.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/add_dust.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/add_nebular.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/add_remnants.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/add_xrb.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/agn_dust.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/attn_curve.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/compsp.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/csp_gen.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/funcint.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/get_lumdist.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/get_tuniv.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/getindx.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/getmags.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/getspec.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/igm_absorb.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/imf.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/imf_weight.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/intsfwght.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/linterp.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/linterparr.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/locate.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/mod_gb.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/mod_hb.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/pz_convol.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sbf.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/setup_tabular_sfh.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sfh_weight.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sfhinfo.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sfhlimit.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sfhstat.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/smoothspec.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/spec_bin.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sps_setup.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/ssp_gen.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/tsum.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/vacairconv.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/write_isochrone.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/ztinterp.f90"
FSPS_SOURCES
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sps_vars.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sps_utils.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/add_agb_dust.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/add_bs.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/add_dust.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/add_nebular.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/add_remnants.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/add_xrb.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/agn_dust.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/attn_curve.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/compsp.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/csp_gen.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/funcint.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/get_lumdist.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/get_tuniv.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/getindx.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/getmags.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/getspec.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/igm_absorb.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/imf.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/imf_weight.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/intsfwght.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/linterp.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/linterparr.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/locate.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/mod_gb.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/mod_hb.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/pz_convol.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sbf.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/setup_tabular_sfh.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sfh_weight.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sfhinfo.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sfhlimit.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sfhstat.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/smoothspec.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/spec_bin.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/sps_setup.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/ssp_gen.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/tsum.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/vacairconv.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/write_isochrone.f90"
"${CMAKE_CURRENT_SOURCE_DIR}/libfsps/src/ztinterp.f90"
)

# Define the Python library
python_add_library(
_fsps
MODULE
"${CMAKE_CURRENT_SOURCE_DIR}/fsps.f90"
${FSPS_SOURCES}
${F2PY_SOURCES}
"${F2PY_INCLUDE_DIR}/fortranobject.c"
WITH_SOABI)
_fsps
MODULE
"${CMAKE_CURRENT_SOURCE_DIR}/fsps.f90"
${FSPS_SOURCES}
${F2PY_SOURCES}
"${F2PY_INCLUDE_DIR}/fortranobject.c"
WITH_SOABI)
target_link_libraries(_fsps PUBLIC Python::NumPy)
target_include_directories(_fsps PUBLIC "${F2PY_INCLUDE_DIR}")
install(TARGETS _fsps DESTINATION ${SKBUILD_PROJECT_NAME})