Merge pull request #2433 from GMLC-TDC/develop

Develop
GMLC-TDC · Sep 15, 2022 · 2a8858d · 2a8858d
2 parents e8e64c6 + 58f44b6
commit 2a8858d
Show file tree

Hide file tree

Showing 287 changed files with 9,050 additions and 9,880 deletions.
diff --git a/.ci/.drone.yml b/.ci/.drone.yml
@@ -1,47 +1,47 @@
-kind: pipeline
-name: arm
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-  - name: uname
-    image: alpine:3.12
-    commands:
-      - uname -a
-
-  - name: submodules
-    image: alpine:3.12
-    commands:
-      # for updating submodules to latest upstream, add --remote
-      - apk add --no-cache git
-      - git submodule update --init --recursive
-
-  - name: build
-    image: alpine:3.12
-    commands:
-      - apk update
-      - apk add --no-cache build-base git bash cmake ninja boost-dev zeromq-dev
-      - gcc --version || echo "gcc not installed"
-      - clang --version || echo "clang not installed"
-      - cmake --version
-      - git --version
-      - mkdir build && cd build
-      - cmake -GNinja -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON ..
-      - cmake --build .
-      - ctest -L Continuous --output-on-failure
-
-trigger:
-  ref:
-    include:
-      - refs/heads/main
-      - refs/heads/develop
-      - refs/heads/helics2
-      - 'refs/pull/**'
-      - 'refs/tags/**'
-
----
+#kind: pipeline
+#name: arm
+#
+#platform:
+#  os: linux
+#  arch: arm
+#
+#steps:
+#  - name: uname
+#    image: alpine:3.12
+#    commands:
+#      - uname -a
+#
+#  - name: submodules
+#    image: alpine:3.12
+#    commands:
+#      # for updating submodules to latest upstream, add --remote
+#      - apk add --no-cache git
+#      - git submodule update --init --recursive
+#
+#  - name: build
+#    image: alpine:3.12
+#    commands:
+#      - apk update
+#      - apk add --no-cache build-base git bash cmake ninja boost-dev zeromq-dev
+#      - gcc --version || echo "gcc not installed"
+#      - clang --version || echo "clang not installed"
+#      - cmake --version
+#      - git --version
+#      - mkdir build && cd build
+#      - cmake -GNinja -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON ..
+#      - cmake --build .
+#      - ctest -L Continuous --output-on-failure
+#
+#trigger:
+#  ref:
+#    include:
+#      - refs/heads/main
+#      - refs/heads/develop
+#      - refs/heads/helics2
+#      - 'refs/pull/**'
+#      - 'refs/tags/**'
+#
+#---
 kind: pipeline
 name: arm64
 

diff --git a/.ci/azure-pipelines-daily.yml b/.ci/azure-pipelines-daily.yml
@@ -12,10 +12,10 @@ jobs:
     strategy:
       matrix:
         all-tests:
-          containerImage: 'helics/buildenv:ubuntu18.04-default-builder'
+          containerImage: 'helics/buildenv:ubuntu20.04-default-builder'
           test_config: 'daily'
         zmq-subproject:
-          containerImage: 'helics/buildenv:ubuntu18.04-default-builder'
+          containerImage: 'helics/buildenv:ubuntu20.04-default-builder'
           test_config: 'ci'
           zmq_subproject: true
     pool:
@@ -25,6 +25,7 @@ jobs:
 
     steps:
       - bash: |
+          unset VCPKG_ROOT
           source scripts/setup-helics-ci-options.sh
           mkdir -p build && cd build
           ../scripts/ci-build.sh
@@ -87,7 +88,7 @@ jobs:
         displayName: Show environment info
       - task: CMake@1
         inputs:
-          cmakeArgs: -A $(vsArch) -DHELICS_ENABLE_SWIG=ON -DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_ENABLE_PACKAGE_BUILD=ON -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON $(extraFlags) ..
+          cmakeArgs: -A $(vsArch) -DHELICS_ENABLE_SWIG=ON -DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_ENABLE_PACKAGE_BUILD=ON -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON -DHELICS_DISABLE_VCPKG=ON $(extraFlags) ..
         displayName: 'Configure HELICS'
         condition: eq( variables['Agent.OS'], 'Windows_NT' )
 
@@ -136,8 +137,4 @@ jobs:
         displayName: 'Test HELICS packaging'
         workingDirectory: build
 
