Skip to content

Commit 3c9bd98

Browse files
anaegelanaegel
authored
Merge pull request #101 from UG4/main
Main
2 parents db87e0d + 2a2e3eb commit 3c9bd98

File tree

16 files changed

+65
-58
lines changed

16 files changed

+65
-58
lines changed

‎.gitlab-ci.yml‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,26 @@ build-and-test:
1313
stage: test
1414
image: ubuntu:24.04
1515
timeout: 4 hours
16+
parallel:
17+
matrix:
18+
- UG_BUILD_ID: build-gcc-13
19+
UG_C_COMPILER: "gcc"
20+
UG_CXX_COMPILER: "g++"
21+
- UG_BUILD_ID: build-clang-15
22+
UG_C_COMPILER: "clang-15"
23+
UG_CXX_COMPILER: "clang++-15"
24+
#tags:
25+
# - ${PROVIDER}-${STACK}
26+
#environment: $PROVIDER/$STACK
1627
variables:
17-
CMAKE_C_COMPILER: "gcc"
18-
CMAKE_CXX_COMPILER: "g++"
1928
UGHUB_DIR: "$CI_PROJECT_DIR/ughub"
2029
UG4_OLD_DIR: "$CI_PROJECT_DIR/ug4-old"
2130
UG4_NEW_DIR: "$CI_PROJECT_DIR/ug4-new"
2231
before_script:
2332
- echo "Setting up base ug4 enviroment."
2433
- mkdir -p $UG4_NEW_DIR/ugcore
2534
- mv * $UG4_NEW_DIR/ugcore || true
26-
- apt-get update >/dev/null && apt-get install -y python3 git cmake build-essential >/dev/null
35+
- apt-get update >/dev/null && apt-get install -y python3 git cmake build-essential clang-15 >/dev/null
2736
- cd $CI_PROJECT_DIR && git clone https://gitlab.com/ug4-project/ughub.git
2837
- export PATH="$PATH:$UGHUB_DIR"
2938
- mkdir $UG4_OLD_DIR && cd $UG4_OLD_DIR
@@ -36,12 +45,12 @@ build-and-test:
3645
- cp --update=none -R $UG4_OLD_DIR/* $UG4_NEW_DIR
3746
# build ug4 in release
3847
- cd $UG4_NEW_DIR
39-
- mkdir -p build && cd build
40-
- cmake .. -DENABLE_ALL_PLUGINS=ON -DDEBUG=OFF -DCMAKE_BUILD_TYPE=Release
48+
- mkdir -p $UG_BUILD_ID && cd $UG_BUILD_ID
49+
- cmake .. -DENABLE_ALL_PLUGINS=ON -DDEBUG=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=$UG_CXX_COMPILER -DCMAKE_C_COMPILER=$UG_C_COMPILER
4150
- make -j 4
4251
# build testsuite
4352
- cd $UG4_NEW_DIR/apps/unit_tests
44-
- mkdir -p build && cd build
53+
- mkdir -p $UG_BUILD_ID && cd $UG_BUILD_ID
4554
- cmake .. -DUSE_JSON=OFF -DINTERNAL_BOOST=ON -DDEBUG=OFF -DCMAKE_BUILD_TYPE=Release
4655
- make -j 4
4756
- cd $UG4_NEW_DIR
@@ -54,10 +63,11 @@ build-and-test:
5463
paths:
5564
- $UG4_NEW_DIR/report.xml
5665
- $UG4_NEW_DIR/test.log
66+
# - $UG4_NEW_DIR/lib/*
5767
- $UG4_NEW_DIR/bin/*
5868
- $UG4_NEW_DIR/bin/plugins/*
5969
reports:
60-
junit: report.xml
70+
junit: $UG4_NEW_DIR/report.xml
6171

6272
# BUILD sources on various platforms and compilers
6373
deploy-docker:

‎ugbase/bridge/algebra_bridges/ordering_bridge.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#include "lib_algebra/lib_algebra.h"
4545

4646
// ordering algorithms
47-
#include "lib_algebra/ordering_strategies/algorithms/ordering_algorithms.cpp"
47+
#include "lib_algebra/ordering_strategies/algorithms/ordering_algorithms.h"
4848

4949
using namespace std;
5050

‎ugbase/lib_algebra/ordering_strategies/algorithms/IOrderingAlgorithm.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
* GNU Lesser General Public License for more details.
3131
*/
3232

