Merge branch 'main' into fix/setup-script

.github/workflows/analysis.yml

@@ -63,9 +63,9 @@ jobs:
           && du -sh build
       - name: Coverage
         run: >
-          pip3 install gcovr==5.0
+          pip3 install gcovr==6.0
           && cd build
-          && /usr/bin/python3 ../CI/test_coverage
+          && /usr/bin/python3 ../CI/test_coverage.py
       - name: Upload coverage
         uses: codecov/codecov-action@v3
         with:

CI/release.py

@@ -371,7 +371,6 @@ async def pr_action(
     token: Optional[str] = typer.Option(None, envvar="GH_TOKEN"),
     repo: Optional[str] = typer.Option(None, envvar="GH_REPO"),
 ):
-
     print("::group::Information")
 
     context = os.environ.get("GITHUB_CONTEXT")
@@ -437,7 +436,6 @@ async def pr_action(
         exit_code = 0
 
         if existing_release is not None or existing_tag is not None:
-
             if current_version == next_version:
                 body += (
                     "## :no_entry_sign: Merging this will not result in a new version (no `fix`, "

CI/test_coverage.py

@@ -0,0 +1,86 @@
+#!/usr/bin/env python
+import sys
+import os
+import subprocess
+import argparse
+import multiprocessing as mp
+import re
+
+
+if not os.path.exists("CMakeCache.txt"):
+    print("Not in CMake build dir. Not executing")
+    sys.exit(1)
+
+
+def check_output(*args, **kwargs):
+    p = subprocess.Popen(
+        *args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kwargs
+    )
+    p.wait()
+    stdout, stderr = p.communicate()
+    stdout = stdout.decode("utf-8")
+    return (p.returncode, stdout.strip())
+
+
+# call helper function
+def call(cmd):
+    print(" ".join(cmd))
+    try:
+        subprocess.check_call(cmd)
+    except subprocess.CalledProcessError as e:
+        print("Failed, output: ", e.output)
+        raise e
+
+
+p = argparse.ArgumentParser()
+p.add_argument("--gcov", default=check_output(["which", "gcov"])[1])
+args = p.parse_args()
+
+ret, gcovr_exe = check_output(["which", "gcovr"])
+assert ret == 0, "gcovr not installed. Use 'pip install gcovr'."
+
+ret, gcovr_version_text = check_output(["gcovr", "--version"])
+gcovr_version = tuple(
+    map(int, re.match("gcovr (\d+\.\d+)", gcovr_version_text).group(1).split("."))
+)
+
+extra_flags = []
+
+print(f"Found gcovr version {gcovr_version[0]}.{gcovr_version[1]}")
+if gcovr_version < (5,):
+    print("Consider upgrading to a newer gcovr version.")
+elif gcovr_version == (5, 1):
+    assert False and "Version 5.1 does not support parallel processing of gcov data"
+elif gcovr_version >= (6,):
+    extra_flags += ["--exclude-noncode-lines"]
+
+gcovr = [gcovr_exe]
+
+script_dir = os.path.dirname(__file__)
+source_dir = os.path.abspath(os.path.join(script_dir, ".."))
+coverage_dir = os.path.abspath("coverage")
+
+if not os.path.exists(coverage_dir):
+    os.makedirs(coverage_dir)
+
+excludes = ["-e", "../Tests/", "-e", ".*json\.hpp"]
+
+# create the html report
+call(
+    gcovr
+    + ["-r", source_dir]
+    + ["--gcov-executable", args.gcov]
+    + ["-j", str(mp.cpu_count())]
+    + excludes
+    + extra_flags
+    + ["--xml", "-o", "coverage/cov.xml"]
+)
+
+call(
+    gcovr
+    + ["-r", source_dir]
+    + ["-j", str(mp.cpu_count())]
+    + ["--gcov-executable", args.gcov]
+    + excludes
+    + extra_flags
+)

Core/CMakeLists.txt

@@ -15,10 +15,6 @@ target_compile_features(
   ActsCore
   PUBLIC ${ACTS_CXX_STANDARD_FEATURE})
 
-if(ACTS_CONCEPTS_SUPPORTED)
-  target_compile_definitions(ActsCore PUBLIC ACTS_CONCEPTS_SUPPORTED)
-endif()
-
 target_include_directories(
   ActsCore
   PUBLIC

Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.hpp

@@ -43,7 +43,7 @@ class GreedyAmbiguityResolution {
     std::uint32_t maximumIterations = 1000;
 
     /// Minimum number of measurement to form a track.
-    size_t nMeasurementsMin = 7;
+    std::size_t nMeasurementsMin = 7;
   };
 
   struct State {

Core/include/Acts/Clusterization/Clusterization.hpp

@@ -42,7 +42,7 @@ struct Connect1D {
 };
 
 // Default connection type based on GridDim
-template <typename Cell, size_t GridDim = 2>
+template <typename Cell, std::size_t GridDim = 2>
 struct DefaultConnect {
   static_assert(GridDim != 1 && GridDim != 2,
                 "Only grid dimensions of 1 or 2 are supported");
@@ -67,7 +67,7 @@ struct DefaultConnect<Cell, 1> : public Connect1D<Cell> {};
 ///
 /// @param [in] cells the cell collection to be labeled
 /// @param [in] connect the connection type (see DefaultConnect)
-template <typename CellCollection, size_t GridDim = 2,
+template <typename CellCollection, std::size_t GridDim = 2,
           typename Connect =
               DefaultConnect<typename CellCollection::value_type, GridDim>>
 void labelClusters(CellCollection& cells, Connect connect = Connect());
@@ -80,13 +80,14 @@ void labelClusters(CellCollection& cells, Connect connect = Connect());
 ///   void clusterAddCell(Cluster&, const Cell&)
 ///
 /// @return nothing
-template <typename CellCollection, typename ClusterCollection, size_t GridDim>
+template <typename CellCollection, typename ClusterCollection,
+          std::size_t GridDim>
 ClusterCollection mergeClusters(CellCollection& /*cells*/);
 
 /// @brief createClusters
 /// Convenience function which runs both labelClusters and createClusters.
 template <typename CellCollection, typename ClusterCollection,
-          size_t GridDim = 2,
+          std::size_t GridDim = 2,
           typename Connect =
               DefaultConnect<typename CellCollection::value_type, GridDim>>
 ClusterCollection createClusters(CellCollection& cells,