Merge pull request #1 from Ananya2003Gupta/juliarebase

Rebased master branch with julia
AIDASoft · Aug 25, 2023 · d6c6e86 · d6c6e86
2 parents 57e946f + cb94c5b
commit d6c6e86
Show file tree

Hide file tree

Showing 210 changed files with 11,871 additions and 2,247 deletions.
diff --git a/.github/scripts/pylint.rc b/.github/scripts/pylint.rc
@@ -263,14 +263,14 @@ exclude-protected=_asdict,_fields,_replace,_source,_make
 [DESIGN]
 
 # Maximum number of arguments for function / method
-max-args=8
+max-args=10
 
 # Argument names that match this expression will be ignored. Default to name
 # with leading underscore
 ignored-argument-names=_.*
 
 # Maximum number of locals for function / method body
-max-locals=20
+max-locals=25
 
 # Maximum number of return / yield for function / method body
 max-returns=8
@@ -285,10 +285,10 @@ max-statements=50
 max-parents=7
 
 # Maximum number of attributes for a class (see R0902).
-max-attributes=20
+max-attributes=25
 
 # Minimum number of public methods for a class (see R0903).
-min-public-methods=1
+min-public-methods=0
 
 # Maximum number of public methods for a class (see R0904).
 max-public-methods=20

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
@@ -9,12 +9,12 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'AIDASoft/podio'
     steps:
-    - uses: actions/checkout@v2
-    - uses: cvmfs-contrib/github-action-cvmfs@v2
-    - uses: aidasoft/run-lcg-view@v2
+    - uses: actions/checkout@v3
+    - uses: cvmfs-contrib/github-action-cvmfs@v3
+    - uses: aidasoft/run-lcg-view@v4
       with:
         coverity-cmake-command: 'cmake -DCMAKE_CXX_STANDARD=17  -DENABLE_SIO=ON -DUSE_EXTERNAL_CATCH2=OFF ..'
         coverity-project: 'AIDASoft%2Fpodio'
         coverity-project-token: ${{ secrets.PODIO_COVERITY_TOKEN }}
         github-pat: ${{ secrets.READ_COVERITY_IMAGE }}
-        release-platform: "LCG_99/x86_64-centos7-gcc10-opt"
+        release-platform: "LCG_102/x86_64-centos7-gcc11-opt"
diff --git a/.github/workflows/edm4hep.yaml b/.github/workflows/edm4hep.yaml
@@ -0,0 +1,70 @@
+name: edm4hep
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        LCG: ["LCG_102/x86_64-centos7-gcc11-opt",
+              "LCG_102/x86_64-ubuntu2004-gcc9-opt"]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          path: podio
+      - uses: actions/checkout@v3
+        with:
+          repository: key4hep/EDM4hep
+          path: edm4hep
+      - uses: actions/checkout@v3
+        with:
+          repository: catchorg/Catch2
+          path: catch2
+      - uses: cvmfs-contrib/github-action-cvmfs@v3
+      - uses: aidasoft/run-lcg-view@v4
+        with:
+          release-platform: ${{ matrix.LCG }}
+          run: |
+            STARTDIR=$(pwd)
+            echo "::group::Build Catch2"
+            cd $STARTDIR/catch2
+            mkdir build && cd build
+            cmake -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=../install -G Ninja ..
+            ninja -k0 install
+            export CMAKE_PREFIX_PATH=$STARTDIR/catch2/install:$CMAKE_PREFIX_PATH
+            echo "::endgroup::"
+            echo "::group::Build podio"
+            cd $STARTDIR/podio
+            mkdir build && cd build
+            cmake -DENABLE_SIO=ON \
+              -DCMAKE_INSTALL_PREFIX=../install \
+              -DCMAKE_CXX_STANDARD=17 \
+              -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror -Wno-error=deprecated-declarations " \
+              -DUSE_EXTERNAL_CATCH2=ON \
+              -DBUILD_TESTING=OFF\
+              -G Ninja ..
+            ninja -k0
+            echo "::endgroup::"
+            echo "::group::Test and install podio"
+            ctest --output-on-failure
+            ninja install
+            cd $STARTDIR/podio
+            source init.sh && source env.sh
+            echo "::endgroup::"
+            echo "::group::Build and test EDM4hep"
+            cd $STARTDIR/edm4hep
+            mkdir build && cd build
+            cmake -DCMAKE_CXX_STANDARD=17 \
+              -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror " \
+              -DUSE_EXTERNAL_CATCH2=ON \
+              -G Ninja ..
+            ninja -k0
+            ctest --output-on-failure
+            echo "::endgroup::"
diff --git a/.github/workflows/key4hep.yml b/.github/workflows/key4hep.yml
@@ -1,6 +1,12 @@
 name: key4hep
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+  workflow_dispatch:
+
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
@@ -10,21 +16,30 @@ jobs:
         release: ["sw.hsf.org/key4hep",
                   "sw-nightlies.hsf.org/key4hep"]
     steps:
