Skip to content

Commit ec953d0

Browse files
phlptpphlptp
authored
Merge pull request #2714 from GMLC-TDC/develop
Develop
2 parents 389bc89 + 401749a commit ec953d0

File tree

458 files changed

+36057
-9526
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

458 files changed

+36057
-9526
lines changed

‎.ci/.drone.yml

-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
# include:
3838
# - refs/heads/main
3939
# - refs/heads/develop
40-
# - refs/heads/helics2
4140
# - 'refs/pull/**'
4241
# - 'refs/tags/**'
4342
#
@@ -80,6 +79,5 @@ trigger:
8079
include:
8180
- refs/heads/main
8281
- refs/heads/develop
83-
- refs/heads/helics2
8482
- "refs/pull/**"
8583
- "refs/tags/**"

‎.ci/azure-pipelines-daily.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
strategy:
1313
matrix:
1414
all-tests:
15-
containerImage: "helics/buildenv:ubuntu20.04-default-builder"
15+
containerImage: "helics/buildenv:ubuntu22.04-default-builder"
1616
test_config: "daily"
1717
zmq-subproject:
18-
containerImage: "helics/buildenv:ubuntu20.04-default-builder"
18+
containerImage: "helics/buildenv:ubuntu22.04-default-builder"
1919
test_config: "ci"
2020
zmq_subproject: true
2121
pool:

‎.ci/azure-pipelines.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ jobs:
1212
strategy:
1313
matrix:
1414
ubuntuDefault:
15-
containerImage: "helics/buildenv:ubuntu20.04-default-builder"
15+
containerImage: "helics/buildenv:ubuntu22.04-default-builder"
1616
test_config: "ci"
1717
use_mpi: "true"
1818
encrypted: "true"
19-
gcc8:
20-
containerImage: "helics/buildenv:gcc8-builder"
19+
gcc11:
20+
containerImage: "helics/buildenv:gcc11-builder"
2121
test_config: "ci"
2222
use_mpi: "true"
2323
encrypted: "true"
24-
clang13:
25-
containerImage: "helics/buildenv:clang13-builder"
24+
clang15:
25+
containerImage: "helics/buildenv:clang15-builder"
2626
test_config: "ci"
2727
use_mpi: ""
2828
encrypted: ""
29-
clang7:
30-
containerImage: "helics/buildenv:clang7-builder"
29+
clang18:
30+
containerImage: "helics/buildenv:clang18-builder"
3131
test_config: "ci"
3232
use_mpi: ""
3333
encrypted: ""
@@ -64,11 +64,11 @@ jobs:
6464
matrix:
6565
XCode-latest:
6666
test_config: "ci"
67-
vmImage: "macOS-13"
67+
vmImage: "macOS-14"
6868
XCode-oldest:
6969
test_config: "ci"
70-
vmImage: "macOS-12"
71-
xcode_path: "/Applications/Xcode_13.2.1.app"
70+
vmImage: "macOS-13"
71+
xcode_path: "/Applications/Xcode_14.1.app"
7272
pool:
7373
vmImage: $[ variables['vmImage'] ]
7474
timeoutInMinutes: 60
@@ -111,7 +111,7 @@ jobs:
111111
imageName: "windows-2019"
112112
langArch: "x64"
113113
vsArch: "x64"
114-
extraFlags: ""
114+
extraFlags: "-DHELICS_DISABLE_WEBSERVER=ON"
115115
VS2022-64bit:
116116
imageName: "windows-2022"
117117
langArch: "x64"
@@ -169,7 +169,7 @@ jobs:
169169
# -----------------------
170170
# Build HELICS
171171
# -----------------------
172-
- bash: cmake --build . --config Release
172+
- bash: cmake --build . --parallel 4 --config Release
173173
displayName: "Build HELICS"
174174
workingDirectory: build
175175

‎.circleci/config.yml