-      - task: PublishBuildArtifacts@1
-        condition: failed()
-        inputs:
-          pathtoPublish: '$(Build.SourcesDirectory)/build'
-          artifactName: buildDirContents
+      # For debugging, can get build folder contents by adding PublishBuildArtifacts task and set pathtoPublish: '$(Build.SourcesDirectory)/build'
diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml
@@ -5,19 +5,18 @@ trigger:
 pr:
   - main
   - develop
-  - helics2
 
 jobs:
   - job: Linux
     strategy:
       matrix:
         ubuntuDefault:
-          containerImage: 'helics/buildenv:ubuntu18.04-default-builder'
+          containerImage: 'helics/buildenv:ubuntu20.04-default-builder'
           test_config: 'ci'
           use_mpi: 'true'
           encrypted: 'true'
-        gcc11:
-          containerImage: 'helics/buildenv:gcc11-builder'
+        gcc8:
+          containerImage: 'helics/buildenv:gcc8-builder'
           test_config: 'ci'
           use_mpi: 'true'
           encrypted: 'true'
@@ -26,19 +25,20 @@ jobs:
           test_config: 'ci'
           use_mpi: ''
           encrypted: ''
-        clang5:
-          containerImage: 'helics/buildenv:clang5-builder'
+        clang7:
+          containerImage: 'helics/buildenv:clang7-builder'
           test_config: 'ci'
           use_mpi: ''
           encrypted: ''
 
     pool:
       vmImage: 'ubuntu-latest'
     container: $[ variables['containerImage'] ]
-    timeoutInMinutes: 90
+    timeoutInMinutes: 60
 
     steps:
       - bash: |
+          unset VCPKG_ROOT
           source scripts/setup-helics-ci-options.sh
           mkdir -p build && cd build
           ../scripts/ci-build.sh
@@ -70,7 +70,7 @@ jobs:
           xcode_path: '/Applications/Xcode_11.7.app'
     pool:
       vmImage: $[ variables['vmImage'] ]
-    timeoutInMinutes: 90
+    timeoutInMinutes: 60
 
     steps:
       - bash: sudo xcode-select --switch "${XCODE_PATH}/Contents/Developer"
@@ -82,6 +82,7 @@ jobs:
           brew install swig zeromq boost
         displayName: 'Install dependencies'
       - bash: |
+          unset VCPKG_ROOT
           source scripts/setup-helics-ci-options.sh
           mkdir -p build && cd build
           ../scripts/ci-build.sh
@@ -114,7 +115,7 @@ jobs:
           imageName: 'windows-2022'
           langArch: 'x64'
           vsArch: 'x64'
-          extraFlags: ''
+          extraFlags: '-DCMAKE_CXX_STANDARD=20'
 
     pool:
       vmImage: $(imageName)
@@ -154,7 +155,7 @@ jobs:
         displayName: Show environment info
       - task: CMake@1
         inputs:
-          cmakeArgs: -A $(vsArch) -DHELICS_ENABLE_SWIG=ON -DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_ENABLE_PACKAGE_BUILD=ON -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON $(extraFlags) ..
+          cmakeArgs: -A $(vsArch) -DHELICS_ENABLE_SWIG=ON -DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_ENABLE_PACKAGE_BUILD=ON -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON -DHELICS_DISABLE_VCPKG=ON $(extraFlags) ..
         displayName: 'Configure HELICS'
         condition: eq( variables['Agent.OS'], 'Windows_NT' )
 
@@ -204,8 +205,4 @@ jobs:
         displayName: 'Test HELICS packaging'
         workingDirectory: build
 
-      - task: PublishBuildArtifacts@1
-        condition: failed()
-        inputs:
-          pathtoPublish: '$(Build.SourcesDirectory)/build'
-          artifactName: buildDirContents
+      # For debugging, can get build folder contents by adding PublishBuildArtifacts task and set pathtoPublish: '$(Build.SourcesDirectory)/build'
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -146,7 +146,7 @@ jobs:
 
   helicsNoZmq:
     docker:
-      - image: helics/buildenv:gcc8-builder
+      - image: helics/buildenv:gcc10-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'
     steps:
@@ -193,6 +193,15 @@ jobs:
       - run: *setup_helics
       - run: *run_helics_tests
 
+  clang14_cxx23:
+    docker:
+      - image: helics/buildenv:clang14-builder
+    environment:
+      CMAKE_FLAGS: '-DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON -DCMAKE_CXX_STANDARD=23'
+    steps:
+      - checkout
+      - run: *setup_helics
+
   benchmarkjob:
     docker:
       - image: helics/buildenv:builder
@@ -226,6 +235,10 @@ workflows:
           filters:
             branches:
               ignore: /pre-commit\/.*/
