Skip to content

Commit e9c46da

Browse files
benjaminhuthclaude
andauthored
chore: bump ModuleMapGraph to version 1.4.0 (#5269)
Requires a new module map file due to changes in the definition of the geometric cuts. For now, the new patched module map files have the min/max values of the affected `deta` and `diff_dydx` cuts inflated to `+/- inf` to avoid regeneration of the module map files. Should go in after #5263 --- END COMMIT MESSAGE --- Any further description goes here, @-mentions are ok here! - Use a *conventional commits* prefix: [quick summary](https://www.conventionalcommits.org/en/v1.0.0/#summary) - We mostly use `feat`, `fix`, `refactor`, `docs`, `chore` and `build` types. - A milestone will be assigned by one of the maintainers --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 557e01d commit e9c46da

File tree

7 files changed

+16
-12
lines changed

7 files changed

+16
-12
lines changed

CI/dependencies/download_models.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ download \
3232
1185060ce697bbc96c9dc32b85e5f0eb4db1f64a645c0fc4d2cb2731cb2ef3dc
3333

3434
download \
35-
https://acts.web.cern.ch/ci/gnn/odd_module_map_v01.tar \
36-
59f0457f0043bac8594e9f5a3310a709244de980a7b0c206d7d0d95f15455d73
35+
https://acts.web.cern.ch/ci/gnn/odd_module_map_v02.tar \
36+
1954d20ec0d947476dda06a6982774a193a8ad15dca4dec621b53761f329d493

Examples/Scripts/Python/gnn_module_map_odd.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,9 @@ def runGnnModuleMap(
237237
model_storage = os.environ.get("MODEL_STORAGE")
238238
assert model_storage is not None, "MODEL_STORAGE environment variable is not set"
239239
ci_models_odd = Path(model_storage)
240-
moduleMapPath = str(ci_models_odd / "module_map_odd_2k_events.1e-03.float")
240+
moduleMapPath = str(
241+
ci_models_odd / "module_map_odd_2k_events.1e-03.float.v1_3_PATCH"
242+
)
241243
gnnModel = str(ci_models_odd / "gnn_odd_module_map.pt")
242244
outputDir = Path.cwd()
243245
events = 100

Plugins/Gnn/include/ActsPlugins/Gnn/detail/ModuleMapUtils.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
#pragma once
1010

11-
#include <CUDA_graph_creator>
1211
#include <algorithm>
1312
#include <iostream>
1413
#include <vector>
1514

15+
#include <MMG/CUDA_graph_creator>
1616
#include <cuda_runtime_api.h>
1717

1818
#define USE_LAUNCH_BOUNDS

Plugins/Gnn/src/ModuleMapCuda.cu

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
#include "ActsPlugins/Gnn/detail/CudaUtils.hpp"
1212
#include "ActsPlugins/Gnn/detail/ModuleMapUtils.cuh"
1313

14-
#include <CUDA_graph_creator>
15-
#include <CUDA_module_map_doublet>
16-
#include <CUDA_module_map_triplet>
17-
#include <TTree_hits>
1814
#include <chrono>
1915

16+
#include <MMG/CUDA_graph_creator>
17+
#include <MMG/CUDA_module_map_doublet>
18+
#include <MMG/CUDA_module_map_triplet>
19+
#include <MMG/TTree_hits>
2020
#include <cub/block/block_merge_sort.cuh>
2121
#include <thrust/execution_policy.h>
2222
#include <thrust/functional.h>

Python/Examples/tests/root_file_hashes.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ test_root_clusters_writer[configKwConstructor]__clusters.root: e842df4fe04eefff3
7676
test_root_clusters_writer[kwargsConstructor]__clusters.root: e842df4fe04eefff3df5f32cd1026e93286be62b8040dc700a2aff557c56dec8
7777
test_gnn_metric_learning[gpu]__performance_finding_gnn.root: c17fb877bb165e28db0a2b99881763093e7fc9a707c045feb6a6a6b68e0dd660
7878
test_gnn_metric_learning[gpu]__ntuple_finding_gnn.root: 3f0fb36af55441994a154ea2a93978ba1930d4e87bf043f8ae9527e283bf1894
79-
test_gnn_module_map[gpu-torch]__ntuple_finding_gnn.root: ae0c828b57f4d7b7e608fa92175af418647aece75b7ac1946bf30eb8e617d046
79+
test_gnn_module_map[gpu-torch]__ntuple_finding_gnn.root: 4ba97c2ab6595e07886d69217819168d5b93520ea61286fe7b19b807440a1e63
8080
test_gnn_module_map[gpu-torch]__performance_finding_gnn.root: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
81-
test_gnn_module_map[gpu-onnx]__ntuple_finding_gnn.root: 664be95535722685effd783b148ed2cec61906aee20f5a531bedbd5253d2b101
81+
test_gnn_module_map[gpu-onnx]__ntuple_finding_gnn.root: d159b21aab3e05561023bd9c79e0ae45e37b467f2aab8f4f8ab4c6ace7dfe0ae
8282
test_gnn_module_map[gpu-onnx]__performance_finding_gnn.root: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
8383
test_ML_Ambiguity_Solver__performance_finding_ambiML.root: c17fb877bb165e28db0a2b99881763093e7fc9a707c045feb6a6a6b68e0dd660
8484
test_truth_tracking_kalman[generic-0.0]__trackstates_kf.root: 42a49abcef0277ca061350cc03c1ac9841e119055e2778662ec6a731e316ecd2

Python/Examples/tests/test_examples.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1160,7 +1160,9 @@ def test_gnn_module_map(tmp_path, assert_root_hash, backend, hardware):
11601160

11611161
# Dict of required files - used for checking and as kwargs
11621162
required_files = {
1163-
"moduleMapPath": str(ci_models / "module_map_odd_2k_events.1e-03.float"),
1163+
"moduleMapPath": str(
1164+
ci_models / "module_map_odd_2k_events.1e-03.float.v1_3_PATCH"
1165+
),
11641166
"gnnModel": str(ci_models / f"gnn_odd_module_map{model_ext}"),
11651167
}
11661168

cmake/ActsExternSources.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ set(ACTS_ODD_SOURCE
9191
mark_as_advanced(ACTS_ODD_SOURCE)
9292

9393
set(ACTS_MODULEMAPGRAPH_SOURCE
94-
"GIT_REPOSITORY;https://gitlab.cern.ch/gnn4itkteam/ModuleMapGraph;GIT_TAG;1.2.0"
94+
"GIT_REPOSITORY;https://gitlab.cern.ch/gnn4itkteam/ModuleMapGraph;GIT_TAG;1.4.0"
9595
CACHE STRING
9696
"Source to take ModuleMapGraph from"
9797
)

0 commit comments

Comments
 (0)