+20-52
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,6 @@ aliases:
1818
eval cmake .. ${CMAKE_FLAGS}
1919
make -j 2
2020
21-
- &run_octave_tests
22-
name: run_octave_tests
23-
command: |
24-
cd build
25-
make install
26-
cd ${OCTAVETEST}
27-
# this return the write error code in RESULT
28-
res=$(octave -W -V --eval "source('runTestsCIRCLECI.m');")
29-
echo "$res"
30-
if [[ "$res" == *"failed"* ]]; then
31-
echo "*** Octave tests FAILED: "
32-
exit -1
33-
fi
34-
echo "*** Octave tests PASSED "
35-
exit 0
36-
3721
- &run_helics_tests
3822
name: run_helics_tests
3923
command: |
@@ -64,20 +48,9 @@ aliases:
6448
make RUN_KEY_BENCHMARKS
6549
6650
jobs:
67-
helicsoctave:
68-
docker:
69-
- image: helics/buildenv:octave
70-
environment:
71-
OCTAVETEST: "/root/project/tests/octave"
72-
CMAKE_FLAGS: "-DHELICS_BUILD_OCTAVE_INTERFACE=ON -DHELICS_BUILD_TESTS=ON"
73-
steps:
74-
- checkout
75-
- run: *setup_helics
76-
- run: *run_octave_tests
77-
7851
helicsgccTSan:
7952
docker:
80-
- image: helics/buildenv:gcc13-builder
53+
- image: helics/buildenv:gcc14-builder
8154
resource_class: large
8255
environment:
8356
CMAKE_FLAGS: '-DCMAKE_CXX_FLAGS="-fsanitize=thread -g -O1 " -DHELICS_BUILD_TESTS=ON -DHELICS_ZMQ_SUBPROJECT=ON -DHELICS_ZMQ_FORCE_SUBPROJECT=ON -DHELICS_ENABLE_EXTRA_COMPILER_WARNINGS=OFF -DHELICS_DISABLE_SYSTEM_CALL_TESTS=ON -DCMAKE_CXX_STANDARD=20'
@@ -90,7 +63,7 @@ jobs:
9063

9164
helicsgccASan:
9265
docker:
93-
- image: helics/buildenv:gcc13-builder
66+
- image: helics/buildenv:gcc14-builder
9467
resource_class: large
9568
environment:
9669
CMAKE_FLAGS: '-DCMAKE_CXX_FLAGS="-ggdb -fsanitize=address -fno-omit-frame-pointer -static-libstdc++ -static-libasan -lrt -g -O1 " -DHELICS_BUILD_TESTS=ON -DHELICS_ZMQ_SUBPROJECT=ON -DHELICS_ZMQ_FORCE_SUBPROJECT=ON -DHELICS_ENABLE_EXTRA_COMPILER_WARNINGS=OFF -DHELICS_DISABLE_SYSTEM_CALL_TESTS=ON -DCMAKE_CXX_STANDARD=20'
@@ -116,7 +89,7 @@ jobs:
11689

11790
helicsMSan:
11891
docker:
119-
- image: helics/buildenv:sanitizers-14
92+
- image: helics/buildenv:sanitizers-18
12093
environment:
12194
CMAKE_FLAGS: '-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_FLAGS="-fsanitize=memory -nostdinc++ -nostdlib++ -Wno-reserved-macro-identifier -L/root/develop/libcxx_msan/lib -lc++ -lc++abi -I/root/develop/libcxx_msan/include -I/root/develop/libcxx_msan/include/c++/v1 -Wno-unused-command-line-argument -fno-omit-frame-pointer -g -O1 -Wl,-rpath,/root/develop/libcxx_msan/lib" -DHELICS_ENABLE_EXTRA_COMPILER_WARNINGS=OFF -DHELICS_BUILD_TESTS=ON -DHELICS_ZMQ_SUBPROJECT=ON -DHELICS_ZMQ_FORCE_SUBPROJECT=ON'
12295

@@ -127,7 +100,7 @@ jobs:
127100

128101
helicsTSan:
129102
docker:
130-
- image: helics/buildenv:sanitizers-14
103+
- image: helics/buildenv:sanitizers-18
131104
environment:
132105
CMAKE_FLAGS: '-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_FLAGS="-fsanitize=thread -nostdinc++ -nostdlib++ -L/root/develop/libcxx_tsan/lib -lc++ -lc++abi -I/root/develop/libcxx_tsan/include -I/root/develop/libcxx_tsan/include/c++/v1 -Wno-unused-command-line-argument -fno-omit-frame-pointer -g -O2 -Wl,-rpath,/root/develop/libcxx_tsan/lib" -DHELICS_ENABLE_EXTRA_COMPILER_WARNINGS=OFF -DHELICS_BUILD_TESTS=ON -DHELICS_ZMQ_SUBPROJECT=ON -DHELICS_ZMQ_FORCE_SUBPROJECT=ON'
133106
TSAN_OPTIONS: "suppressions=/root/project/.circleci/tsan_suppression.txt"
@@ -138,7 +111,7 @@ jobs:
138111

139112
helicsInstall1:
140113
docker:
141-
- image: helics/buildenv:builder
114+
- image: helics/buildenv:ubuntu24.04-default-builder
142115
environment:
143116
CMAKE_FLAGS: "-DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_BENCHMARKS=ON -DHELICS_INSTALL_PACKAGE_TESTS=ON"
144117
steps:
@@ -148,9 +121,9 @@ jobs:
148121