+      - clang14_cxx23:
+          filters:
+            branches:
+              ignore: /pre-commit\/.*/
   sanitizers:
     jobs:
       - helicsTSan:

diff --git a/.codecov.yml b/.codecov.yml
@@ -1,12 +1,13 @@
 codecov:
   notify:
     require_ci_to_pass: no
+    wait_for_ci: no
   branch: develop
 
 coverage:
   precision: 2
   round: down
-  range: '50...95'
+  range: '50...97'
   status:
     project: yes
     patch: yes

diff --git a/.github/actions/benchmark-build/benchmark-Linux.sh b/.github/actions/benchmark-build/benchmark-Linux.sh
@@ -6,6 +6,9 @@
 #sudo ./cmake-install.sh --prefix=/usr/local --exclude-subdir --skip-license
 #rm cmake-install.sh
 
+# Unset VCPKG_ROOT for GitHub actions environment
+unset VCPKG_ROOT
+
 mkdir build && cd build || exit
 cmake -DCMAKE_BUILD_TYPE=Release -DHELICS_ZMQ_SUBPROJECT=ON -DHELICS_ENABLE_PACKAGE_BUILD=ON -DSTATIC_STANDARD_LIB=static -DHELICS_BUILD_EXAMPLES=OFF -DHELICS_BUILD_APP_EXECUTABLES=ON -DHELICS_BUILD_APP_LIBRARY=OFF -DHELICS_BUILD_BENCHMARKS=ON -DBUILD_TESTING=OFF ..
 cmake --build . --config Release

diff --git a/.github/actions/benchmark-build/benchmark-Windows.sh b/.github/actions/benchmark-build/benchmark-Windows.sh
@@ -4,6 +4,9 @@
 
 echo "Building ${CPACK_GEN} installer with ${BUILD_GEN} for ${BUILD_ARCH}"
 
+# Unset VCPKG_ROOT for GitHub actions environment
+unset VCPKG_ROOT
+
 # Install Boost
 COMMON_SCRIPTS="$(cd "$(dirname "${BASH_SOURCE[0]}")/../common/Windows" && pwd)"
 # shellcheck source=.github/actions/common/Windows/install-boost.sh

diff --git a/.github/actions/benchmark-build/benchmark-macOS.sh b/.github/actions/benchmark-build/benchmark-macOS.sh
@@ -2,6 +2,9 @@
 # This uses bash variable substitution in a few places
 # 1. getting the cmake directory for running cpack with an absolute path (chocolatey has an unfortunately named alias)
 
+# Unset VCPKG_ROOT for GitHub actions environment
+unset VCPKG_ROOT
+
 brew install boost
 mkdir build && cd build || exit
 cmake -DCMAKE_BUILD_TYPE=Release -DHELICS_ZMQ_SUBPROJECT=ON -DHELICS_ENABLE_PACKAGE_BUILD=ON -DHELICS_BUILD_EXAMPLES=OFF -DHELICS_BUILD_APP_EXECUTABLES=ON -DHELICS_BUILD_APP_LIBRARY=OFF -DHELICS_BUILD_BENCHMARKS=ON -DBUILD_TESTING=OFF ..

diff --git a/.github/actions/release-build/installer-Linux.sh b/.github/actions/release-build/installer-Linux.sh
@@ -6,6 +6,9 @@
 #sudo ./cmake-install.sh --prefix=/usr/local --exclude-subdir --skip-license
 #rm cmake-install.sh
 
+# Unset VCPKG_ROOT for GitHub actions environment
+unset VCPKG_ROOT
+
 mkdir build && cd build || exit
 cmake -DCMAKE_BUILD_TYPE=Release -DHELICS_ZMQ_SUBPROJECT=ON -DHELICS_ENABLE_PACKAGE_BUILD=ON -DSTATIC_STANDARD_LIB=static -DHELICS_BUILD_EXAMPLES=OFF -DHELICS_BUILD_APP_EXECUTABLES=ON -DHELICS_BUILD_APP_LIBRARY=ON -DBUILD_TESTING=OFF ..
 cmake --build . --config Release

diff --git a/.github/actions/release-build/installer-Windows.sh b/.github/actions/release-build/installer-Windows.sh
@@ -4,6 +4,9 @@
 
 echo "Building ${CPACK_GEN} installer with ${BUILD_GEN} for ${BUILD_ARCH}"
 
+# Unset VCPKG_ROOT for GitHub actions environment
+unset VCPKG_ROOT
+
 # Install SWIG
 choco install -y swig
 