33-
#ifndef __UG__LIB_ALGEBRA__ORDERING_STRATEGIES_ALGORITHMS_IORDERING_ALGORITHM__
34-
#define __UG__LIB_ALGEBRA__ORDERING_STRATEGIES_ALGORITHMS_IORDERING_ALGORITHM__
33+
#ifndef UG_BASE_LIB_ALGEBRA_ORDERING_STRATEGIES_ALGORITHMS_IORDERINGALGORITHM_H
34+
#define UG_BASE_LIB_ALGEBRA_ORDERING_STRATEGIES_ALGORITHMS_IORDERINGALGORITHM_H
3535

3636
#include "common/util/smart_pointer.h"
3737

@@ -76,6 +76,6 @@ class IOrderingAlgorithm{
7676
virtual const char* name() const = 0;
7777
};
7878

79-
} //namespace
79+
}
8080

81-
#endif //guard
81+
#endif

‎ugbase/lib_algebra/ordering_strategies/algorithms/SCC_ordering.cpp‎ renamed to ‎ugbase/lib_algebra/ordering_strategies/algorithms/SCC_ordering.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
* GNU Lesser General Public License for more details.
3131
*/
3232

33-
#ifndef __UG__LIB_ALGEBRA__ORDERING_STRATEGIES_ALGORITHMS_SCC_ORDERING__
34-
#define __UG__LIB_ALGEBRA__ORDERING_STRATEGIES_ALGORITHMS_SCC_ORDERING__
33+
#ifndef UG_BASE_LIB_ALGEBRA_ORDERING_STRATEGIES_ALGORITHMS_SCC_ORDERING_H
34+
#define UG_BASE_LIB_ALGEBRA_ORDERING_STRATEGIES_ALGORITHMS_SCC_ORDERING_H
3535

3636
#include <boost/graph/adjacency_list.hpp>
3737
#include <boost/graph/graph_traits.hpp>
@@ -41,8 +41,8 @@
4141
#include <boost/graph/strong_components.hpp>
4242

4343
#include "IOrderingAlgorithm.h"
44-
#include "topological_ordering.cpp"
45-
#include "util.cpp"
44+
#include "topological_ordering.h"
45+
#include "util.h"
4646
#include "lib_algebra/algebra_common/permutation_util.h"
4747

4848
//debug
@@ -233,7 +233,7 @@ class SCCOrdering : public IOrderingAlgorithm<TAlgebra, O_t>
233233
};
234234

235235

236-
} //namespace
236+
}
237237

238238

239-
#endif //guard
239+
#endif

‎ugbase/lib_algebra/ordering_strategies/algorithms/boost_cuthill_mckee_ordering.cpp‎ renamed to ‎ugbase/lib_algebra/ordering_strategies/algorithms/boost_cuthill_mckee_ordering.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
* GNU Lesser General Public License for more details.
3131
*/
3232

33-
#ifndef __UG__LIB_ALGEBRA__ORDERING_STRATEGIES_ALGORITHMS_BOOST_CUTHILL_MCKEE_ORDERING__
34-
#define __UG__LIB_ALGEBRA__ORDERING_STRATEGIES_ALGORITHMS_BOOST_CUTHILL_MCKEE_ORDERING__
33+
#ifndef UG_BASE_LIB_ALGEBRA_ORDERING_STRATEGIES_ALGORITHMS_BOOST_CUTHILL_MCKEE_ORDERING_H
34+
#define UG_BASE_LIB_ALGEBRA_ORDERING_STRATEGIES_ALGORITHMS_BOOST_CUTHILL_MCKEE_ORDERING_H
3535

3636
#include <boost/graph/adjacency_list.hpp>
3737
#include <boost/graph/graph_traits.hpp>
@@ -40,7 +40,7 @@
4040
#include <boost/graph/cuthill_mckee_ordering.hpp>
4141

4242
#include "IOrderingAlgorithm.h"
43-
#include "util.cpp"
43+
#include "util.h"
4444

4545
//debug
4646
#include "common/error.h"
@@ -200,6 +200,6 @@ class BoostCuthillMcKeeOrdering : public IOrderingAlgorithm<TAlgebra, O_t>
200200
bool m_bReverse;
201201
};
202202

203-
} //namespace
203+
}
204204

205-
#endif //guard
205+
#endif

‎ugbase/lib_algebra/ordering_strategies/algorithms/boost_minimum_degree_ordering.cpp‎ renamed to ‎ugbase/lib_algebra/ordering_strategies/algorithms/boost_minimum_degree_ordering.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
* GNU Lesser General Public License for more details.
3131
*/
3232

