Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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/sanitizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
-DSINGULARITY_BUILD_TESTS=ON \
-DSINGULARITY_FORCE_SUBMODULE_MODE=ON \
-DSINGULARITY_USE_KOKKOS=ON \
-DSINGULARITY_BUILD_CLOSURE=ON \
..
make -j4
ctest --output-on-failure
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ jobs:
cmake -DCMAKE_INSTALL_PREFIX=${HOME}/install \
-DSINGULARITY_USE_SPINER=ON \
-DSINGULARITY_BUILD_TESTS=ON \
-DSINGULARITY_BUILD_CLOSURE=ON \
-DSINGULARITY_USE_KOKKOS=ON \
-DSINGULARITY_BUILD_EXAMPLES=ON \
-DSINGULARITY_BUILD_PYTHON=ON \
-DSINGULARITY_TEST_SESAME=OFF \
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tests_clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
-DSINGULARITY_FORCE_SUBMODULE_MODE=ON \
-DSINGULARITY_USE_V_AND_V_EOS=OFF \
-DSINGULARITY_USE_KOKKOS=OFF \
-DSINGULARITY_BUILD_CLOSURE=OFF \
-DSINGULARITY_PLUGINS=$(pwd)/../example/plugin \
-DCMAKE_CXX_FLAGS="-Wall -Werr" \
-DCMAKE_LINKER=ld.gold \
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tests_minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
-DSINGULARITY_BUILD_TESTS=ON \
-DSINGULARITY_FORCE_SUBMODULE_MODE=ON \
-DSINGULARITY_USE_KOKKOS=OFF \
-DSINGULARITY_BUILD_CLOSURE=OFF \
..
make -j4
make install
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/tests_minimal_kokkos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ jobs:
tests-minimal:
name: Run minimal set of tests, to constrain minimal build
runs-on: ubuntu-latest
strategy:
matrix:
closure: ["ON", "OFF"]

steps:
- name: Checkout code
Expand All @@ -33,6 +36,7 @@ jobs:
-DSINGULARITY_BUILD_TESTS=ON \
-DSINGULARITY_FORCE_SUBMODULE_MODE=ON \
-DSINGULARITY_USE_KOKKOS=ON \
-DSINGULARITY_BUILD_CLOSURE=${{ matrix.closure }} \
..
make -j4
make install
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/warnings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ jobs:
-DSINGULARITY_BUILD_TESTS=ON \
-DSINGULARITY_FORCE_SUBMODULE_MODE=ON \
-DSINGULARITY_USE_KOKKOS=ON \
-DSINGULARITY_BUILD_CLOSURE=ON \
..
make -j4
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "utils/eigen"]
path = utils/eigen
url = https://gitlab.com/libeigen/eigen.git
[submodule "utils/spiner"]
path = utils/spiner
url = https://github.com/lanl/spiner
Expand Down
33 changes: 17 additions & 16 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,29 @@
## Current develop

