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

Revert "Add new hydro and gravity kernels" #364

Merged
merged 1 commit into from
Jul 12, 2021
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
35 changes: 4 additions & 31 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,55 +24,28 @@ jobs:
steps:
- checkout:
path: /octotiger
- run:
name: Get reference data submodule
command: cd /octotiger && git submodule update --init --recursive && cd ..
- run:
name: Checkout CPPuddle
command: git clone https://github.com/G-071/hpx-kokkos-interopt-WIP.git cppuddle
- run:
name: Create CPPuddle installation directory
command: mkdir cppuddle-install
- run:
name: Configure CPPuddle
command: cmake -Hcppuddle -Bcppuddle/build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cppuddle-install
- run:
name: Build CPPuddle
command: cmake --build cppuddle/build -- -j 2 VERBOSE=1
- run:
name: Install CPPuddle
command: cmake --build cppuddle/build --target install
- run:
name: Configure Octo-Tiger
command: |
cmake -H/octotiger -B/octotiger/build \
-DCMAKE_BUILD_TYPE=Release \
-DHPX_DIR=/local/hpx/lib/cmake/HPX \
-DVc_DIR=/local/vc/lib/cmake/Vc \
-DCPPuddle_DIR=/root/project/cppuddle-install/lib/cmake/CPPuddle \
-DSilo_DIR=/local/silo \
-DHDF5_ROOT=/local/hdf5 \
-DBOOST_ROOT=/local/boost \
-DOCTOTIGER_WITH_Vc=OFF \
-DOCTOTIGER_WITH_DOCU=ON \
-GNinja
- run:
name: Build
command: cmake --build /octotiger/build -- -j2
- run:
name: Install CPPuddle lib to persistent octotiger directory
command: |
cp cppuddle-install/lib/libbuffer_manager.so /octotiger/build/libbuffer_manager.so
cp cppuddle-install/lib/libstream_manager.so /octotiger/build/libstream_manager.so
- run:
name: Documentation
command: make -C /octotiger/build doc
- persist_to_workspace:
root: /
paths:
- octotiger/build
- cppuddle/build
- cppuddle-install

test_marshak:
<<: *docker_config
Expand Down Expand Up @@ -105,7 +78,7 @@ jobs:
at: /
- run:
name: Blast test
command: ctest --output-on-failure -R test_problems.cpu.blast_legacy
command: ctest --output-on-failure -R test_problems.cpu.blast.diff
no_output_timeout: 200m
- run:
name: Move artifacts
Expand All @@ -126,7 +99,7 @@ jobs:
at: /
- run:
name: Sod shock tube test
command: ctest --output-on-failure -R test_problems.cpu.sod_legacy
command: ctest --output-on-failure -R test_problems.cpu.sod.diff
no_output_timeout: 25m
- run:
name: Move artifacts
Expand All @@ -147,7 +120,7 @@ jobs:
at: /
- run:
name: Solid sphere test
command: ctest --output-on-failure -R test_problems.cpu.sphere_legacy
command: ctest --output-on-failure -R test_problems.cpu.sphere.diff
no_output_timeout: 25m
- run:
name: Move artifacts
Expand All @@ -168,7 +141,7 @@ jobs:
at: /
- run:
name: Rotating star test
command: ctest --output-on-failure -R test_problems.cpu.rotating_star_legacy
command: ctest --output-on-failure -R test_problems.cpu.rotating_star.diff
no_output_timeout: 25m
- run:
name: Move artifacts
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ newgit
cmake-build-*
cmake-cuda-*
.spack-env/*
.clangd/*
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

173 changes: 0 additions & 173 deletions .jenkins/lsu/Jenkinsfile

This file was deleted.

38 changes: 0 additions & 38 deletions .jenkins/lsu/entry.sh

This file was deleted.

Loading