Merge pull request #2714 from GMLC-TDC/develop

Develop

.ci/.drone.yml

@@ -37,7 +37,6 @@
 #    include:
 #      - refs/heads/main
 #      - refs/heads/develop
-#      - refs/heads/helics2
 #      - 'refs/pull/**'
 #      - 'refs/tags/**'
 #
@@ -80,6 +79,5 @@ trigger:
     include:
       - refs/heads/main
       - refs/heads/develop
-      - refs/heads/helics2
       - "refs/pull/**"
       - "refs/tags/**"

.ci/azure-pipelines-daily.yml

@@ -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:

.ci/azure-pipelines.yml

@@ -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: ""
@@ -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
@@ -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"
@@ -169,7 +169,7 @@ jobs:
       # -----------------------
       # Build HELICS
       # -----------------------
-      - bash: cmake --build . --config Release
+      - bash: cmake --build . --parallel 4 --config Release
         displayName: "Build HELICS"
         workingDirectory: build
 

.circleci/config.yml

@@ -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: |
@@ -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'
@@ -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'
@@ -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'
 
@@ -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"
@@ -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:
@@ -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
@@ -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:
@@ -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:
@@ -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"
@@ -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\/.*/
@@ -289,11 +263,6 @@ workflows:
             branches:
               only:
                 - dailies_tests
-      - helicsoctave:
-          filters:
-            branches:
-              only:
-                - dailies_tests
       - helicsNoZmq:
           filters:
             branches:
@@ -310,7 +279,6 @@ workflows:
     jobs:
       - helicsTumbleweed
       - helicsNoZmq
-      - helicsoctave
       - helicsTSan
       - helicsASan
       - helicsgccASan