### Added (new features/APIs/variables/...)
- [[PR658]](https://github.com/lanl/singularity-eos/pull/XXX) Add `MinimumInternalEnergy`/`MaximumInternalEnergy` to the EOS introspection API, so energy bounds are reachable through modifiers and the `singularity::EOS` variant

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed a bunch of URLs in the changelog that were dead. Maybe copy-pasted? Had codex fix them.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That looks like something I messed up. Thanks for the cleanup.

Is using lapack too unpalatable as a fallback?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope lapack isn't too unpalatable.

- [[PR658]](https://github.com/lanl/singularity-eos/pull/XXX) Add `sesame2spiner::saveAllMaterials` overloads taking a list of matids instead of a list of input files, with optional per-material `Params` overrides, so host codes can generate an sp5 file without writing input decks to disk. Also added an overload taking an already-open `hid_t`, plus `writeSP5RootAttributes`, so a single sp5 file can be built up one material at a time.
- [[PR653]] (https://github.com/lanl/singularity-eos/pull/659) Added `sesame2spiner::saveAllMaterials` overloads taking a list of matids instead of a list of input files, with optional per-material `Params` overrides, so host codes can generate an sp5 file without writing input decks to disk. Also added an overload taking an already-open `hid_t`, plus `writeSP5RootAttributes`, so a single sp5 file can be built up one material at a time.
- [[PR658]](https://github.com/lanl/singularity-eos/pull/658) Add `MinimumInternalEnergy`/`MaximumInternalEnergy` to the EOS introspection API, so energy bounds are reachable through modifiers and the `singularity::EOS` variant
- [[PR659]](https://github.com/lanl/singularity-eos/pull/659) Add `sesame2spiner::saveAllMaterials` overloads taking a list of matids instead of a list of input files, with optional per-material `Params` overrides, so host codes can generate an sp5 file without writing input decks to disk. Also added an overload taking an already-open `hid_t`, plus `writeSP5RootAttributes`, so a single sp5 file can be built up one material at a time.
- [[PR659]](https://github.com/lanl/singularity-eos/pull/659) Added `sesame2spiner::saveAllMaterials` overloads taking a list of matids instead of a list of input files, with optional per-material `Params` overrides, so host codes can generate an sp5 file without writing input decks to disk. Also added an overload taking an already-open `hid_t`, plus `writeSP5RootAttributes`, so a single sp5 file can be built up one material at a time.

### Fixed (Repair bugs, etc)
- [[PR661]](https://github.com/lanl/singularity-eos/pull/661) Fix bug in InternalEnergyFromDensityPressure where the lambda wasn't threaded all the way through.
- `sesame2spiner` now validates the metadata returned by `eosGetMetadata` before using it. A matid absent from the sesame file previously produced all-zero bounds with no error, which reached `log()` and generated NaN grids; it is now reported and skipped.
- `sesame2spiner` no longer reports an HDF5 failure against every material following the first failed one, and now names the offending matid. Material save status is no longer accumulated by summing `herr_t` values, which could cancel out and report success.
- [[PR653]] (https://github.com/lanl/singularity-eos/pull/659) `sesame2spiner` now validates the metadata returned by `eosGetMetadata` before using it. A matid absent from the sesame file previously produced
- [[PR659]](https://github.com/lanl/singularity-eos/pull/659) `sesame2spiner` now validates the metadata returned by `eosGetMetadata` before using it. A matid absent from the sesame file previously produced all-zero bounds with no error, which reached `log()` and generated NaN grids; it is now reported and skipped.
- [[PR659]](https://github.com/lanl/singularity-eos/pull/659) `sesame2spiner` no longer reports an HDF5 failure against every material following the first failed one, and now names the offending matid. Material save status is no longer accumulated by summing `herr_t` values, which could cancel out and report success.
- [[PR659]](https://github.com/lanl/singularity-eos/pull/659) `sesame2spiner` now validates the metadata returned by `eosGetMetadata` before using it. A matid absent from the sesame file previously produced
all-zero bounds with no error, which reached `log()` and generated NaN grids; it is now reported and skipped. It also no longer reports an HDF5 failure against every material following the first failed one,
and now names the offending matid. Material save status is no longer accumulated by summing `herr_t` values, which could cancel out and report success.

### Changed (changing behavior/API/variables/...)
- [[PR658]](https://github.com/lanl/singularity-eos/pull/XXX) `ScaledEOS::CheckParams` now requires a strictly positive scale factor, where it previously accepted any nonzero value.
- [[PR658]](https://github.com/lanl/singularity-eos/pull/XXX) `sesame2spiner` now honors the requested verbosity when reading material metadata, rather than always using `Verbosity::Debug`. Default command line output is correspondingly quieter.
- [[PR658]](https://github.com/lanl/singularity-eos/pull/XXX) `sesame2spiner::getMatBounds` no longer takes a leading index argument, which was unused.
- [[PR658]](https://github.com/lanl/singularity-eos/pull/658) `ScaledEOS::CheckParams` now requires a strictly positive scale factor, where it previously accepted any nonzero value.
- [[PR659]](https://github.com/lanl/singularity-eos/pull/659) `sesame2spiner` now honors the requested verbosity when reading material metadata, rather than always using `Verbosity::Debug`. Default command line output is correspondingly quieter.
- [[PR659]](https://github.com/lanl/singularity-eos/pull/659) `sesame2spiner::getMatBounds` no longer takes a leading index argument, which was unused.

### Infrastructure (changes irrelevant to downstream codes)
- [[PR653]](https://github.com/lanl/singularity-eos/pull/653) Move pybind11 to a submodule rather than fetching it via cmake fetchcontent

### Deprecated (soon to be removed behavior/API/variables/...)
- [[PR658]](https://github.com/lanl/singularity-eos/pull/XXX) The table bounds accessors `sieMin()`/`sieMax()` on `SpinerEOSDependsRhoSie` and `StellarCollapse` are superseded by `MinimumInternalEnergy()`/`MaximumInternalEnergy()`, which every EOS provides and which work through modifiers and the `singularity::EOS` variant. The old names still work but will be removed.
- [[PR663]](https://github.com/lanl/singularity-eos/pull/663) Breaking change. Eigen removed as a dependency.
- [[PR658]](https://github.com/lanl/singularity-eos/pull/658) The table bounds accessors `sieMin()`/`sieMax()` on `SpinerEOSDependsRhoSie` and `StellarCollapse` are superseded by `MinimumInternalEnergy()`/`MaximumInternalEnergy()`, which every EOS provides and which work through modifiers and the `singularity::EOS` variant. The old names still work but will be removed.

## Release 1.12.1
Date: 08/10/2026
Expand All @@ -46,7 +47,7 @@ Date: 07/20/2026

### Fixed (Repair bugs, etc)
- [[PR645]](https://github.com/lanl/singularity-eos/pull/645) Fix internal energy from density and pressure for JWL
- [[PR63]](https://github.com/lanl/singularity-eos/pull/639) Fixed UnitSystem temperature bug. Temperature is now treated in the same as the time, mass, and length unit factors.
- [[PR639]](https://github.com/lanl/singularity-eos/pull/639) Fixed UnitSystem temperature bug. Temperature is now treated in the same as the time, mass, and length unit factors.
- [[PR637]](https://github.com/lanl/singularity-eos/pull/637) Fix is_normal

### Changed (changing behavior/API/variables/...)
Expand Down Expand Up @@ -100,7 +101,7 @@ Date: 12/25/2025
- [[PR563]](https://github.com/lanl/singularity-eos/pull/563) Fixed DensityFromPressureTemperature for the Carnahan-Starling EOS.
- [[PR564]](https://github.com/lanl/singularity-eos/pull/564) Fix logic for numerical vs type indices by adding safeGet(), safeSet(), safeMustGet(), and safeMustSet() helpers
- [[PR568]](https://github.com/lanl/singularity-eos/pull/568) Fix bug in FixedT and FixedP PTE solvers when materials have negative energies at the initial guess
- [[PR583]](https://github.com/lanl/singularity-eos/pull/582) Allow PTE solvers to operate on tables with pressure as a preferred input
- [[PR582]](https://github.com/lanl/singularity-eos/pull/582) Allow PTE solvers to operate on tables with pressure as a preferred input

### Changed (changing behavior/API/variables/...)
- [[PR579]](https://github.com/lanl/singularity-eos/pull/579) Python bindings now support numpy arrays with arbitrary stride. Numpy array length no longer required input.
Expand Down Expand Up @@ -141,7 +142,7 @@ Date: 8/27/2025
- [[PR545]](https://github.com/lanl/singularity-eos/pull/545) Implement reduced system for PTESolverRhoT
- [[PR543]](https://github.com/lanl/singularity-eos/pull/543) Made PTE solvers more robust for Maxwell constructed tables
- [[PR502]](https://github.com/lanl/singularity-eos/pull/502) Expose split tables to Fortran interface
- [[PR519]] (https://github.com/lanl/singularity-eos/pull/519) Split eos_spiner.hpp into eos_spiner_rho_sie.hpp and eos_spiner_rho_temp.hpp files.
- [[PR519]](https://github.com/lanl/singularity-eos/pull/519) Split eos_spiner.hpp into eos_spiner_rho_sie.hpp and eos_spiner_rho_temp.hpp files.

### Infrastructure (changes irrelevant to downstream codes)
- [[PR528]](https://github.com/lanl/singularity-eos/pull/528) Remove unused variable subGroup in SpinerEOSDependsRhoT
Expand Down Expand Up @@ -238,7 +239,7 @@ Date: 7/29/2024
- [[PR343]](https://github.com/lanl/singularity-eos/pull/343) Add chemical potentials to stellar collapse gold files
- [[PR342]](https://github.com/lanl/singularity-eos/pull/342) Fix missing using statement in stellar collapse root finding routines
- [[PR341]](https://github.com/lanl/singularity-eos/pull/341) Short-circuit HDF5 machinery when cray-wrappers used in-tree
- [[PR340]](https://github.com/lanl/singularity-eos/pull/335) Fix in-tree builds with plugin infrastructure
- [[PR340]](https://github.com/lanl/singularity-eos/pull/340) Fix in-tree builds with plugin infrastructure
- [[PR335]](https://github.com/lanl/singularity-eos/pull/335) Fix missing hermite.hpp in CMake install required for Helmholtz EOS
- [[PR356]](https://github.com/lanl/singularity-eos/pull/356) Guard against FPEs in the PTE solver
- [[PR356]](https://github.com/lanl/singularity-eos/pull/356) Update CMake for proper Kokkos linking in Fortran interface
Expand Down Expand Up @@ -278,7 +279,7 @@ Date: 11/28/2023
- [[PR238]](https://github.com/lanl/singularity-eos/pull/238) Fixed broken examples
- [[PR228]](https://github.com/lanl/singularity-eos/pull/228) added untracked header files in cmake
- [[PR215]](https://github.com/lanl/singularity-eos/pull/215) and [[PR216]](https://github.com/lanl/singularity-eos/pull/216) fix duplicate definition of EPS and fix CI
- [[PR232]](https://github.com/lanl/singularity-eos/pull/228) Fixed uninitialized cmake path variables
- [[PR232]](https://github.com/lanl/singularity-eos/pull/232) Fixed uninitialized cmake path variables
- [[PR308]](https://github.com/lanl/singularity-eos/pull/308) spack builds +fortran now compile via correct blocking out of interfaces via preprocessor ifdef

### Added (new features/APIs/variables/...)
Expand All @@ -292,7 +293,7 @@ Date: 11/28/2023
- [[PR265]](https://github.com/lanl/singularity-eos/pull/265) Add missing UnitSystem modifier combinations to variant and EOSPAC
- [[PR279]](https://github.com/lanl/singularity-eos/pull/279) added noble-abel EoS
- [[PR274]](https://github.com/lanl/singularity-eos/pull/274) added a stiffened gas EoS
- [[PR264]](https://github.com/lanl/singularity-eos/pull/274) added a Helmholtz EoS
- [[PR264]](https://github.com/lanl/singularity-eos/pull/264) added a Helmholtz EoS
- [[PR254]](https://github.com/lanl/singularity-eos/pull/254) added ability to peel off modifiers as needed
- [[PR250]](https://github.com/lanl/singularity-eos/pull/250) added mass fraction output to stellar collapse eos
- [[PR226]](https://github.com/lanl/singularity-eos/pull/226) added entropy interpolation to stellar collapse eos
Expand Down
44 changes: 9 additions & 35 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,10 @@ cmake_dependent_option(SINGULARITY_EOSPAC_USE_MODERN_ERROR_CODES
"Use the current eospac implementation of error codes, which must be compared with a function. Requires EOSPAC version 6.3.0 or greater."
ON "SINGULARITY_USE_EOSPAC" OFF)

# TODO This should be dependent option (or fortran option)
option(SINGULARITY_BUILD_CLOSURE "Mixed Cell Closure" ON)
option(SINGULARITY_BUILD_CLOSURE "Mixed Cell Closure (requires Kokkos and Kokkos Kernels)" OFF)

cmake_dependent_option(SINGULARITY_USE_CUDA "Use CUDA backend of Kokkos" OFF
"SINGULARITY_USE_KOKKOS" OFF)
cmake_dependent_option(
SINGULARITY_USE_KOKKOSKERNELS "Use KokkosKernels for LA routines" ON
"SINGULARITY_USE_KOKKOS;SINGULARITY_BUILD_CLOSURE" OFF)

# extra build options
option(SINGULARITY_BUILD_PYTHON "Compile Python bindings" OFF)
Expand Down Expand Up @@ -177,7 +173,6 @@ endif()
# ------------------------------------------------------------------------------#

# Load CMake modules for finding dependencies
include(singularity-eos/Eigen3)
include(singularity-eos/eospac)
include(singularity-eos/hdf5)
include(singularity-eos/kokkos)
Expand Down Expand Up @@ -273,20 +268,12 @@ if(SINGULARITY_FORCE_SUBMODULE_MODE)
set(SINGULARITY_SUBMODULE_MODE ON)
endif()

# Use to determine if Eigen is used or not
set(SINGULARITY_USE_EIGEN
OFF
CACHE BOOL "" FORCE)
if(SINGULARITY_BUILD_CLOSURE AND NOT SINGULARITY_USE_KOKKOSKERNELS)
if(SINGULARITY_USE_CUDA)
message(
FATAL_ERROR
"\"SINGULARITY_BUILD_CLOSURE=ON\" and \"SINGULARITY_USE_CUDA=ON\" requires \"SINGULARITY_USE_KOKKOSKERNELS=ON\""
)
if(SINGULARITY_BUILD_CLOSURE)
if(NOT SINGULARITY_USE_KOKKOS)
message(FATAL_ERROR
"SINGULARITY_BUILD_CLOSURE=ON requires SINGULARITY_USE_KOKKOS=ON. "
"Enable Kokkos or disable mixed cell closures.")
endif()
set(SINGULARITY_USE_EIGEN
ON
CACHE BOOL "" FORCE)
endif()

# ------------------------------------------------------------------------------#
Expand All @@ -306,7 +293,7 @@ if(SINGULARITY_SUBMODULE_MODE)
# Kokkos first (ports-of-call may depend on it if PORTABILITY_STRATEGY_KOKKOS is set)
if(SINGULARITY_USE_KOKKOS)
singularity_import_kokkos()
if(SINGULARITY_USE_KOKKOSKERNELS)
if(SINGULARITY_BUILD_CLOSURE)
singularity_import_kokkoskernels()
endif()
endif()
Expand All @@ -319,11 +306,6 @@ if(SINGULARITY_SUBMODULE_MODE)
singularity_import_spiner()
endif()

# Eigen (if needed)
if(SINGULARITY_USE_EIGEN)
singularity_import_eigen()
endif()

# And pybind11 (if needed)
if (SINGULARITY_BUILD_PYTHON)
singularity_import_pybind11()
Expand All @@ -334,7 +316,7 @@ else()
# Kokkos first
if(SINGULARITY_USE_KOKKOS)
singularity_find_kokkos()
if(SINGULARITY_USE_KOKKOSKERNELS)
if(SINGULARITY_BUILD_CLOSURE)
singularity_find_kokkoskernels()
endif()
endif()
Expand All @@ -347,11 +329,6 @@ else()
singularity_find_spiner()
endif()

# Eigen (if needed)
if(SINGULARITY_USE_EIGEN)
singularity_find_eigen()
endif()

# And pybind11 (if needed)
if (SINGULARITY_BUILD_PYTHON)
singularity_find_pybind11()
Expand Down Expand Up @@ -512,13 +489,10 @@ endif()
# see get_sg_eos.cpp
if(SINGULARITY_USE_KOKKOS)
singularity_enable_kokkos(singularity-eos_Common)
if(SINGULARITY_USE_KOKKOSKERNELS)
if(SINGULARITY_BUILD_CLOSURE)
singularity_enable_kokkoskernels(singularity-eos_Common)
endif()
endif()
if(SINGULARITY_USE_EIGEN)
singularity_enable_eigen(singularity-eos_Interface)
endif()

# ----------------------------------------------------------------------------#
# Optional dependencies
Expand Down
3 changes: 2 additions & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"name": "with_kokkos_gpu",
"hidden": true,
"cacheVariables": {
"SINGULARITY_USE_KOKKOS": "ON"
"SINGULARITY_USE_KOKKOS": "ON",
"SINGULARITY_BUILD_CLOSURE": "ON"
}
},
{
Expand Down
Loading
Loading