diff --git a/.github/actions/release-build/installer-macOS.sh b/.github/actions/release-build/installer-macOS.sh
@@ -2,6 +2,9 @@
 # This uses bash variable substitution in a few places
 # 1. getting the cmake directory for running cpack with an absolute path (chocolatey has an unfortunately named alias)
 
+# Unset VCPKG_ROOT for GitHub actions environment
+unset VCPKG_ROOT
+
 brew install swig boost
 mkdir build && cd build || exit
 cmake -DCMAKE_BUILD_TYPE=Release -DHELICS_ZMQ_SUBPROJECT=ON -DHELICS_ENABLE_PACKAGE_BUILD=ON -DHELICS_BUILD_JAVA_INTERFACE=ON -DHELICS_BUILD_EXAMPLES=OFF -DHELICS_BUILD_APP_EXECUTABLES=ON -DHELICS_BUILD_APP_LIBRARY=ON -DBUILD_TESTING=OFF -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" ..

diff --git a/.github/actions/release-build/msvc-Windows.sh b/.github/actions/release-build/msvc-Windows.sh
@@ -5,6 +5,9 @@
 
 echo "Building with ${BUILD_GEN} for ${BUILD_ARCH}"
 
+# Unset VCPKG_ROOT for GitHub actions environment
+unset VCPKG_ROOT
+
 # Install SWIG
 choco install -y swig
 

diff --git a/.github/actions/release-build/shared-library-Linux.sh b/.github/actions/release-build/shared-library-Linux.sh
@@ -6,6 +6,9 @@
 #sudo ./cmake-install.sh --prefix=/usr/local --exclude-subdir --skip-license
 #rm cmake-install.sh
 
+# Unset VCPKG_ROOT for GitHub actions environment
+unset VCPKG_ROOT
+
 mkdir build && cd build || exit
 cmake -DCMAKE_BUILD_TYPE=Release -DHELICS_ZMQ_SUBPROJECT=ON -DHELICS_ENABLE_PACKAGE_BUILD=ON -DSTATIC_STANDARD_LIB=static -DHELICS_BUILD_APP_EXECUTABLES=OFF -DHELICS_BUILD_APP_LIBRARY=OFF -DHELICS_BUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF ..
 cmake --build . --config Release

diff --git a/.github/actions/release-build/shared-library-Windows.sh b/.github/actions/release-build/shared-library-Windows.sh
@@ -4,6 +4,9 @@
 
 echo "Building shared library with ${BUILD_GEN} for ${BUILD_ARCH}"
 
+# Unset VCPKG_ROOT for GitHub actions environment
+unset VCPKG_ROOT
+
 # Install SWIG
 choco install -y swig
 

diff --git a/.github/actions/release-build/shared-library-macOS.sh b/.github/actions/release-build/shared-library-macOS.sh
@@ -2,6 +2,9 @@
 # This uses bash variable substitution in a few places
 # 1. getting the cmake directory for running cpack with an absolute path (chocolatey has an unfortunately named alias)
 
+# Unset VCPKG_ROOT for GitHub actions environment
+unset VCPKG_ROOT
+
 brew install swig boost
 mkdir build && cd build || exit
 cmake -DCMAKE_BUILD_TYPE=Release -DHELICS_ZMQ_SUBPROJECT=ON -DHELICS_ENABLE_PACKAGE_BUILD=ON -DHELICS_BUILD_APP_EXECUTABLES=OFF -DHELICS_BUILD_APP_LIBRARY=OFF -DHELICS_BUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" ..

diff --git a/.github/actions/setup-macos-sdk.sh b/.github/actions/setup-macos-sdk.sh
@@ -4,7 +4,7 @@ XCODE_MACOS_PLATFORM_PATH="/Applications/Xcode.app/Contents/Developer/Platforms/
 XCODE_MACOS_SDK_PATH="${XCODE_MACOS_PLATFORM_PATH}/Developer/SDKs"
 
 if [[ -z "${MACOS_SDK_VER}" ]]; then
-    MACOS_SDK_VER=10.14
+    MACOS_SDK_VER=10.15
 fi
 
 # Download macOS SDK

diff --git a/.github/workflows/benchmark-package.yml b/.github/workflows/benchmark-package.yml
@@ -30,7 +30,7 @@ jobs:
             os: macos-latest
             arch: x64
             cpack_gen: ZIP
-            macos_target_ver: '10.14'
+            macos_target_ver: '10.15'
           - id: linux-x64
             os: ubuntu-latest
             arch: x64