33-
#ifndef __UG__LIB_ALGEBRA__ORDERING_STRATEGIES_ALGORITHMS_BOOST_MINIMUM_DEGREE_ORDERING__
34-
#define __UG__LIB_ALGEBRA__ORDERING_STRATEGIES_ALGORITHMS_BOOST_MINIMUM_DEGREE_ORDERING__
33+
#ifndef UG_BASE_LIB_ALGEBRA_ORDERING_STRATEGIES_ALGORITHMS_BOOST_MINIMUM_DEGREE_ORDERING_H
34+
#define UG_BASE_LIB_ALGEBRA_ORDERING_STRATEGIES_ALGORITHMS_BOOST_MINIMUM_DEGREE_ORDERING_H
3535

3636
#include <boost/graph/adjacency_list.hpp>
3737
#include <boost/graph/graph_traits.hpp>
@@ -40,7 +40,7 @@
4040
#include <boost/graph/minimum_degree_ordering.hpp>
4141

4242
#include "IOrderingAlgorithm.h"
43-
#include "util.cpp"
43+
#include "util.h"
4444

4545
//debug
4646
#include "common/error.h"
@@ -170,6 +170,6 @@ class BoostMinimumDegreeOrdering final : public IOrderingAlgorithm<TAlgebra, O_t
170170
O_t o;
171171
};
172172

173-
} //namespace
173+
}
174174

175-
#endif //guard
175+
#endif

‎ugbase/lib_algebra/ordering_strategies/algorithms/iters.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@
2929
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3030
* GNU Lesser General Public License for more details.
3131
*/
32-
33-
#ifndef __UG__LIB_ALGEBRA__ORDERING_STRATEGIES_ALGORITHMS_ITERS__
34-
#define __UG__LIB_ALGEBRA__ORDERING_STRATEGIES_ALGORITHMS_ITERS__
3532

3633
#include <tuple>
34+
#include <vector>
3735

3836
namespace ug{
3937

@@ -192,4 +190,3 @@ std::tuple<non_dirichlet_iterator<TAlgebra>, non_dirichlet_iterator<TAlgebra> >
192190

193191
} //namespace
194192

195-
#endif //guard

‎ugbase/lib_algebra/ordering_strategies/algorithms/native_cuthill_mckee.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#ifndef __UG__LIB_ALGEBRA__ORDERING_STRATEGIES_ALGORITHMS_NATIVE_CUTHILL_MCKEE_ORDERING_CPP__
2-
#define __UG__LIB_ALGEBRA__ORDERING_STRATEGIES_ALGORITHMS_NATIVE_CUTHILL_MCKEE_ORDERING_CPP__
31

42
#include "common/common.h"
53
#include "common/profiler/profiler.h"
@@ -294,5 +292,3 @@ void ComputeCuthillMcKeeOrder(std::vector<size_t>& vNewIndex,
294292
}
295293

296294
}
297-
298-
#endif //guard

‎ugbase/lib_algebra/ordering_strategies/algorithms/native_cuthill_mckee.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
*/
3232

3333

34-
#ifndef __UG__LIB_ALGEBRA__ORDERING_STRATEGIES_ALGORITHMS_NATIVE_CUTHILL_MCKEE_ORDERING__
35-
#define __UG__LIB_ALGEBRA__ORDERING_STRATEGIES_ALGORITHMS_NATIVE_CUTHILL_MCKEE_ORDERING__
34+
#ifndef UG_BASE_LIB_ALGEBRA_ORDERING_STRATEGIES_ALGORITHMS_NATIVE_CUTHILL_MCKEE_H
35+
#define UG_BASE_LIB_ALGEBRA_ORDERING_STRATEGIES_ALGORITHMS_NATIVE_CUTHILL_MCKEE_H
3636

3737
#include <vector>
3838

3939
#include "IOrderingAlgorithm.h"
40-
#include "util.cpp"
40+
#include "util.h"
4141

4242
//debug
4343
#include "common/error.h"
@@ -179,6 +179,6 @@ class NativeCuthillMcKeeOrdering : public IOrderingAlgorithm<TAlgebra, O_t>
179179
};
180180

181181

182-
} // end namespace ug
182+
}
183183

184184
#endif

‎ugbase/lib_algebra/ordering_strategies/algorithms/ordering_algorithms.cpp‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)