Skip to content

Large refactor of HDF5 support #897

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

Open
tskisner wants to merge 2 commits into
base: toast3
Choose a base branch
from
Open

Large refactor of HDF5 support #897

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
f15262b
Large refactor of HDF5 support
tskisner Nov 15, 2025
5282ce2
Fix import removed by cleanup
tskisner Dec 4, 2025
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
39 changes: 0 additions & 39 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,45 +183,6 @@ find_package(AATM)

find_package(SuiteSparse)

# We require libFLAC >= 1.4.0 for 32bit integer support
set(USE_FLAC FALSE)
if(DISABLE_FLAC)
message(STATUS "FLAC support disabled")
else()
find_package(FLAC)
if(FLAC_FOUND)
if(DEFINED FLAC_VERSION)
if(FLAC_VERSION STREQUAL "")
message(STATUS "Cannot determine FLAC version- assuming it is >= 1.4.0")
set(USE_FLAC TRUE)
else()
string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\..*" "\\1"
FLAC_MAJ_VERSION "${FLAC_VERSION}")
string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\..*" "\\1"
FLAC_MIN_VERSION "${FLAC_VERSION}")
if(FLAC_MAJ_VERSION GREATER 1)
# Future proofing
message(STATUS
"Found FLAC version ${FLAC_VERSION}, enabling support")
set(USE_FLAC TRUE)
else()
if(FLAC_MIN_VERSION GREATER_EQUAL 4)
message(STATUS
"Found FLAC version ${FLAC_VERSION}, enabling support")
set(USE_FLAC TRUE)
endif()
endif()
endif()
else()
message(STATUS "Cannot determine FLAC version- assuming it is >= 1.4.0")
set(USE_FLAC TRUE)
endif()
endif()
if(NOT USE_FLAC)
message(STATUS "Did not find FLAC >= 1.4.0")
endif()
endif()

find_package(Python3 3.9 COMPONENTS Interpreter Development.Module REQUIRED)

# Internal products
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ def readme():
"psutil",
"h5py",
"pshmem>=1.3.0",
"flacarray>=0.3.4",
"ruamel.yaml",
"astropy",
"healpy",
Expand Down
8 changes: 0 additions & 8 deletions src/toast/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ pybind11_add_module(_libtoast MODULE
_libtoast/template_offset.cpp
_libtoast/accelerator.cpp
_libtoast/qarray_core.cpp
_libtoast/io_compression_flac.cpp
_libtoast/ops_pointing_detector.cpp
_libtoast/ops_stokes_weights.cpp
_libtoast/ops_pixels_healpix.cpp
Expand Down Expand Up @@ -86,13 +85,6 @@ if(CHOLMOD_FOUND)
target_include_directories(_libtoast PUBLIC "${CHOLMOD_INCLUDE_DIR}")
endif(CHOLMOD_FOUND)

if(USE_FLAC)
target_compile_definitions(_libtoast PRIVATE HAVE_FLAC=1)
target_compile_options(_libtoast PRIVATE "${FLAC_DEFINITIONS}")
target_include_directories(_libtoast PUBLIC "${FLAC_INCLUDE_DIRS}")
target_link_libraries(_libtoast PRIVATE "${FLAC_LIBRARIES}")
endif(USE_FLAC)

if(CUDAToolkit_FOUND AND NOT CUDA_DISABLED)
target_compile_definitions(_libtoast PRIVATE HAVE_CUDALIBS=1)
target_include_directories(_libtoast PRIVATE "${CUDAToolkit_INCLUDE_DIRS}")
Expand Down
Loading