Skip to content

Commit

Permalink
Merge pull request #198 from lanl/mauneyc/change/robust_hdf5
Browse files Browse the repository at this point in the history
More robust hdf5, along with more refined I/O from cmake
  • Loading branch information
dholladay00 authored Dec 14, 2022
2 parents d1d75ce + 18dd410 commit 8b8acdd
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 962 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
## Release 1.6.2
Date: 10/12/2022

### Revert to standard `hdf5` handling
- [[PR198]](https://github.com/lanl/singularity-eos/pull/198) Use a more robust HDF5 handling that eliminates some edge breaks

### Updated `hdf5` handling in the build
- [[PR181]](https://github.com/lanl/singularity-eos/pull/181) change from manual dependecy handling to using hdf5 interface targets

Expand Down
30 changes: 10 additions & 20 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ if(SINGULARITY_USE_KOKKOS)
# type: soft submodule
singularity_import_dependency(
PKG Kokkos
TARGET Kokkos::kokkos
TARGETS Kokkos::kokkos
SUBDIR ${PROJECT_SOURCE_DIR}/utils/kokkos
)
set(PORTABILITY_STRATEGY "Kokkos")
Expand Down Expand Up @@ -241,14 +241,14 @@ if (SINGULARITY_BUILD_CLOSURE)
# type: external
singularity_import_dependency(
PKG KokkosKernels
TARGET Kokkos::kokkoskernels
TARGETS Kokkos::kokkoskernels
)
list(APPEND SINGULARITY_PUBLIC_DEFINES SINGULARITY_USE_KOKKOSKERNELS)
else()
# type: soft submodule
singularity_import_dependency(
PKG Eigen3
TARGET Eigen3::Eigen
TARGETS Eigen3::Eigen
SUBDIR ${PROJECT_SOURCE_DIR}/utils/eigen
)
endif() #SINGULARITY_USE_KOKKOS_KERNELS
Expand All @@ -258,23 +258,23 @@ endif() #SINGULARITY_BUILD_CLOSURE
# type: soft submodule
singularity_import_dependency(
PKG mpark_variant
TARGET mpark_variant
TARGETS mpark_variant
SUBDIR ${PROJECT_SOURCE_DIR}/utils/variant
)

# ports-of-call
# type: ghost submodule
singularity_import_dependency(
PKG ports-of-call
TARGET ports-of-call::ports-of-call
TARGETS ports-of-call::ports-of-call
SUBDIR ${PROJECT_SOURCE_DIR}/utils/ports-of-call
)

# spiner
# type: soft submodule
singularity_import_dependency(
PKG spiner
TARGET spiner::spiner
TARGETS spiner::spiner
SUBDIR ${PROJECT_SOURCE_DIR}/utils/spiner
)

Expand All @@ -285,22 +285,12 @@ if (SINGULARITY_USE_HDF5)
enable_language(C)
singularity_import_dependency(
PKG HDF5
COMPONENTS "C;HL"
COMPONENTS C HL
TARGETS hdf5::hdf5 hdf5::hdf5_hl
)
# For the moment, there are several versions of
# HDF5 that are necessary to support, but they
# have incompatible build targets.
# So, for now, we roll a custom `FindHDF5.cmake`,
# and then explicilty pull out the libraries.
# CMM: I don't love this, but trying to get things
# moving for now
#TODO: Move this into `cmake/FindHDF5.cmake`
get_target_property(_seosh5ll HDF5::HDF5 INTERFACE_LINK_LIBRARIES)
get_target_property(_seosh5ic HDF5::HDF5 INTERFACE_INCLUDE_DIRECTORIES)
list(APPEND SINGULARITY_PUBLIC_LIBS ${_seosh5ll})
list(APPEND SINGULARITY_PUBLIC_INCS ${_seosh5ic})

# make sure we use MPI
if (HDF5_parallel_FOUND)
if (HDF5_IS_PARALLEL)
# Message passing interface
# type: external
singularity_import_dependency(
Expand Down
Loading

0 comments on commit 8b8acdd

Please sign in to comment.