Merge branch 'main' into feat-index-grid-navigation-policy

Author: asalzburger

.github/labeler.yml

@@ -33,7 +33,7 @@
   - changed-files:
     - any-glob-to-any-file:
       - CI/physmon/reference/**
-      - Examples/Python/tests/root_file_hashes.txt
+      - Python/Examples/tests/root_file_hashes.txt
 'Event Data Model':
   - changed-files:
     - any-glob-to-any-file:

.github/workflows/update-pip-requirements.yml

@@ -34,7 +34,7 @@ jobs:
             CI/clang_tidy
             CI/fpe_masks
             docs/old
-            Examples/Python/tests
+            Python/Examples/tests
             Examples/Scripts
           )
           for folder in "${folder_list[@]}"; do

.gitlab-ci.yml

@@ -228,7 +228,7 @@ test_gnn_python:
     - apt-get install tree
     - tree ${MODEL_STORAGE}
     - source ../build/this_acts_withdeps.sh
-    - python3 -m pip install -r Examples/Python/tests/requirements.txt
+    - python3 -m pip install -r Python/Examples/tests/requirements.txt
     # There is not yet a proper test for the ModuleMap, but we can at least ensure that it is present and can be imported
     - python3 -c "from acts.examples.gnn import ModuleMapCuda"
     - pytest -rfExw -k torch -v --collect-only
@@ -515,7 +515,7 @@ linux_ubuntu_2404_clang19:
 
     # Install Python dependencies
     - source build/this_acts_withdeps.sh
-    - python3 -m pip install -r src/Examples/Python/tests/requirements.txt
+    - python3 -m pip install -r src//Python/Examples/tests/requirements.txt
     - cd src
     - pytest -rfExw -k "not gnn" -v -n1
 

CI/check_unused_files.py

@@ -169,7 +169,7 @@ def main():
 
             elif filepath.suffix in suffix_python:
                 # Skip the python tests folder
-                if str(root).find("Examples/Python") != -1:
+                if str(root).find("Python/Examples") != -1:
                     continue
 
                 if not file_can_be_removed("import .*" + filepath.stem, dirs_base):

CI/dependencies/setup.sh

@@ -251,7 +251,7 @@ start_section "Prepare python environment"
 "${view_dir}/bin/python3" -m venv --system-site-packages "$venv_dir"
 "${venv_dir}/bin/python3" -m pip install pyyaml jinja2
 if [ "${full_install:-false}" == "true" ]; then
-  "${venv_dir}/bin/python3" -m pip install -r "${SCRIPT_DIR}/../../Examples/Python/tests/requirements.txt"
+  "${venv_dir}/bin/python3" -m pip install -r "${SCRIPT_DIR}/../../Python/Examples/tests/requirements.txt"
   "${venv_dir}/bin/python3" -m pip install histcmp==0.8.1 matplotlib
   "${venv_dir}/bin/python3" -m pip install pytest-md-report
 fi

CMakeLists.txt

@@ -604,12 +604,12 @@ add_component_if(Alignment Alignment ACTS_BUILD_ALIGNMENT)
 
 add_subdirectory_if(thirdparty/OpenDataDetector ACTS_BUILD_ODD)
 
-# Python bindings infrastructure
-add_subdirectory_if(Python ACTS_BUILD_EXAMPLES_PYTHON_BINDINGS)
-
-# examples
+# Examples
 add_subdirectory_if(Examples ACTS_BUILD_EXAMPLES)
 
+# Python bindings
+add_subdirectory_if(Python ACTS_BUILD_EXAMPLES_PYTHON_BINDINGS)
+
 # automated tests and benchmarks
 if(ACTS_BUILD_BENCHMARKS OR ACTS_BUILD_INTEGRATIONTESTS OR ACTS_BUILD_UNITTESTS)
     enable_testing() # must be set in the main CMakeLists.txt

Examples/CMakeLists.txt

@@ -2,7 +2,6 @@ add_subdirectory(Algorithms)
 add_subdirectory(Detectors)
 add_subdirectory(Framework)
 add_subdirectory(Io)
-add_subdirectory_if(Python ACTS_BUILD_EXAMPLES_PYTHON_BINDINGS)
 add_subdirectory_if(Scripts ACTS_BUILD_ANALYSIS_APPS)
 
 add_subdirectory(HelloWorld)