Skip to content

Commit fb79d91

Browse files
Merge pull request #1326 from DLR-AMR/compile_actions_with_O1
Configure with -O1 on debug-builds
2 parents fcc867a + 6675507 commit fb79d91

File tree

7 files changed

+41
-29
lines changed

7 files changed

+41
-29
lines changed

.github/workflows/build_cmake_tarball.yml

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,16 @@ name: CMake Tarball
2626

2727
env:
2828
MAKEFLAGS: "-j2 V=0"
29+
DEBUG_CONFIG: "-O1"
2930

3031

3132
on:
32-
push:
33-
branches:
34-
- main
35-
- develop
36-
- CI-*tarball* # for testing this script, all feature branches with "tarball" in their name
37-
pull_request:
38-
branches:
39-
- main
40-
- develop
41-
workflow_dispatch:
33+
workflow_call:
34+
inputs:
35+
LESS_TESTS:
36+
required: true
37+
type: boolean
38+
description: 'Enable less tests option for configuring'
4239

4340
jobs:
4441
build:
@@ -57,6 +54,11 @@ jobs:
5754
fetch-depth: 0 # required to get all history, especially the version tags
5855
- name: install sudo
5956
run: apt update && apt install sudo
57+
# Start building tarball
58+
- name: Install pandoc
59+
uses: nikeee/setup-pandoc@v1
60+
- name: Test pandoc
61+
run: pandoc --version
6062
# On the github Ubuntu 20.04, sudo is not available by default
6163
# we need it, however, to update/upgrade our packages.
6264
- name: Update packages
@@ -68,19 +70,14 @@ jobs:
6870
run: git submodule init
6971
- name: update submodules
7072
run: git submodule update
71-
- name: bootstrap
72-
run: ./bootstrap
73+
7374
#
7475
# T8CODE
7576
# with p4est and sc as internal dependencies which is needed for make dist
7677
#
7778
#
78-
- name: less-test option
79-
if: ${{ inputs.LESS_TESTS }}
80-
run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON"
81-
&& echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV
8279
- name: build config variables
83-
run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=OFF -DT8CODE_USE_SYSTEM_P4EST=OFF -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE"
80+
run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DCMAKE_C_FLAGS_DEBUG=$DEBUG_FLAGS -DCMAKE_CXX_FLAGS_DEBUG=$DEBUG_FLAGS -DT8CODE_USE_SYSTEM_SC=OFF -DT8CODE_USE_SYSTEM_P4EST=OFF -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE"
8481
&& echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV
8582
- name: cmake
8683
run: mkdir build && cd build && cmake ../ $CONFIG_OPTIONS
@@ -90,11 +87,6 @@ jobs:
9087
with:
9188
name: config.log
9289
path: build/config.log
93-
# Start building tarball
94-
- name: Install pandoc
95-
uses: nikeee/setup-pandoc@v1
96-
- name: Test pandoc
97-
run: pandoc --version
9890
# Build the tarball
9991
- name: Make tarball
10092
run: cd build && ninja GenerateVersionFile && ninja package_source && mkdir tarballs && mv package/*Source.tar.gz tarballs
@@ -131,11 +123,11 @@ jobs:
131123

132124
# build config vars
133125
- name: less-test-option
134-
if: github.event_name == 'pull_request'
126+
if: ${{ inputs.LESS_TESTS }}
135127
run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON"
136128
&& echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV
137129
- name: build config variables
138-
run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=OFF -DT8CODE_USE_SYSTEM_P4EST=OFF -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE"
130+
run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DCMAKE_C_FLAGS_DEBUG=${DEBUG_CONFIG} -DCMAKE_CXX_FLAGS_DEBUG=${DEBUG_CONFIG} -DT8CODE_USE_SYSTEM_SC=OFF -DT8CODE_USE_SYSTEM_P4EST=OFF -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE"
139131
&& echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV
140132
- name: Check vars
141133
run: echo "[$CONFIG_DEBUG]"

.github/workflows/tests_cmake_t8code.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ name: CMake tests t8code
2121
# along with t8code; if not, write to the Free Software Foundation, Inc.,
2222
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
2323

24+
env:
25+
DEBUG_CONFIG: "-O1"
26+
2427
on:
2528
workflow_call:
2629
inputs:
@@ -81,7 +84,7 @@ jobs:
8184
run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON"
8285
&& echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV
8386
- name: build config variables
84-
run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake"
87+
run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DCMAKE_C_FLAGS_DEBUG=${DEBUG_CONFIG} -DCMAKE_CXX_FLAGS_DEBUG=${DEBUG_CONFIG} -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake"
8588
&& echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV
8689
# cmake and test
8790
- name: Printing MPI compiler info

.github/workflows/tests_cmake_t8code_api.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ name: CMake tests t8code api
2121
# along with t8code; if not, write to the Free Software Foundation, Inc.,
2222
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
2323

24+
env:
25+
DEBUG_CONFIG: "-O1"
26+
2427
on:
2528
workflow_call:
2629
inputs:
@@ -82,7 +85,7 @@ jobs:
8285
run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON"
8386
&& echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV
8487
- name: build config variables
85-
run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake"
88+
run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DCMAKE_C_FLAGS_DEBUG=${DEBUG_CONFIG} -DCMAKE_CXX_FLAGS_DEBUG=${DEBUG_CONFIG} -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake"
8689
&& echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV
8790
# cmake and test with fortran
8891
- name: check fortran

.github/workflows/tests_cmake_t8code_linkage.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ name: CMake tests t8code linkage
2121
# along with t8code; if not, write to the Free Software Foundation, Inc.,
2222
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
2323

24+
env:
25+
DEBUG_CONFIG: "-O1"
26+
2427
on:
2528
workflow_call:
2629
inputs:
@@ -82,7 +85,7 @@ jobs:
8285
run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON"
8386
&& echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV
8487
- name: build config variables
85-
run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake"
88+
run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DCMAKE_C_FLAGS_DEBUG=${DEBUG_CONFIG} -DCMAKE_CXX_FLAGS_DEBUG=${DEBUG_CONFIG} -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake"
8689
&& echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV
8790
# cmake and test with netcdf
8891
- name: check NetCDF

.github/workflows/tests_cmake_t8code_w_shipped_submodules.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ name: CMake tests t8code with shipped submodules
2121
# along with t8code; if not, write to the Free Software Foundation, Inc.,
2222
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
2323

24+
env:
25+
DEBUG_CONFIG: "-O1"
26+
2427
on:
2528
workflow_call:
2629
inputs:
@@ -78,7 +81,7 @@ jobs:
7881
run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON"
7982
&& echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV
8083
- name: build config variables
81-
run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE"
84+
run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DCMAKE_C_FLAGS_DEBUG=${DEBUG_CONFIG} -DCMAKE_CXX_FLAGS_DEBUG=${DEBUG_CONFIG} -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE"
8285
&& echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV
8386
# cmake and test
8487
- name: Printing MPI compiler info

.github/workflows/tests_cmake_testsuite.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,3 +141,10 @@ jobs:
141141
MPI: ON
142142
BUILD_TYPE: Debug
143143
LESS_TESTS: ${{ github.event_name == 'pull_request' }}
144+
145+
t8code_tarball:
146+
if: (github.event_name == 'schedule' && github.repository == 'DLR-AMR/t8code') || (github.event_name != 'schedule')
147+
uses: ./.github/workflows/build_cmake_tarball.yml
148+
needs: [preparation, sc_p4est_tests, t8code_tests, t8code_linkage_tests, t8code_api_tests, t8code_w_shipped_submodules_tests]
149+
with:
150+
LESS_TESTS: ${{ github.event_name == 'pull_request' }}

test/t8_schemes/t8_gtest_root.cxx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@
2525

2626
#include <gtest/gtest.h>
2727
#include <test/t8_gtest_custom_assertion.hxx>
28-
#include <test/t8_gtest_macros.hxx>
2928
#include <t8_eclass.h>
3029
#include <t8_schemes/t8_default/t8_default.hxx>
30+
#include <test/t8_gtest_macros.hxx>
3131

3232
class root: public testing::TestWithParam<t8_eclass> {
33+
3334
protected:
3435
void
3536
SetUp () override

0 commit comments

Comments
 (0)