149122
helicsNoZmq:
150123
docker:
151-
- image: helics/buildenv:gcc10-builder
124+
- image: helics/buildenv:gcc13-builder
152125
environment:
153-
CMAKE_FLAGS: "-DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_ENABLE_ZMQ_CORE=OFF -DHELICS_ENABLE_IPC_CORE=OFF -DHELICS_BUILD_TESTS=ON -DCMAKE_CXX_STANDARD=17"
126+
CMAKE_FLAGS: "-DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_ENABLE_ZMQ_CORE=OFF -DHELICS_ENABLE_IPC_CORE=OFF -DHELICS_BUILD_TESTS=ON"
154127
steps:
155128
- checkout
156129
- run: *setup_helics
@@ -167,37 +140,38 @@ jobs:
167140

168141
helicsInstall2:
169142
docker:
170-
- image: helics/buildenv:builder
143+
- image: helics/buildenv:ubuntu24.04-default-builder
171144
environment:
172145
CMAKE_FLAGS: "-DHELICS_BUILD_TESTS=ON -DHELICS_INSTALL_PACKAGE_TESTS=ON"
173146
steps:
174147
- checkout
175148
- run: *setup_helics
176149
- run: *run_installer_tests
177150

178-
gcc13:
151+
gcc14:
179152
docker:
180-
- image: helics/buildenv:gcc13-builder
153+
- image: helics/buildenv:gcc14-builder
154+
resource_class: large
181155
environment:
182156
CMAKE_FLAGS: '-DHELICS_EXTRA_COMPILE_FLAGS=-Wredundant-tags -DCMAKE_CXX_FLAGS="-pedantic-errors" -DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_BUILD_TESTS=ON -DCMAKE_CXX_STANDARD=20'
183157
steps:
184158
- checkout
185159
- run: *setup_helics
186160
- run: *run_helics_tests
187161

188-
clang14:
162+
clang18:
189163
docker:
190-
- image: helics/buildenv:clang14-builder
164+
- image: helics/buildenv:clang18-builder
191165
environment:
192166
CMAKE_FLAGS: '-DCMAKE_CXX_FLAGS="-pedantic-errors" -DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_BUILD_TESTS=ON -DCMAKE_CXX_STANDARD=20'
193167
steps:
194168
- checkout
195169
- run: *setup_helics
196170
- run: *run_helics_tests
197171

198-
clang14_cxx23:
172+
clang18_cxx23:
199173
docker:
200-
- image: helics/buildenv:clang14-builder
174+
- image: helics/buildenv:clang18-builder
201175
environment:
202176
CMAKE_FLAGS: "-DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON -DCMAKE_CXX_STANDARD=23"
203177
steps:
@@ -206,7 +180,7 @@ jobs:
206180

207181
benchmarkjob:
208182
docker:
209-
- image: helics/buildenv:builder
183+
- image: helics/buildenv:ubuntu24.04-default-builder
210184
environment:
211185
CMAKE_FLAGS: "-DHELICS_BUILD_BENCHMARKS=ON -DBM_RESULT_DIR=/tmp/bm_results/ -DHELICS_DISABLE_C_SHARED_LIB=ON"
212186
steps:
@@ -219,7 +193,7 @@ jobs:
219193

220194
arm64:
221195
machine:
222-
image: ubuntu-2004:current
196+
image: ubuntu-2404:current
223197
resource_class: arm.medium
224198
environment:
225199
CMAKE_FLAGS: "-DHELICS_BUILD_CXX_SHARED_LIB=OFF -DHELICS_BUILD_TESTS=ON -DHELICS_ZMQ_SUBPROJECT=ON -DHELICS_ZMQ_FORCE_SUBPROJECT=ON -DHELICS_DISABLE_BOOST=ON"
@@ -243,15 +217,15 @@ workflows:
243217
filters:
244218
branches:
245219
ignore: /pre-commit\/.*/
246-
- gcc13:
220+
- gcc14:
247221
filters:
248222
branches:
249223
ignore: /pre-commit\/.*/
250-
- clang14:
224+
- clang18:
251225
filters:
252226
branches:
253227
ignore: /pre-commit\/.*/
254-
- clang14_cxx23:
228+
- clang18_cxx23:
255229
filters:
256230
branches:
257231
ignore: /pre-commit\/.*/
@@ -289,11 +263,6 @@ workflows:
289263
branches:
290264
only:
291265
- dailies_tests
292-
- helicsoctave:
293-
filters:
294-
branches:
295-
only:
296-
- dailies_tests
297266
- helicsNoZmq:
298267
filters:
299268
branches:
@@ -310,7 +279,6 @@ workflows:
310279
jobs:
311280
- helicsTumbleweed
312281
- helicsNoZmq
313-
- helicsoctave
314282
- helicsTSan
315283
- helicsASan
316284
- helicsgccASan

0 commit comments

Comments
 (0)