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

Develop #2714

Merged
merged 34 commits into from
Dec 10, 2024
Merged

Develop #2714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
f06be13
Bump peter-evans/create-pull-request from 6 to 7
dependabot[bot] Sep 9, 2024
30a4624
Merge pull request #2667 from GMLC-TDC/b695dependabot/github_actions/…
phlptp Sep 17, 2024
ab32163
replace jsoncpp with nlohmann::json (#2652)
phlptp Sep 23, 2024
8d9d3ae
3rd party updates (#2672)
phlptp Sep 27, 2024
e75d52b
Automated update to generated interface files (#2671)
github-actions[bot] Sep 29, 2024
259ad15
[pre-commit.ci] pre-commit autoupdate (#2656)
pre-commit-ci[bot] Sep 30, 2024
4afea75
[pre-commit.ci] pre-commit autoupdate (#2675)
pre-commit-ci[bot] Oct 8, 2024
194ec85
Min build requirements update (#2674)
phlptp Oct 10, 2024
ce55368
add some tests with filter config files and make sure the cloning fil…
phlptp Oct 10, 2024
8745228
Update Azure Pipelines macOS CI runner VMs (#2682)
nightlark Oct 11, 2024
0776e93
Automated update to generated interface files (#2681)
github-actions[bot] Oct 12, 2024
12a2f6a
[pre-commit.ci] pre-commit autoupdate (#2685)
pre-commit-ci[bot] Oct 15, 2024
fe38a9a
Sanitizer tests (#2684)
phlptp Oct 15, 2024
538f8e3
Remove Octave references (#2686)
phlptp Oct 24, 2024
bb0587d
[pre-commit.ci] pre-commit autoupdate (#2688)
pre-commit-ci[bot] Oct 24, 2024
45e1f20
[pre-commit.ci] pre-commit autoupdate (#2690)
pre-commit-ci[bot] Nov 1, 2024
4ee0f9d
C app interface (#2691)
phlptp Nov 12, 2024
9c44d51
add mechanics for retrieving filter properties. (#2693)
phlptp Nov 17, 2024
e3e51de
Automated update to generated interface files (#2697)
github-actions[bot] Nov 17, 2024
fe80048
[pre-commit.ci] pre-commit autoupdate (#2692)
pre-commit-ci[bot] Nov 17, 2024
8f7981c
[pre-commit.ci] pre-commit autoupdate (#2701)
pre-commit-ci[bot] Nov 26, 2024
6956fde
Broker file input (#2700)
phlptp Nov 26, 2024
666dcee
Fix a bug in the potential interfaces activation (#2705)
phlptp Dec 2, 2024
ce6b94b
Cmake3 31 (#2704)
phlptp Dec 2, 2024
6eab054
Global sync disconnect (#2706)
phlptp Dec 3, 2024
f699bb0
Automated update to generated interface files (#2703)
github-actions[bot] Dec 3, 2024
6efe1c6
Fix compile error when building without HELICS Apps (#2707)
nightlark Dec 3, 2024
21936ec
Use CMake 3.25 and Boost 1.75 for Linux release builder (#2708)
nightlark Dec 3, 2024
c7af509
Cloning filter documenation (#2680)
trevorhardy Dec 5, 2024
6febab5
Fix docs precommit errors (#2711)
nightlark Dec 6, 2024
182017e
Remove use of Boost for a scope exit guard in the MPI core (#2710)
nightlark Dec 6, 2024
fe7c0f4
Message size (#2709)
phlptp Dec 6, 2024
bc62320
Release update 3 6 (#2712)
phlptp Dec 7, 2024
401749a
Update daily Azure pipelines builds to use Ubuntu 22.04 container ima…
nightlark Dec 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .ci/.drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
# include:
# - refs/heads/main
# - refs/heads/develop
# - refs/heads/helics2
# - 'refs/pull/**'
# - 'refs/tags/**'
#
Expand Down Expand Up @@ -80,6 +79,5 @@ trigger:
include:
- refs/heads/main
- refs/heads/develop
- refs/heads/helics2
- "refs/pull/**"
- "refs/tags/**"
4 changes: 2 additions & 2 deletions .ci/azure-pipelines-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
strategy:
matrix:
all-tests:
containerImage: "helics/buildenv:ubuntu20.04-default-builder"
containerImage: "helics/buildenv:ubuntu22.04-default-builder"
test_config: "daily"
zmq-subproject:
containerImage: "helics/buildenv:ubuntu20.04-default-builder"
containerImage: "helics/buildenv:ubuntu22.04-default-builder"
test_config: "ci"
zmq_subproject: true
pool:
Expand Down
24 changes: 12 additions & 12 deletions .ci/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ jobs:
strategy:
matrix:
ubuntuDefault:
containerImage: "helics/buildenv:ubuntu20.04-default-builder"
containerImage: "helics/buildenv:ubuntu22.04-default-builder"
test_config: "ci"
use_mpi: "true"
encrypted: "true"
gcc8:
containerImage: "helics/buildenv:gcc8-builder"
gcc11:
containerImage: "helics/buildenv:gcc11-builder"
test_config: "ci"
use_mpi: "true"
encrypted: "true"
clang13:
containerImage: "helics/buildenv:clang13-builder"
clang15:
containerImage: "helics/buildenv:clang15-builder"
test_config: "ci"
use_mpi: ""
encrypted: ""
clang7:
containerImage: "helics/buildenv:clang7-builder"
clang18:
containerImage: "helics/buildenv:clang18-builder"
test_config: "ci"
use_mpi: ""
encrypted: ""
Expand Down Expand Up @@ -64,11 +64,11 @@ jobs:
matrix:
XCode-latest:
test_config: "ci"
vmImage: "macOS-13"
vmImage: "macOS-14"
XCode-oldest:
test_config: "ci"
vmImage: "macOS-12"
xcode_path: "/Applications/Xcode_13.2.1.app"
vmImage: "macOS-13"
xcode_path: "/Applications/Xcode_14.1.app"
pool:
vmImage: $[ variables['vmImage'] ]
timeoutInMinutes: 60
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
imageName: "windows-2019"
langArch: "x64"
vsArch: "x64"
extraFlags: ""
extraFlags: "-DHELICS_DISABLE_WEBSERVER=ON"
VS2022-64bit:
imageName: "windows-2022"
langArch: "x64"
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
# -----------------------
# Build HELICS
# -----------------------
- bash: cmake --build . --config Release
- bash: cmake --build . --parallel 4 --config Release
displayName: "Build HELICS"
workingDirectory: build

Expand Down
72 changes: 20 additions & 52 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,6 @@ aliases:
eval cmake .. ${CMAKE_FLAGS}
make -j 2

- &run_octave_tests
name: run_octave_tests
command: |
cd build
make install
cd ${OCTAVETEST}
# this return the write error code in RESULT
res=$(octave -W -V --eval "source('runTestsCIRCLECI.m');")
echo "$res"
if [[ "$res" == *"failed"* ]]; then
echo "*** Octave tests FAILED: "
exit -1
fi
echo "*** Octave tests PASSED "
exit 0

- &run_helics_tests
name: run_helics_tests
command: |
Expand Down Expand Up @@ -64,20 +48,9 @@ aliases:
make RUN_KEY_BENCHMARKS

jobs:
helicsoctave:
docker:
- image: helics/buildenv:octave
environment:
OCTAVETEST: "/root/project/tests/octave"
CMAKE_FLAGS: "-DHELICS_BUILD_OCTAVE_INTERFACE=ON -DHELICS_BUILD_TESTS=ON"
steps:
- checkout
- run: *setup_helics
- run: *run_octave_tests

helicsgccTSan:
docker:
- image: helics/buildenv:gcc13-builder
- image: helics/buildenv:gcc14-builder
resource_class: large
environment:
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'
Expand All @@ -90,7 +63,7 @@ jobs:

helicsgccASan:
docker:
- image: helics/buildenv:gcc13-builder
- image: helics/buildenv:gcc14-builder
resource_class: large
environment:
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'
Expand All @@ -116,7 +89,7 @@ jobs:

helicsMSan:
docker:
- image: helics/buildenv:sanitizers-14
- image: helics/buildenv:sanitizers-18
environment:
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'

Expand All @@ -127,7 +100,7 @@ jobs:

helicsTSan:
docker:
- image: helics/buildenv:sanitizers-14
- image: helics/buildenv:sanitizers-18
environment:
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'
TSAN_OPTIONS: "suppressions=/root/project/.circleci/tsan_suppression.txt"
Expand All @@ -138,7 +111,7 @@ jobs:

helicsInstall1:
docker:
- image: helics/buildenv:builder
- image: helics/buildenv:ubuntu24.04-default-builder
environment:
CMAKE_FLAGS: "-DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_BENCHMARKS=ON -DHELICS_INSTALL_PACKAGE_TESTS=ON"
steps:
Expand All @@ -148,9 +121,9 @@ jobs:

helicsNoZmq:
docker:
- image: helics/buildenv:gcc10-builder
- image: helics/buildenv:gcc13-builder
environment:
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"
CMAKE_FLAGS: "-DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_ENABLE_ZMQ_CORE=OFF -DHELICS_ENABLE_IPC_CORE=OFF -DHELICS_BUILD_TESTS=ON"
steps:
- checkout
- run: *setup_helics
Expand All @@ -167,37 +140,38 @@ jobs:

helicsInstall2:
docker:
- image: helics/buildenv:builder
- image: helics/buildenv:ubuntu24.04-default-builder
environment:
CMAKE_FLAGS: "-DHELICS_BUILD_TESTS=ON -DHELICS_INSTALL_PACKAGE_TESTS=ON"
steps:
- checkout
- run: *setup_helics
- run: *run_installer_tests

gcc13:
gcc14:
docker:
- image: helics/buildenv:gcc13-builder
- image: helics/buildenv:gcc14-builder
resource_class: large
environment:
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'
steps:
- checkout
- run: *setup_helics
- run: *run_helics_tests

clang14:
clang18:
docker:
- image: helics/buildenv:clang14-builder
- image: helics/buildenv:clang18-builder
environment:
CMAKE_FLAGS: '-DCMAKE_CXX_FLAGS="-pedantic-errors" -DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_BUILD_TESTS=ON -DCMAKE_CXX_STANDARD=20'
steps:
- checkout
- run: *setup_helics
- run: *run_helics_tests

clang14_cxx23:
clang18_cxx23:
docker:
- image: helics/buildenv:clang14-builder
- image: helics/buildenv:clang18-builder
environment:
CMAKE_FLAGS: "-DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON -DCMAKE_CXX_STANDARD=23"
steps:
Expand All @@ -206,7 +180,7 @@ jobs:

benchmarkjob:
docker:
- image: helics/buildenv:builder
- image: helics/buildenv:ubuntu24.04-default-builder
environment:
CMAKE_FLAGS: "-DHELICS_BUILD_BENCHMARKS=ON -DBM_RESULT_DIR=/tmp/bm_results/ -DHELICS_DISABLE_C_SHARED_LIB=ON"
steps:
Expand All @@ -219,7 +193,7 @@ jobs:

arm64:
machine:
image: ubuntu-2004:current
image: ubuntu-2404:current
resource_class: arm.medium
environment:
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"
Expand All @@ -243,15 +217,15 @@ workflows:
filters:
branches:
ignore: /pre-commit\/.*/
- gcc13:
- gcc14:
filters:
branches:
ignore: /pre-commit\/.*/
- clang14:
- clang18:
filters:
branches:
ignore: /pre-commit\/.*/
- clang14_cxx23:
- clang18_cxx23:
filters:
branches:
ignore: /pre-commit\/.*/
Expand Down Expand Up @@ -289,11 +263,6 @@ workflows:
branches:
only:
- dailies_tests
- helicsoctave:
filters:
branches:
only:
- dailies_tests
- helicsNoZmq:
filters:
branches:
Expand All @@ -310,7 +279,6 @@ workflows:
jobs:
- helicsTumbleweed
- helicsNoZmq
- helicsoctave
- helicsTSan
- helicsASan
- helicsgccASan
Expand Down
Loading
Loading