Skip to content
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
1 change: 1 addition & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Checks: >
cppcoreguidelines-*,
hicpp-*,
misc-*,
-misc-include-cleaner,
modernize-*,
-modernize-use-trailing-return-type,
mpi-*,
Expand Down
1 change: 0 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ Miscellaneous items that may need to be done when making a PR:
- [ ] Documentation related to this PR is up to date (Doxygen format)
- [ ] Unit test(s)
- [ ] Code is properly formatted
- [ ] Application update script is up to date
- [ ] PR labels are applied
- [ ] Issues are linked
3 changes: 1 addition & 2 deletions .github/workflows/clang-tidy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,4 @@ jobs:

- name: Run clang-tidy
run: |
./contrib/utilities/clang_tidy.sh -j$(nproc) -D REDUCED_TEMPLATES=ON

./contrib/utilities/clang_tidy.sh -j$(nproc)
9 changes: 5 additions & 4 deletions .github/workflows/compile_applications.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,17 @@ jobs:

- name: Compile PRISMS-PF
run: |
cmake -G Ninja .
cmake -G Ninja \
-D BUILD_APPLICATIONS=ON \
-D CMAKE_INSTALL_PREFIX=/usr/local \
.
ninja -j $(nproc)


- name: Compile PRISMS-PF applications
timeout-minutes: 30
run: |
export OMPI_ALLOW_RUN_AS_ROOT=1
export OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1

cd tests/automatic_tests
python3 application_debug_test.py --no-run
ninja -j $(nproc) install

2 changes: 1 addition & 1 deletion .github/workflows/cppcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ jobs:

- name: Run cppcheck
run: |
./contrib/utilities/cppcheck.sh -j$(nproc) -D REDUCED_TEMPLATES=ON
./contrib/utilities/cppcheck.sh -j$(nproc)

51 changes: 30 additions & 21 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,36 +40,42 @@ jobs:

- name: Compile PRISMS-PF
run: |
cmake -G Ninja .
cmake -G Ninja \
-D UNIT_TESTS=ON \
-D REGRESSION_TESTS=ON \
-D CMAKE_INSTALL_PREFIX=/usr/local \
.
ninja -j $(nproc)

- name: Run PRISMS-PF unit tests
run: |
export OMPI_ALLOW_RUN_AS_ROOT=1
export OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1

cd tests/unit_tests
cmake -G Ninja .
ninja -j $(nproc)
ctest
ninja run_tests

- name: Run PRISMS-PF automatic tests in serial
timeout-minutes: 30
run: |
export OMPI_ALLOW_RUN_AS_ROOT=1
export OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1

cd tests/automatic_tests
python3 run_automatic_tests.py
ninja install

- name: Run PRISMS-PF automatic tests in parallel
timeout-minutes: 30
run: |
export OMPI_ALLOW_RUN_AS_ROOT=1
export OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1

cd tests/automatic_tests
python3 run_automatic_tests.py -j 2
cmake -G Ninja \
-D UNIT_TESTS=ON \
-D REGRESSION_TESTS=ON \
-D N_THREADS=2 \
-D CMAKE_INSTALL_PREFIX=/usr/local \
.
ninja install

linux-optimizations:
runs-on: [ubuntu-22.04]
timeout-minutes: 120
Expand All @@ -84,36 +90,39 @@ jobs:

- name: Compile PRISMS-PF
run: |
cmake -G Ninja -D ADDITIONAL_OPTIMIZATIONS=ON .
cmake -G Ninja \
-D ADDITIONAL_OPTIMIZATIONS=ON \
-D UNIT_TESTS=ON \
-D REGRESSION_TESTS=ON \
-D CMAKE_INSTALL_PREFIX=/usr/local \
.
ninja -j $(nproc)

- name: Run PRISMS-PF unit tests
run: |
export OMPI_ALLOW_RUN_AS_ROOT=1
export OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1

cd tests/unit_tests
cmake -G Ninja .
ninja -j $(nproc)
ctest
ninja run_tests

- name: Run PRISMS-PF automatic tests in serial
timeout-minutes: 30
run: |
export OMPI_ALLOW_RUN_AS_ROOT=1
export OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1

cd tests/automatic_tests
python3 run_automatic_tests.py
ninja install

- name: Run PRISMS-PF automatic tests in parallel
timeout-minutes: 30
run: |
export OMPI_ALLOW_RUN_AS_ROOT=1
export OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1

cd tests/automatic_tests
python3 run_automatic_tests.py -j 2



cmake -G Ninja \
-D UNIT_TESTS=ON \
-D REGRESSION_TESTS=ON \
-D N_THREADS=2 \
-D CMAKE_INSTALL_PREFIX=/usr/local \
.
ninja install
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@ CTest*
**expand_template_instantiations_exe
**.inst

# The default install folder & files
install/
install_manifest.txt

# Config files
include/prismspf/config.h
cmake/prisms_pf_config.cmake
cmake/prisms_pf-config.cmake
cmake/prisms_pf-targets.cmake
cmake/templates
compile_commands.json

Expand All @@ -33,13 +38,14 @@ compile_commands.json
*.a

# Executables
main
main-release
main-debug

# Output files
*.vtu
*.pvtu
*.vtk
*.log
*.bin
output.txt
error.txt
Loading
Loading