From b81445d2d78570f2c5ac994b5f4001ec01c7d801 Mon Sep 17 00:00:00 2001 From: Emily Bourne Date: Mon, 8 Apr 2024 08:38:00 +0000 Subject: [PATCH] Add OMP CI Add an additional step to the CI to test the OpenMP acceleration. This was previously tested alongside the GPU setup but was deactivated in !427 to avoid Ginkgo issues. It is now restored. See merge request gysela-developpers/gyselalibxx!434 -------------------------------------------- Co-authored-by: Thomas Padioleau --- .gitlab-ci.yml | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43aa8eeaa..3f2f27d2e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ cmake_tests: rm -rf build || true mkdir build cd build - cmake -DCMAKE_CXX_FLAGS="-Wall -Werror=unused-variable -Wno-sign-compare" -DBUILD_BENCHMARKS=ON $GENERAL_CMAKE_OPTIONS .. + cmake -DCMAKE_CXX_FLAGS="-Wall -Werror=unused-variable -Wno-sign-compare" -DBUILD_BENCHMARKS=ON $GENERAL_CMAKE_OPTIONS -DKokkos_ENABLE_SERIAL=ON .. make -j 4 ctest -j 2 --output-on-failure --timeout 5 -LE test_on_Release_only --output-junit tests.xml artifacts: @@ -30,7 +30,7 @@ cmake_tests_Release: rm -rf build || true mkdir build cd build - cmake -DCMAKE_CXX_FLAGS="-Wall -Wno-sign-compare" -DBUILD_BENCHMARKS=ON -DCMAKE_BUILD_TYPE=Release $GENERAL_CMAKE_OPTIONS .. + cmake -DCMAKE_CXX_FLAGS="-Wall -Wno-sign-compare" -DBUILD_BENCHMARKS=ON -DCMAKE_BUILD_TYPE=Release $GENERAL_CMAKE_OPTIONS -DKokkos_ENABLE_SERIAL=ON .. make -j 4 ctest -j 2 --output-on-failure --timeout 5 --output-junit tests.xml ls ./tests/geometryXVx/landau/fft/growthrate_t0.0to45.0.png @@ -44,6 +44,29 @@ cmake_tests_Release: reports: junit: ./build/tests.xml +cmake_tests_Release_OMP: + extends: .cmake_tests + image: ghcr.io/gyselax/gyselalibxx_env + script: | + set -x + git config --global --add safe.directory /builds/gysela-developpers/gyselalibxx/vendor/kokkos + rm -rf build || true + mkdir build + cd build + cmake -DCMAKE_CXX_FLAGS="-Wall -Wno-sign-compare" -DBUILD_BENCHMARKS=ON -DCMAKE_BUILD_TYPE=Release $GENERAL_CMAKE_OPTIONS -DKokkos_ENABLE_OPENMP=ON .. + make -j 4 + OMP_NUM_THREADS=2 ctest -j 2 --output-on-failure --timeout 5 --output-junit tests.xml + ls ./tests/geometryXVx/landau/fft/growthrate_t0.0to45.0.png + ls ./tests/geometryXVx/landau/fft/frequency_t0.0to45.0.png + artifacts: + when: always + expire_in: 1 day + paths: + - ./build/tests/geometryXVx/landau/fft/growthrate_t0.0to45.0.png + - ./build/tests/geometryXVx/landau/fft/frequency_t0.0to45.0.png + reports: + junit: ./build/tests.xml + cmake_tests_Release_GPU: extends: .cmake_tests tags: