Skip to content

Commit

Permalink
Merge branch 'main' of github.com:lanl/singularity-eos into jhp/MinEn…
Browse files Browse the repository at this point in the history
…ergyBound
  • Loading branch information
jhp-lanl committed Feb 20, 2025
2 parents 21510e6 + b4f6475 commit 6a133af
Show file tree
Hide file tree
Showing 158 changed files with 13,210 additions and 2,777 deletions.
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ detail. Why is this change required? What problem does it solve?-->
If preparing for a new release, in addition please check the following:
- [ ] Update the version in cmake.
- [ ] Move the changes in the CHANGELOG.md file under a new header for the new release, and reset the categories.
- [ ] Ensure that any `when='@main'` dependencies are updated to the release version in the package.py
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
-DSINGULARITY_USE_SPINER_WITH_HDF5=OFF \
-DSINGULARITY_FORCE_SUBMODULE_MODE=ON \
-B build .
cmake --build build
cmake --build build --parallel 4
sudo cmake --install build
- name: build docs
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/draft-pdf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
# This should be the path to the paper within your repo.
paper-path: joss-paper/paper.md
- name: Upload
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: paper
# This is the output path where Pandoc will write the compiled
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
formatting:
name: Check Formatting
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Checkout code
Expand Down
40 changes: 40 additions & 0 deletions .github/workflows/sanitizer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Sanitizer

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
sanitizer:
name: Run clang sanitizer on minimal code subset
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3
with:
submodules: recursive
- name: Set system to non-interactive mode
run: export DEBIAN_FRONTEND=noninteractive
- name: install dependencies
run: |
sudo apt-get update -y -qq
sudo apt-get install -y --allow-downgrades --allow-remove-essential --allow-change-held-packages -qq build-essential clang llvm
- name: build and run tests
run: |
mkdir -p bin
cd bin
cmake -DCMAKE_CXX_COMPILER=clang++ \
-DCMAKE_CXX_FLAGS="-fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer" \
-DCMAKE_BUILD_TYPE=Debug \
-DSINGULARITY_STRICT_WARNINGS=ON \
-DSINGULARITY_USE_FORTRAN=OFF \
-DSINGULARITY_BUILD_FORTRAN_BACKEND=ON \
-DSINGULARITY_BUILD_TESTS=ON \
-DSINGULARITY_FORCE_SUBMODULE_MODE=ON \
-DSINGULARITY_USE_KOKKOS=ON \
..
make -j4
ctest --output-on-failure
11 changes: 8 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@ jobs:
- name: install dependencies
run: |
sudo apt-get update -y -qq
sudo apt-get install -y --allow-downgrades --allow-remove-essential --allow-change-held-packages -qq build-essential gfortran libhdf5-serial-dev
sudo apt-get install -y --allow-downgrades --allow-remove-essential --allow-change-held-packages -qq build-essential gfortran libhdf5-serial-dev binutils-gold
pip install numpy
pip install h5py
- name: build and run tests
run: |
mkdir -p bin
cd bin
ulimit -m unlimited
ulimit -v unlimited
mkdir -p ${HOME}/install
cmake -DCMAKE_INSTALL_PREFIX=${HOME}/install \
-DSINGULARITY_USE_SPINER=ON \
Expand All @@ -38,11 +40,14 @@ jobs:
-DSINGULARITY_USE_HELMHOLTZ=ON \
-DSINGULARITY_TEST_HELMHOLTZ=ON \
-DSINGULARITY_FORCE_SUBMODULE_MODE=ON \
-DSINGULARITY_USE_V_AND_V_EOS=OFF \
-DSINGULARITY_PLUGINS=$(pwd)/../example/plugin \
-DCMAKE_LINKER=ld.gold \
-DCMAKE_BUILD_TYPE=Release \
..
#-DSINGULARITY_TEST_PYTHON=ON \
#-DSINGULARITY_TEST_STELLAR_COLLAPSE=ON \
#..
make
make -j4
make install
make test
ctest --output-on-failure
9 changes: 5 additions & 4 deletions .github/workflows/tests_minimal.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Tests Minimal
name: Tests Minimal No Kokkos

on:
push:
Expand Down Expand Up @@ -28,11 +28,12 @@ jobs:
cd bin
mkdir -p ${HOME}/install
cmake -DCMAKE_INSTALL_PREFIX=${HOME}/install \
-DSINGULARITY_USE_SPINER=ON \
-DSINGULARITY_USE_SPINER=OFF \
-DSINGULARITY_USE_SPINER_WITH_HDF5=OFF \
-DSINGULARITY_BUILD_TESTS=ON \
-DSINGULARITY_FORCE_SUBMODULE_MODE=ON \
-DSINGULARITY_USE_KOKKOS=OFF \
..
make
make -j4
make install
make test
ctest --output-on-failure
39 changes: 39 additions & 0 deletions .github/workflows/tests_minimal_kokkos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Tests Minimal With Kokkos

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
tests-minimal:
name: Run minimal set of tests, to constrain minimal build
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3
with:
submodules: recursive
- name: Set system to non-interactive mode
run: export DEBIAN_FRONTEND=noninteractive
- name: install dependencies
run: |
sudo apt-get update -y -qq
sudo apt-get install -y --allow-downgrades --allow-remove-essential --allow-change-held-packages -qq build-essential
- name: build and run tests
run: |
mkdir -p bin
cd bin
mkdir -p ${HOME}/install
cmake -DCMAKE_INSTALL_PREFIX=${HOME}/install \
-DSINGULARITY_USE_SPINER=OFF \
-DSINGULARITY_USE_SPINER_WITH_HDF5=OFF \
-DSINGULARITY_BUILD_TESTS=ON \
-DSINGULARITY_FORCE_SUBMODULE_MODE=ON \
-DSINGULARITY_USE_KOKKOS=ON \
..
make -j4
make install
ctest --output-on-failure
37 changes: 37 additions & 0 deletions .github/workflows/warnings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Warnings

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
warnings-gcc:
name: Ensure no warnings from gcc
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3
with:
submodules: recursive
- name: Set system to non-interactive mode
run: export DEBIAN_FRONTEND=noninteractive
- name: install dependencies
run: |
sudo apt-get update -y -qq
sudo apt-get install -y --allow-downgrades --allow-remove-essential --allow-change-held-packages -qq build-essential
- name: build and run tests
run: |
mkdir -p bin
cd bin
cmake -DCMAKE_BUILD_TYPE=Debug \
-DSINGULARITY_STRICT_WARNINGS=ON \
-DSINGULARITY_USE_FORTRAN=OFF \
-DSINGULARITY_BUILD_FORTRAN_BACKEND=ON \
-DSINGULARITY_BUILD_TESTS=ON \
-DSINGULARITY_FORCE_SUBMODULE_MODE=ON \
-DSINGULARITY_USE_KOKKOS=ON \
..
make -j4
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ spack-configure-*
*.sublime*
CMakeUserPresets.json
build/

goldfiles.tar.gz
Loading

0 comments on commit 6a133af

Please sign in to comment.