Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into releases
Browse files Browse the repository at this point in the history
  • Loading branch information
andiwand committed Apr 15, 2024
2 parents 00591a5 + 22730e1 commit 8068327
Show file tree
Hide file tree
Showing 525 changed files with 53,140 additions and 4,799 deletions.
2 changes: 1 addition & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
Checks: '-*,readability-container-size-empty,readability-implicit-bool-cast,readability-implicit-bool-conversion,modernize-use-equals-default,modernize-use-override,modernize-use-using,readability-braces-around-statements,modernize-use-nullptr,performance-move-const-arg,cppcoreguidelines-pro-type-member-init,cppcoreguidelines-init-variables,clang-analyzer-optin.cplusplus.UninitializedObject,readability-operators-representation'
Checks: '-*,readability-container-size-empty,readability-implicit-bool-cast,readability-implicit-bool-conversion,modernize-concat-nested-namespaces,modernize-use-equals-default,modernize-use-override,modernize-use-using,readability-braces-around-statements,modernize-use-nullptr,performance-move-const-arg,cppcoreguidelines-pro-type-member-init,cppcoreguidelines-init-variables,clang-analyzer-optin.cplusplus.UninitializedObject,readability-operators-representation'
HeaderFilterRegex: '.*(?<!nlohmann\/json)\.(hpp|cpp|ipp)$'
AnalyzeTemporaryDtors: true
CheckOptions:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
runs-on: ubuntu-latest
container: ghcr.io/acts-project/ubuntu2204:v41
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Cache build
uses: actions/cache@v3
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
container: ghcr.io/acts-project/ubuntu2204:v41
if: github.ref == 'refs/heads/main'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies
run: pip3 install git+https://github.com/paulgessinger/cmakeperf.git@ece8fc8
- name: Configure
Expand All @@ -91,7 +91,7 @@ jobs:
run: cmakeperf collect build/compile_commands.json -o perf.csv
- name: Results
run: cmakeperf print perf.csv
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: cmakeperf
path: perf.csv
Expand All @@ -101,10 +101,10 @@ jobs:
needs: build_performance
if: github.ref == 'refs/heads/main'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies
run: pip3 install git+https://github.com/paulgessinger/headwind.git@eeeaa80
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: cmakeperf
- name: Run collection
Expand Down
82 changes: 23 additions & 59 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ jobs:
- name: Install git lfs
run: apt-get update && apt-get install -y git-lfs

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
lfs: true

- name: Restore ccache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
id: ccache-restore
with:
path: ${{ github.workspace }}/ccache
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
run: ccache -s

- name: Save ccache
uses: actions/cache/save@v3
uses: actions/cache/save@v4
if: always()
with:
path: ${{ github.workspace }}/ccache
Expand All @@ -95,7 +95,7 @@ jobs:
- name: Package build
run: tar czf build.tar.gz -C build --exclude "*.o" --exclude "bin/ActsUnitTest*" --exclude "bin/ActsIntegrationTest*" .

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: acts-linux-ubuntu
path: build.tar.gz
Expand Down Expand Up @@ -126,12 +126,12 @@ jobs:
- name: Install git lfs
run: apt-get update && apt-get install -y git-lfs

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
lfs: true

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: acts-linux-ubuntu

Expand Down Expand Up @@ -163,12 +163,12 @@ jobs:
- name: Install git lfs
run: apt-get update && apt-get install -y git-lfs time

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
lfs: true

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: acts-linux-ubuntu

Expand All @@ -195,7 +195,7 @@ jobs:
&& CI/physmon/phys_perf_mon.sh all physmon
&& cat physmon/summary.md >> $GITHUB_STEP_SUMMARY
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: physmon
Expand All @@ -209,7 +209,7 @@ jobs:
- name: Install dependencies
run: pip3 install spyral-cli==1.1.0

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: physmon
path: physmon
Expand Down Expand Up @@ -248,13 +248,13 @@ jobs:
- name: Install git lfs
run: apt-get update && apt-get install -y git-lfs

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
lfs: true