-    - uses: actions/checkout@v2
-    - uses: cvmfs-contrib/github-action-cvmfs@v2
-    - uses: aidasoft/run-lcg-view@v3
+    - uses: actions/checkout@v3
+    - uses: cvmfs-contrib/github-action-cvmfs@v3
+    - uses: aidasoft/run-lcg-view@v4
       with:
         container: centos7
         view-path: /cvmfs/${{ matrix.release }}
         run: |
+          echo "::group::Run CMake"
           mkdir build install
           cd build
           cmake -DENABLE_SIO=ON \
             -DCMAKE_INSTALL_PREFIX=../install \
             -DCMAKE_CXX_STANDARD=17 \
-            -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror " \
+            -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror -Wno-error=deprecated-declarations " \
             -DUSE_EXTERNAL_CATCH2=ON \
+            -DENABLE_RNTUPLE=ON \
             -G Ninja ..
+          echo "::endgroup::"
+          echo "::group::Build"
           ninja -k0
+          echo "::endgroup"
+          echo "::group::Run tests"
           ctest --output-on-failure
+          echo "::endgroup::"
+          echo "::group::Install"
           ninja install
+          echo "::endgroup::"
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -1,30 +1,47 @@
 name: pre-commit
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+  workflow_dispatch:
 
 jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: cvmfs-contrib/github-action-cvmfs@v2
-    - uses: aidasoft/run-lcg-view@v3
+    - uses: actions/checkout@v3
+    - uses: cvmfs-contrib/github-action-cvmfs@v3
+    - uses: aidasoft/run-lcg-view@v4
       with:
-        release-platform: LCG_99/x86_64-centos7-clang10-opt
+        container: centos7
+        view-path: /cvmfs/sw-nightlies.hsf.org/key4hep
         run: |
-          export PYTHONPATH=$(python -m site --user-site):$PYTHONPATH
+          echo "::group::Setup pre-commit"
           export PATH=/root/.local/bin:$PATH
-          pip install argparse --user
-          pip install pre-commit --user
+          # Newer versions of git are more cautious around the github runner
+          # environment and without this git rev-parse --show-cdup in pre-commit
+          # fails
+          git config --global --add safe.directory $(pwd)
+          pip install pre-commit
+          pip install pylint==2.12.2
+          pip install flake8
+          echo "::endgroup::"
+          echo "::group::Run CMake"
           mkdir build
           cd build
           cmake .. -DENABLE_SIO=ON \
+            -DENABLE_RNTUPLE=ON \
             -DCMAKE_CXX_STANDARD=17 \
             -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror "\
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
             -DUSE_EXTERNAL_CATCH2=OFF
           ln -s $(pwd)/compile_commands.json ../
           cd ..
+          echo "::endgroup::"
+          echo "::group::Run pre-commit"
           pre-commit run --show-diff-on-failure \
             --color=always \
             --all-files
