From 685c0d97b43550e59d5ee82a2afd9dffeb2d7498 Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Tue, 16 Jul 2024 21:32:23 +0200 Subject: [PATCH 01/21] do it --- .gitlab-ci.yml | 232 ++++++++++++++++++++++++------------------------- 1 file changed, 116 insertions(+), 116 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64e12d877a2..c61b5f60bed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,122 +55,122 @@ clang_tidy: # Generate an html report - codereport clang-tidy/clang-tidy.json clang-tidy/html -# build_exatrkx_cpu: -# stage: build -# image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 -# tags: -# - large - -# cache: -# key: ccache-exatrkx-cpu-$CI_COMMIT_REF_SLUG -# paths: -# - ${CI_PROJECT_DIR}/ccache - -# script: -# - export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH -# - export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:$PATH -# - echo $PATH -# - git clone $CLONE_URL src -# - cd src -# - git checkout $HEAD_SHA -# - cd .. -# - mkdir build -# # Here we only do a minimal build without examples to save ressources -# - > -# cmake -B build -S src -# -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -# -GNinja -# -DCMAKE_BUILD_TYPE=Release -# -DCMAKE_CXX_FLAGS=-w -# -DACTS_BUILD_PLUGIN_EXATRKX=ON -# -DACTS_BUILD_EXAMPLES_EXATRKX=OFF -# -DACTS_BUILD_UNITTESTS=OFF -# -DACTS_EXATRKX_ENABLE_TORCH=ON -# -DACTS_EXATRKX_ENABLE_ONNX=OFF -# -DACTS_EXATRKX_ENABLE_CUDA=OFF -# -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=OFF -# -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON - -# - ccache -z -# - cmake --build build -- -j2 -# - ccache -s - -# build_exatrkx: -# stage: build -# image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 -# tags: -# - large -# -# cache: -# key: ccache-exatrkx-$CI_COMMIT_REF_SLUG -# paths: -# - ${CI_PROJECT_DIR}/ccache -# -# artifacts: -# paths: -# - build/ -# exclude: -# - build/**/*.o -# - build/bin/ActsIntegrationTest* -# expire_in: 6 hours -# -# script: -# - export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH -# - export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:$PATH -# - echo $PATH -# - git clone $CLONE_URL src -# - cd src -# - git checkout $HEAD_SHA -# - cd .. -# - mkdir build -# - > -# cmake -B build -S src -# -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -# -GNinja -# -DCMAKE_BUILD_TYPE=Release -# -DCMAKE_CXX_FLAGS=-w -# -DCMAKE_CUDA_FLAGS=-w -# -DCMAKE_CUDA_ARCHITECTURES="75;86" -# -DACTS_BUILD_PLUGIN_EXATRKX=ON -# -DACTS_BUILD_EXAMPLES_EXATRKX=ON -# -DACTS_BUILD_UNITTESTS=ON -# -DACTS_EXATRKX_ENABLE_TORCH=ON -# -DACTS_EXATRKX_ENABLE_ONNX=ON -# -DACTS_EXATRKX_ENABLE_CUDA=ON -# -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON -# -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON -# -# - ccache -z -# - cmake --build build -- -j2 -# - ccache -s - -# test_exatrkx_unittests: -# stage: test -# needs: -# - build_exatrkx -# image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 -# tags: -# - docker-gpu-nvidia -# script: -# - ctest --test-dir build -R ExaTrkX -# -# test_exatrkx_python: -# stage: test -# needs: -# - build_exatrkx -# image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 -# tags: -# - docker-gpu-nvidia -# script: -# - apt-get update -y -# - apt-get install -y python3 libxxhash0 -# - source build/this_acts_withdeps.sh -# - git clone $CLONE_URL src -# - cd src -# - git checkout $HEAD_SHA -# - pip3 install -r Examples/Python/tests/requirements_ubuntu2004.txt -# - nvidia-smi -# - pytest -rFsv -k test_exatrkx +build_exatrkx_cpu: + stage: build + image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 + tags: + - large + + cache: + key: ccache-exatrkx-cpu-$CI_COMMIT_REF_SLUG + paths: + - ${CI_PROJECT_DIR}/ccache + + script: + - export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH + - export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:$PATH + - echo $PATH + - git clone $CLONE_URL src + - cd src + - git checkout $HEAD_SHA + - cd .. + - mkdir build + # Here we only do a minimal build without examples to save ressources + - > + cmake -B build -S src + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + -GNinja + -DCMAKE_BUILD_TYPE=Release + -DCMAKE_CXX_FLAGS=-w + -DACTS_BUILD_PLUGIN_EXATRKX=ON + -DACTS_BUILD_EXAMPLES_EXATRKX=OFF + -DACTS_BUILD_UNITTESTS=OFF + -DACTS_EXATRKX_ENABLE_TORCH=ON + -DACTS_EXATRKX_ENABLE_ONNX=OFF + -DACTS_EXATRKX_ENABLE_CUDA=OFF + -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=OFF + -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON + + - ccache -z + - cmake --build build -- -j2 + - ccache -s + +build_exatrkx: + stage: build + image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 + tags: + - large + + cache: + key: ccache-exatrkx-$CI_COMMIT_REF_SLUG + paths: + - ${CI_PROJECT_DIR}/ccache + + artifacts: + paths: + - build/ + exclude: + - build/**/*.o + - build/bin/ActsIntegrationTest* + expire_in: 6 hours + + script: + - export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH + - export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:$PATH + - echo $PATH + - git clone $CLONE_URL src + - cd src + - git checkout $HEAD_SHA + - cd .. + - mkdir build + - > + cmake -B build -S src + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + -GNinja + -DCMAKE_BUILD_TYPE=Release + -DCMAKE_CXX_FLAGS=-w + -DCMAKE_CUDA_FLAGS=-w + -DCMAKE_CUDA_ARCHITECTURES="75;86" + -DACTS_BUILD_PLUGIN_EXATRKX=ON + -DACTS_BUILD_EXAMPLES_EXATRKX=ON + -DACTS_BUILD_UNITTESTS=ON + -DACTS_EXATRKX_ENABLE_TORCH=ON + -DACTS_EXATRKX_ENABLE_ONNX=OFF + -DACTS_EXATRKX_ENABLE_CUDA=ON + -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON + -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON + + - ccache -z + - cmake --build build -- -j2 + - ccache -s + +test_exatrkx_unittests: + stage: test + needs: + - build_exatrkx + image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 + tags: + - docker-gpu-nvidia + script: + - ctest --test-dir build -R ExaTrkX + +test_exatrkx_python: + stage: test + needs: + - build_exatrkx + image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 + tags: + - docker-gpu-nvidia + script: + - apt-get update -y + - apt-get install -y python3 libxxhash0 + - source build/this_acts_withdeps.sh + - git clone $CLONE_URL src + - cd src + - git checkout $HEAD_SHA + - pip3 install -r Examples/Python/tests/requirements_ubuntu2004.txt + - nvidia-smi + - pytest -rFsv -k torch # For now only test torch pipeline build_linux_ubuntu: stage: build From 320da57e631449c0e557f474450a512b0398f51a Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Tue, 16 Jul 2024 21:43:23 +0200 Subject: [PATCH 02/21] udpate --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c61b5f60bed..06ba5927057 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,6 +69,7 @@ build_exatrkx_cpu: script: - export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH - export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:$PATH + - export TORCH_CUDA_ARCH_LIST="8.0 8.6 8.9 9.0" - echo $PATH - git clone $CLONE_URL src - cd src @@ -117,6 +118,7 @@ build_exatrkx: script: - export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH - export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:$PATH + - export TORCH_CUDA_ARCH_LIST="8.0 8.6 8.9 9.0" - echo $PATH - git clone $CLONE_URL src - cd src From e86e88d493999eae97a69cd5585de5fd4e140422 Mon Sep 17 00:00:00 2001 From: Benjamin Huth <37871400+benjaminhuth@users.noreply.github.com> Date: Tue, 23 Jul 2024 11:48:26 +0200 Subject: [PATCH 03/21] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06ba5927057..71a088feb92 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,6 +172,7 @@ test_exatrkx_python: - git checkout $HEAD_SHA - pip3 install -r Examples/Python/tests/requirements_ubuntu2004.txt - nvidia-smi + - pytest -rFsv -k torch --collect-only - pytest -rFsv -k torch # For now only test torch pipeline build_linux_ubuntu: From ca658b990bab62a354dac2a50b51093bef5690f9 Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Thu, 10 Oct 2024 15:23:10 +0200 Subject: [PATCH 04/21] fix track conversion --- .../Python/python/acts/examples/reconstruction.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Examples/Python/python/acts/examples/reconstruction.py b/Examples/Python/python/acts/examples/reconstruction.py index 7ac0989744f..bd486909b19 100644 --- a/Examples/Python/python/acts/examples/reconstruction.py +++ b/Examples/Python/python/acts/examples/reconstruction.py @@ -1880,11 +1880,18 @@ def addExaTrkX( s.addAlgorithm(findingAlg) s.addWhiteboardAlias("prototracks", findingAlg.config.outputProtoTracks) - # TODO convert prototracks to tracks + s.addAlgorithm( + acts.examples.PrototracksToTracks( + level=customLogLevel(), + inputProtoTracks="prototracks", + inputMeasurements="measurements", + outputTracks="tracks", + ) + ) matchAlg = acts.examples.TrackTruthMatcher( level=customLogLevel(), - inputProtoTracks=findingAlg.config.outputProtoTracks, + inputProtoTracks="tracks", inputParticles="particles", inputMeasurementParticlesMap="measurement_particles_map", outputTrackParticleMatching="exatrkx_track_particle_matching", From 696c0ed1e10313fe06c0f91bb62b6b5e197fa0be Mon Sep 17 00:00:00 2001 From: Benjamin Huth <37871400+benjaminhuth@users.noreply.github.com> Date: Fri, 11 Oct 2024 14:08:49 +0200 Subject: [PATCH 05/21] Update reconstruction.py --- Examples/Python/python/acts/examples/reconstruction.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/Python/python/acts/examples/reconstruction.py b/Examples/Python/python/acts/examples/reconstruction.py index bd486909b19..641175f2ee5 100644 --- a/Examples/Python/python/acts/examples/reconstruction.py +++ b/Examples/Python/python/acts/examples/reconstruction.py @@ -1891,7 +1891,7 @@ def addExaTrkX( matchAlg = acts.examples.TrackTruthMatcher( level=customLogLevel(), - inputProtoTracks="tracks", + inputTracks="tracks", inputParticles="particles", inputMeasurementParticlesMap="measurement_particles_map", outputTrackParticleMatching="exatrkx_track_particle_matching", From aecf28dacee352ccf94ae7aa3b0e8c842693ddfb Mon Sep 17 00:00:00 2001 From: Benjamin Huth <37871400+benjaminhuth@users.noreply.github.com> Date: Fri, 11 Oct 2024 15:33:06 +0200 Subject: [PATCH 06/21] Update reconstruction.py --- Examples/Python/python/acts/examples/reconstruction.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/Python/python/acts/examples/reconstruction.py b/Examples/Python/python/acts/examples/reconstruction.py index 641175f2ee5..fec30032a9a 100644 --- a/Examples/Python/python/acts/examples/reconstruction.py +++ b/Examples/Python/python/acts/examples/reconstruction.py @@ -1911,7 +1911,7 @@ def addExaTrkX( s.addWriter( acts.examples.TrackFinderPerformanceWriter( level=customLogLevel(), - inputProtoTracks=findingAlg.config.outputProtoTracks, + inputTracks="tracks", # the original selected particles after digitization inputParticles="particles_initial", inputMeasurementParticlesMap="measurement_particles_map", From a9588e3f1eaf13b24ca24e5b89c54bfe1dbfb030 Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Tue, 3 Dec 2024 09:31:33 +0100 Subject: [PATCH 07/21] update --- .../python/acts/examples/reconstruction.py | 7 +- Examples/Scripts/Python/exatrkx.py | 71 ++++++++++++------- 2 files changed, 49 insertions(+), 29 deletions(-) diff --git a/Examples/Python/python/acts/examples/reconstruction.py b/Examples/Python/python/acts/examples/reconstruction.py index 9444228c380..9d9fa1b6c07 100644 --- a/Examples/Python/python/acts/examples/reconstruction.py +++ b/Examples/Python/python/acts/examples/reconstruction.py @@ -1792,13 +1792,12 @@ def addExaTrkX( if backend == ExaTrkXBackend.Torch: metricLearningConfig["modelPath"] = str(modelDir / "embed.pt") - metricLearningConfig["numFeatures"] = 3 + metricLearningConfig["selectedFeatures"] = [0, 1, 2] filterConfig["modelPath"] = str(modelDir / "filter.pt") - filterConfig["nChunks"] = 10 - filterConfig["numFeatures"] = 3 + filterConfig["selectedFeatures"] = [0, 1, 2] gnnConfig["modelPath"] = str(modelDir / "gnn.pt") gnnConfig["undirected"] = True - gnnConfig["numFeatures"] = 3 + gnnConfig["selectedFeatures"] = [0, 1, 2] graphConstructor = acts.examples.TorchMetricLearning(**metricLearningConfig) edgeClassifiers = [ diff --git a/Examples/Scripts/Python/exatrkx.py b/Examples/Scripts/Python/exatrkx.py index b2a151fc4e7..5a8920a318a 100755 --- a/Examples/Scripts/Python/exatrkx.py +++ b/Examples/Scripts/Python/exatrkx.py @@ -1,16 +1,52 @@ #!/usr/bin/env python3 from pathlib import Path +import os +import sys import acts.examples import acts +from acts.examples.reconstruction import addExaTrkX, ExaTrkXBackend from acts import UnitConstants as u +from digitization import runDigitization + + +def runGNNTrackFinding( + trackingGeometry, + field, + outputDir, + digiConfigFile, + geometrySelection, + backend, + modelDir, + outputRoot=False, + outputCsv=False, + s=None, +): + s = runDigitization( + trackingGeometry, + field, + outputDir, + digiConfigFile=digiConfigFile, + particlesInput=None, + outputRoot=outputRoot, + outputCsv=outputCsv, + s=s, + ) + + addExaTrkX( + s, + trackingGeometry, + geometrySelection, + modelDir, + backend=backend, + outputDirRoot=outputDir if outputRoot else None, + ) + + s.run() + if "__main__" == __name__: - import os - import sys - from digitization import runDigitization - from acts.examples.reconstruction import addExaTrkX, ExaTrkXBackend backend = ExaTrkXBackend.Torch @@ -19,16 +55,10 @@ if "torch" in sys.argv: backend = ExaTrkXBackend.Torch - srcdir = Path(__file__).resolve().parent.parent.parent.parent - detector, trackingGeometry, decorators = acts.examples.GenericDetector.create() field = acts.ConstantBField(acts.Vector3(0, 0, 2 * u.T)) - inputParticlePath = Path("particles.root") - if not inputParticlePath.exists(): - inputParticlePath = None - srcdir = Path(__file__).resolve().parent.parent.parent.parent geometrySelection = ( @@ -60,24 +90,15 @@ rnd = acts.examples.RandomNumbers() outputDir = Path(os.getcwd()) - s = runDigitization( + runGNNTrackFinding( trackingGeometry, field, outputDir, - digiConfigFile=digiConfigFile, - particlesInput=inputParticlePath, - outputRoot=True, - outputCsv=True, - s=s, - ) - - addExaTrkX( - s, - trackingGeometry, + digiConfigFile, geometrySelection, + backend, modelDir, - outputDir, - backend=backend, + outputRoot=True, + outputCsv=False, + s=s, ) - - s.run() From f67867901173e560b9bb40f4a895cf7aaf88435a Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Tue, 3 Dec 2024 09:57:39 +0100 Subject: [PATCH 08/21] update --- .gitlab-ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 762f4893f41..e66b361f331 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -146,7 +146,9 @@ test_exatrkx_unittests: stage: test needs: - build_exatrkx - image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 + image: ghcr.io/acts-project/ubuntu2204_exatrkx:63 + variables: + DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst tags: - docker-gpu-nvidia script: @@ -156,7 +158,9 @@ test_exatrkx_python: stage: test needs: - build_exatrkx - image: ghcr.io/acts-project/ubuntu2204_exatrkx:52 + image: ghcr.io/acts-project/ubuntu2204_exatrkx:63 + variables: + DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst tags: - docker-gpu-nvidia script: @@ -166,7 +170,7 @@ test_exatrkx_python: - git clone $CLONE_URL src - cd src - git checkout $HEAD_SHA - - pip3 install -r Examples/Python/tests/requirements_ubuntu2004.txt + - pip3 install -r Examples/Python/tests/requirements.txt - nvidia-smi - pytest -rFsv -k torch --collect-only - pytest -rFsv -k gpu-torch # For now only test torch GPU pipeline From 84b0c4e2c02071bebd8cd92e1281ccb66a00f5af Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Tue, 3 Dec 2024 10:20:41 +0100 Subject: [PATCH 09/21] update --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e66b361f331..595e46d8cfb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -152,6 +152,7 @@ test_exatrkx_unittests: tags: - docker-gpu-nvidia script: + - source CI/dependencies.sh - ctest --test-dir build -R ExaTrkX test_exatrkx_python: @@ -172,6 +173,7 @@ test_exatrkx_python: - git checkout $HEAD_SHA - pip3 install -r Examples/Python/tests/requirements.txt - nvidia-smi + - source CI/dependencies.sh - pytest -rFsv -k torch --collect-only - pytest -rFsv -k gpu-torch # For now only test torch GPU pipeline From 9eca8dc04885c63a8438533ec95080fde1172c4a Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Tue, 3 Dec 2024 10:53:47 +0100 Subject: [PATCH 10/21] update --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 595e46d8cfb..880f8edc926 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -167,13 +167,15 @@ test_exatrkx_python: script: - apt-get update -y - apt-get install -y python3 libxxhash0 - - source build/this_acts_withdeps.sh - git clone $CLONE_URL src - cd src - git checkout $HEAD_SHA - pip3 install -r Examples/Python/tests/requirements.txt - nvidia-smi - source CI/dependencies.sh + - source build/this_acts_withdeps.sh + - source build/python/setup.sh + - echo "PYTHONPATH: $PYTHONPATH" - pytest -rFsv -k torch --collect-only - pytest -rFsv -k gpu-torch # For now only test torch GPU pipeline From b4b6913fc022f9e2669e9ac576ad8c49ae5aad1c Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Tue, 3 Dec 2024 11:31:21 +0100 Subject: [PATCH 11/21] empty From e32e02d8e10c5e4397835bc64ffe3c0554974086 Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Tue, 3 Dec 2024 11:37:22 +0100 Subject: [PATCH 12/21] update --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 880f8edc926..f8f2ed3faf9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -175,7 +175,7 @@ test_exatrkx_python: - source CI/dependencies.sh - source build/this_acts_withdeps.sh - source build/python/setup.sh - - echo "PYTHONPATH: $PYTHONPATH" + - echo $PYTHONPATH - pytest -rFsv -k torch --collect-only - pytest -rFsv -k gpu-torch # For now only test torch GPU pipeline From fd3a0e5ccc956f497513702d7e179640a38e1b75 Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Tue, 3 Dec 2024 12:19:50 +0100 Subject: [PATCH 13/21] update --- .gitlab-ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8f2ed3faf9..85f36f115b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -152,7 +152,11 @@ test_exatrkx_unittests: tags: - docker-gpu-nvidia script: - - source CI/dependencies.sh + + - apt-get update -y + - apt-get install -y python3 libxxhash0 + - git clone $CLONE_URL src + - source src/CI/dependencies.sh - ctest --test-dir build -R ExaTrkX test_exatrkx_python: @@ -173,8 +177,8 @@ test_exatrkx_python: - pip3 install -r Examples/Python/tests/requirements.txt - nvidia-smi - source CI/dependencies.sh - - source build/this_acts_withdeps.sh - - source build/python/setup.sh + - source ../build/this_acts_withdeps.sh + - source ../build/python/setup.sh - echo $PYTHONPATH - pytest -rFsv -k torch --collect-only - pytest -rFsv -k gpu-torch # For now only test torch GPU pipeline From bdb2eabccaa558bd6ffc46c51bf1c8a6f720eefa Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Wed, 4 Dec 2024 08:55:54 +0100 Subject: [PATCH 14/21] update --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 85f36f115b8..2c4b2d9d012 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -154,7 +154,6 @@ test_exatrkx_unittests: script: - apt-get update -y - - apt-get install -y python3 libxxhash0 - git clone $CLONE_URL src - source src/CI/dependencies.sh - ctest --test-dir build -R ExaTrkX @@ -170,7 +169,6 @@ test_exatrkx_python: - docker-gpu-nvidia script: - apt-get update -y - - apt-get install -y python3 libxxhash0 - git clone $CLONE_URL src - cd src - git checkout $HEAD_SHA @@ -178,7 +176,6 @@ test_exatrkx_python: - nvidia-smi - source CI/dependencies.sh - source ../build/this_acts_withdeps.sh - - source ../build/python/setup.sh - echo $PYTHONPATH - pytest -rFsv -k torch --collect-only - pytest -rFsv -k gpu-torch # For now only test torch GPU pipeline From e2206deef2af41e29bbe5eb9625ddcfb70848450 Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Wed, 4 Dec 2024 09:36:44 +0100 Subject: [PATCH 15/21] update --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c4b2d9d012..07e054d31dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,11 +172,13 @@ test_exatrkx_python: - git clone $CLONE_URL src - cd src - git checkout $HEAD_SHA - - pip3 install -r Examples/Python/tests/requirements.txt + - python3 -m pip install -r Examples/Python/tests/requirements.txt - nvidia-smi - source CI/dependencies.sh - source ../build/this_acts_withdeps.sh - echo $PYTHONPATH + - which python3 + - python3 --version - pytest -rFsv -k torch --collect-only - pytest -rFsv -k gpu-torch # For now only test torch GPU pipeline From 2e6b3fc4c894304108297ff5a241f349cf0c1849 Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Wed, 4 Dec 2024 10:59:29 +0100 Subject: [PATCH 16/21] update --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07e054d31dd..5d2e7958c3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -179,8 +179,9 @@ test_exatrkx_python: - echo $PYTHONPATH - which python3 - python3 --version - - pytest -rFsv -k torch --collect-only - - pytest -rFsv -k gpu-torch # For now only test torch GPU pipeline + - python3 -c "import acts" + - python3 -m pytest -rFsv -k torch --collect-only + - python3 -m pytest -rFsv -k gpu-torch # For now only test torch GPU pipeline build_linux_ubuntu: stage: build From c2f9c062d3e36c9ef6f8169eb29ca4a44729203c Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Wed, 4 Dec 2024 16:52:31 +0100 Subject: [PATCH 17/21] fix? --- Examples/Algorithms/TrackFindingExaTrkX/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Examples/Algorithms/TrackFindingExaTrkX/CMakeLists.txt b/Examples/Algorithms/TrackFindingExaTrkX/CMakeLists.txt index 85866466ec6..64255b89b14 100644 --- a/Examples/Algorithms/TrackFindingExaTrkX/CMakeLists.txt +++ b/Examples/Algorithms/TrackFindingExaTrkX/CMakeLists.txt @@ -5,6 +5,7 @@ add_library( src/PrototracksToParameters.cpp src/TrackFindingFromPrototrackAlgorithm.cpp src/TruthGraphBuilder.cpp + src/createFeatures.cpp ) target_include_directories( From 9ffe51ae7445f7d0687e38c19d3f23520471940f Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Thu, 5 Dec 2024 13:13:04 +0100 Subject: [PATCH 18/21] update --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d2e7958c3f..54946b2079c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -180,8 +180,8 @@ test_exatrkx_python: - which python3 - python3 --version - python3 -c "import acts" - - python3 -m pytest -rFsv -k torch --collect-only - - python3 -m pytest -rFsv -k gpu-torch # For now only test torch GPU pipeline + - pytest -rFsv -k torch --collect-only + - pytest -rFsv -k gpu-torch # For now only test torch GPU pipeline build_linux_ubuntu: stage: build From fff31f5a3fb1fee4c2c3ecc85f7dad15240771ea Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Thu, 5 Dec 2024 14:51:53 +0100 Subject: [PATCH 19/21] update --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54946b2079c..e278b18eade 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,10 +172,10 @@ test_exatrkx_python: - git clone $CLONE_URL src - cd src - git checkout $HEAD_SHA - - python3 -m pip install -r Examples/Python/tests/requirements.txt - nvidia-smi - source CI/dependencies.sh - source ../build/this_acts_withdeps.sh + - python3 -m pip install -r Examples/Python/tests/requirements.txt - echo $PYTHONPATH - which python3 - python3 --version From 53655010c4e9427afcb5aad763d60742fc04b419 Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Thu, 5 Dec 2024 15:23:23 +0100 Subject: [PATCH 20/21] update --- Examples/Python/python/acts/examples/reconstruction.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Examples/Python/python/acts/examples/reconstruction.py b/Examples/Python/python/acts/examples/reconstruction.py index 9d9fa1b6c07..23f0dd667d3 100644 --- a/Examples/Python/python/acts/examples/reconstruction.py +++ b/Examples/Python/python/acts/examples/reconstruction.py @@ -1855,14 +1855,12 @@ def addExaTrkX( "particle_track_matching", matchAlg.config.outputParticleTrackMatching ) - # Write truth track finding / seeding performance if outputDirRoot is not None: s.addWriter( acts.examples.TrackFinderNTupleWriter( level=customLogLevel(), inputTracks="tracks", - # the original selected particles after digitization - inputParticles="particles_initial", + inputParticles="particles", inputMeasurementParticlesMap="measurement_particles_map", inputTrackParticleMatching=matchAlg.config.outputTrackParticleMatching, filePath=str(Path(outputDirRoot) / "performance_track_finding.root"), From 34642ee2369166c63ce49fbe0cae8c46b6a39bd0 Mon Sep 17 00:00:00 2001 From: Benjamin Huth Date: Thu, 5 Dec 2024 16:42:17 +0100 Subject: [PATCH 21/21] update hash --- Examples/Python/tests/root_file_hashes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/Python/tests/root_file_hashes.txt b/Examples/Python/tests/root_file_hashes.txt index 6eeaaebff44..e1b2833c2eb 100644 --- a/Examples/Python/tests/root_file_hashes.txt +++ b/Examples/Python/tests/root_file_hashes.txt @@ -72,7 +72,7 @@ test_root_clusters_writer[configKwConstructor]__clusters.root: e842df4fe04eefff3 test_root_clusters_writer[kwargsConstructor]__clusters.root: e842df4fe04eefff3df5f32cd1026e93286be62b8040dc700a2aff557c56dec8 test_exatrkx[cpu-torch]__performance_track_finding.root: 36b3045589c4c17c038dbc87943366f4af4440f7eea6887afb763871ac149b05 test_exatrkx[gpu-onnx]__performance_track_finding.root: 9090de10ffb1489d3f1993e2a3081a3038227e3e5c453e98a9a4f33ea3d6d817 -test_exatrkx[gpu-torch]__performance_track_finding.root: 36b3045589c4c17c038dbc87943366f4af4440f7eea6887afb763871ac149b05 +test_exatrkx[gpu-torch]__performance_track_finding.root: 6b658fa22c7532e082eaab7aa4b71b852f1c324adcc59d1156aff45124b222d9 test_ML_Ambiguity_Solver__performance_finding_ambiML.root: 166dd8bb189097c4957b7b02c04c41267868d72d9a08c4bb892985b06849cb76 test_refitting[odd]__trackstates_gsf_refit.root: e297749dc1e7eda3b8dea13defa0499986c584740d93e723a901b498b8e90c71 test_refitting[odd]__tracksummary_gsf_refit.root: d5085882e45a0b699194dff9f40a36e9291227bf65f9aaaf9087f9242ef5ae22