Skip to content
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.

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

Semicolon missing ExaMPM_Solver.hpp #51

Merged
merged 4 commits into from
Sep 14, 2023
Merged
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
41 changes: 39 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,33 @@ on:

jobs:
CI:
defaults:
run:
shell: bash
strategy:
matrix:
distro: ['ubuntu:latest']
backend: ["SERIAL", "OPENMP"]
output: ['HDF5']
include:
- distro: 'ubuntu:latest'
cxx: 'g++'
backend: 'SERIAL'
cmake_build_type: 'Debug'
kokkos_ver: '3.6.01'
output: 'SILO'
- distro: 'ubuntu:latest'
cxx: 'g++'
backend: 'SERIAL'
cmake_build_type: 'Debug'
kokkos_ver: '3.6.01'
output: 'NONE'
- distro: 'ubuntu:latest'
cxx: 'g++'
backend: 'SERIAL'
cmake_build_type: 'Debug'
kokkos_ver: '3.6.01'
output: 'BOTH'
runs-on: ubuntu-20.04
container:
image: ghcr.io/ecp-copa/ci-containers/${{ matrix.distro }}
Expand All @@ -37,12 +60,26 @@ jobs:
uses: actions/[email protected]
with:
repository: ECP-copa/Cabana
ref: master
# This version is post-release 0.5
ref: a592efaadadeae2475c7e72efe3f62bf4f1fd3bd
path: Cabana
- name: Build Cabana
working-directory: Cabana
run: |
cmake -B build -DCMAKE_INSTALL_PREFIX=$HOME/Cabana -DCMAKE_PREFIX_PATH="$HOME/kokkos" -DCabana_REQUIRE_${{ matrix.backend }}=ON
if [[ ${{ matrix.output }} == 'HDF5' ]]; then
cabana_cmake_opts+=( -DCabana_REQUIRE_HDF5=ON -DCMAKE_DISABLE_FIND_PACKAGE_SILO=ON )
elif [[ ${{ matrix.output }} == 'SILO' ]]; then
cabana_cmake_opts+=( -DCabana_REQUIRE_SILO=ON -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=ON )
elif [[ ${{ matrix.output }} == 'BOTH' ]]; then
cabana_cmake_opts+=( -DCabana_REQUIRE_SILO=ON -DCabana_REQUIRE_HDF5=ON )
else
cabana_cmake_opts+=( -DCMAKE_DISABLE_FIND_PACKAGE_SILO=ON -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=ON )
fi
cmake -B build \
-DCMAKE_INSTALL_PREFIX=$HOME/Cabana \
-DCMAKE_PREFIX_PATH="$HOME/kokkos" \
-DCabana_REQUIRE_${{ matrix.backend }}=ON \
${cabana_cmake_opts[@]}
cmake --build build --parallel 2
cmake --install build
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion src/ExaMPM_Solver.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class Solver : public SolverBase
if ( _rank == 0 )
std::cout << "No particle output enabled in Cabana. Add "
"Cabana_REQUIRE_HDF5=ON or Cabana_REQUIRE_SILO=ON to "
"the Cabana build if needed."
"the Cabana build if needed.";
#endif
#endif
}
Expand Down
Loading