+          echo "::endgroup::"
diff --git a/.github/workflows/sanitizers.yaml b/.github/workflows/sanitizers.yaml
@@ -1,13 +1,19 @@
 name: sanitizers
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+  workflow_dispatch:
+
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        compiler: [gcc10, clang10]
+        compiler: [gcc11, clang12]
         # Since Leak is usually part of Address, we do not run it separately in
         # CI. Keeping Address and Undefined separate for easier debugging
         sanitizer: [Thread,
@@ -22,13 +28,13 @@ jobs:
         #   - compiler: clang10
         #     sanitizer: MemoryWithOrigin
     steps:
-      - uses: actions/checkout@v2
-      - uses: cvmfs-contrib/github-action-cvmfs@v2
-      - uses: aidasoft/run-lcg-view@v2
+      - uses: actions/checkout@v3
+      - uses: cvmfs-contrib/github-action-cvmfs@v3
+      - uses: aidasoft/run-lcg-view@v4
         with:
-          release-platform: LCG_99/x86_64-centos7-${{ matrix.compiler }}-opt
+          release-platform: LCG_102/x86_64-centos7-${{ matrix.compiler }}-opt
           run: |
-            set -x
+            echo "::group::Run CMake"
             mkdir build
             cd build
             cmake -DCMAKE_BUILD_TYPE=Debug \
@@ -38,5 +44,10 @@ jobs:
               -DUSE_EXTERNAL_CATCH2=OFF \
               -DENABLE_SIO=ON \
               -G Ninja ..
+            echo "::endgroup::"
+            echo "::group::Build"
             ninja -k0
+            echo "::endgroup::"
+            echo "::group::Run tests"
             ctest --output-on-failure
+            echo "::endgroup::"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,34 +1,51 @@
 name: linux
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+  workflow_dispatch:
+
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        sio: [ON]
-        LCG: ["LCG_99/x86_64-centos7-gcc8-opt",
-              "LCG_99/x86_64-centos7-clang10-opt",
-              "LCG_99/x86_64-centos8-gcc10-opt",
-              "dev3/x86_64-centos7-clang12-opt",
+        RNTUPLE: [ON]
+        LCG: ["dev3/x86_64-centos7-clang12-opt",
               "dev4/x86_64-centos7-gcc11-opt",
               "dev4/x86_64-centos7-clang12-opt"]
+        include:
+          - LCG: "LCG_102/x86_64-centos7-clang12-opt"
+            RNTUPLE: OFF
+          - LCG: "LCG_102/x86_64-centos8-gcc11-opt"
+            RNTUPLE: OFF
     steps:
-    - uses: actions/checkout@v2
-    - uses: cvmfs-contrib/github-action-cvmfs@v2
-    - uses: aidasoft/run-lcg-view@v2
+    - uses: actions/checkout@v3
+    - uses: cvmfs-contrib/github-action-cvmfs@v3
+    - uses: aidasoft/run-lcg-view@v4
       with:
         release-platform: ${{ matrix.LCG }}
         run: |
+          echo "::group::Run CMake"
           mkdir build install
           cd build
-          cmake -DENABLE_SIO=${{ matrix.sio }} \
+          cmake -DENABLE_SIO=ON \
+            -DENABLE_RNTUPLE=${{ matrix.RNTUPLE }} \
             -DCMAKE_INSTALL_PREFIX=../install \
             -DCMAKE_CXX_STANDARD=17 \
-            -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror " \
+            -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror -Wno-error=deprecated-declarations " \
             -DUSE_EXTERNAL_CATCH2=OFF \
             -G Ninja ..
+          echo "::endgroup::"
+          echo "::group::Build"
           ninja -k0
+          echo "::endgroup"
+          echo "::group::Run tests"
           ctest --output-on-failure
+          echo "::endgroup::"
+          echo "::group::Install"
           ninja install
+          echo "::endgroup::"
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -1,32 +1,46 @@
 name: ubuntu
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+  workflow_dispatch:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         sio: [ON]
-        LCG: ["LCG_99/x86_64-ubuntu2004-gcc9-opt",
-              "dev3/x86_64-ubuntu2004-gcc9-opt",
+        LCG: ["dev3/x86_64-ubuntu2004-gcc9-opt",
               "dev4/x86_64-ubuntu2004-gcc9-opt"]
     steps:
-    - uses: actions/checkout@v2
-    - uses: cvmfs-contrib/github-action-cvmfs@v2
-    - uses: aidasoft/run-lcg-view@v2
+    - uses: actions/checkout@v3
+    - uses: cvmfs-contrib/github-action-cvmfs@v3
+    - uses: aidasoft/run-lcg-view@v4
       with:
         release-platform: ${{ matrix.LCG }}
         run: |
+          echo "::group::Run CMake"
           mkdir build install
           cd build
           cmake -DENABLE_SIO=${{ matrix.sio }} \
             -DCMAKE_INSTALL_PREFIX=../install \
             -DCMAKE_CXX_STANDARD=17 \
-            -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror " \
-            -DUSE_EXTERNAL_CATCH2=OFF \
-            -G Ninja ..
+            -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror -Wno-error=deprecated-declarations " \
+                 -DUSE_EXTERNAL_CATCH2=OFF \
+                 -DPODIO_SET_RPATH=ON \
+                 -DENABLE_RNTUPLE=ON \
+                 -G Ninja ..
+          echo "::endgroup::"
+          echo "::group::Build"
           ninja -k0
+          echo "::endgroup"
+          echo "::group::Run tests"
           ctest --output-on-failure
+          echo "::endgroup::"
+          echo "::group::Install"
           ninja install
+          echo "::endgroup::"