- name: Restore ccache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
id: ccache-restore
with:
path: ${{ github.workspace }}/ccache
Expand Down Expand Up @@ -292,7 +292,7 @@ jobs:
run: ccache -s

- name: Save ccache
uses: actions/cache/save@v3
uses: actions/cache/save@v4
if: always()
with:
path: ${{ github.workspace }}/ccache
Expand Down Expand Up @@ -342,15 +342,15 @@ jobs:
PRELOAD: export LD_PRELOAD=/opt/lcg/gcc/10/x86_64-centos8/lib64/libstdc++.so.6
INSTALL_DIR: ${{ github.workspace }}/install
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies
# Install tbb-devel also to build the examples
run: >
dnf -y install ninja-build tbb-devel ccache
&& ln -s $(find / -type f -name 'ccache') /usr/local/bin/ccache
- name: Restore ccache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
id: ccache-restore
with:
path: ${{ github.workspace }}/ccache
Expand Down Expand Up @@ -381,7 +381,7 @@ jobs:
- name: ccache stats
run: ccache -s
- name: Save ccache
uses: actions/cache/save@v3
uses: actions/cache/save@v4
if: always()
with:
path: ${{ github.workspace }}/ccache
Expand Down Expand Up @@ -435,7 +435,7 @@ jobs:
env:
INSTALL_DIR: ${{ github.workspace }}/install
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
lfs: true
Expand All @@ -453,7 +453,7 @@ jobs:
&& /usr/local/acts/bin/python3.10 -m pip install pyyaml jinja2
- name: Restore ccache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
id: ccache-restore
with:
path: ${{ github.workspace }}/ccache
Expand Down Expand Up @@ -488,7 +488,7 @@ jobs:
- name: ccache stats
run: ccache -s
- name: Save ccache
uses: actions/cache/save@v3
uses: actions/cache/save@v4
if: always()
with:
path: ${{ github.workspace }}/ccache
Expand All @@ -499,7 +499,7 @@ jobs:
run: cmake --build build --target integrationtests
- name: Install
run: cmake --build build --target install
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: acts-macos
path: ${{ env.INSTALL_DIR }}
Expand All @@ -516,42 +516,6 @@ jobs:
- name: Downstream run
run: ./build-downstream/bin/ShowActsVersion

cuda:
runs-on: ubuntu-latest
container: ghcr.io/acts-project/ubuntu1804_cuda:v41
steps:
- uses: actions/checkout@v3

- name: Restore ccache
uses: actions/cache/restore@v3
id: ccache-restore
with:
path: ${{ github.workspace }}/ccache
key: ${{ runner.os }}-ccache-cuda_${{ env.CCACHE_KEY_SUFFIX }}_${{ github.sha }}
restore-keys: |
${{ runner.os }}-ccache-cuda_${{ env.CCACHE_KEY_SUFFIX }}_
- name: Configure
run: >
ccache -z &&
cmake -B build -S .
-GNinja
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-DCMAKE_CXX_COMPILER=/usr/bin/g++-8
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_CXX_FLAGS=-Werror
-DACTS_BUILD_PLUGIN_CUDA=ON
-DACTS_BUILD_UNITTESTS=ON
- name: Build
run: cmake --build build
- name: ccache stats
run: ccache -s
- name: Save ccache
uses: actions/cache/save@v3
if: always()
with:
path: ${{ github.workspace }}/ccache
key: ${{ steps.ccache-restore.outputs.cache-primary-key }}

sycl:
runs-on: ubuntu-latest
Expand All @@ -560,10 +524,10 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Restore ccache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
id: ccache-restore
with:
path: ${{ github.workspace }}/ccache
Expand Down Expand Up @@ -591,7 +555,7 @@ jobs:
- name: ccache stats
run: ccache -s
- name: Save ccache
uses: actions/cache/save@v3
uses: actions/cache/save@v4
if: always()
with:
path: ${{ github.workspace }}/ccache
Expand Down
Loading

0 comments on commit 8068327

Please sign in to comment.