diff --git a/CI/dependencies/download_models.sh b/CI/dependencies/download_models.sh index 592310b94fd..e270ad74126 100755 --- a/CI/dependencies/download_models.sh +++ b/CI/dependencies/download_models.sh @@ -32,5 +32,5 @@ download \ 1185060ce697bbc96c9dc32b85e5f0eb4db1f64a645c0fc4d2cb2731cb2ef3dc download \ - https://acts.web.cern.ch/ci/gnn/odd_module_map_v01.tar \ - 59f0457f0043bac8594e9f5a3310a709244de980a7b0c206d7d0d95f15455d73 + https://acts.web.cern.ch/ci/gnn/odd_module_map_v02.tar \ + 1954d20ec0d947476dda06a6982774a193a8ad15dca4dec621b53761f329d493 diff --git a/Examples/Scripts/Python/gnn_module_map_odd.py b/Examples/Scripts/Python/gnn_module_map_odd.py index 0681ce7d0f0..5dab4260d5c 100644 --- a/Examples/Scripts/Python/gnn_module_map_odd.py +++ b/Examples/Scripts/Python/gnn_module_map_odd.py @@ -237,7 +237,9 @@ def runGnnModuleMap( model_storage = os.environ.get("MODEL_STORAGE") assert model_storage is not None, "MODEL_STORAGE environment variable is not set" ci_models_odd = Path(model_storage) - moduleMapPath = str(ci_models_odd / "module_map_odd_2k_events.1e-03.float") + moduleMapPath = str( + ci_models_odd / "module_map_odd_2k_events.1e-03.float.v1_3_PATCH" + ) gnnModel = str(ci_models_odd / "gnn_odd_module_map.pt") outputDir = Path.cwd() events = 100 diff --git a/Plugins/Gnn/include/ActsPlugins/Gnn/detail/ModuleMapUtils.cuh b/Plugins/Gnn/include/ActsPlugins/Gnn/detail/ModuleMapUtils.cuh index a95dcc2a4d6..e7d90bb9cbb 100644 --- a/Plugins/Gnn/include/ActsPlugins/Gnn/detail/ModuleMapUtils.cuh +++ b/Plugins/Gnn/include/ActsPlugins/Gnn/detail/ModuleMapUtils.cuh @@ -8,11 +8,11 @@ #pragma once -#include #include #include #include +#include #include #define USE_LAUNCH_BOUNDS diff --git a/Plugins/Gnn/src/ModuleMapCuda.cu b/Plugins/Gnn/src/ModuleMapCuda.cu index e091e8b78b7..18e5a0ad709 100644 --- a/Plugins/Gnn/src/ModuleMapCuda.cu +++ b/Plugins/Gnn/src/ModuleMapCuda.cu @@ -11,12 +11,12 @@ #include "ActsPlugins/Gnn/detail/CudaUtils.hpp" #include "ActsPlugins/Gnn/detail/ModuleMapUtils.cuh" -#include -#include -#include -#include #include +#include +#include +#include +#include #include #include #include diff --git a/Python/Examples/tests/root_file_hashes.txt b/Python/Examples/tests/root_file_hashes.txt index 6ebdf7314fd..71806bb201e 100644 --- a/Python/Examples/tests/root_file_hashes.txt +++ b/Python/Examples/tests/root_file_hashes.txt @@ -76,9 +76,9 @@ test_root_clusters_writer[configKwConstructor]__clusters.root: e842df4fe04eefff3 test_root_clusters_writer[kwargsConstructor]__clusters.root: e842df4fe04eefff3df5f32cd1026e93286be62b8040dc700a2aff557c56dec8 test_gnn_metric_learning[gpu]__performance_finding_gnn.root: c17fb877bb165e28db0a2b99881763093e7fc9a707c045feb6a6a6b68e0dd660 test_gnn_metric_learning[gpu]__ntuple_finding_gnn.root: 3f0fb36af55441994a154ea2a93978ba1930d4e87bf043f8ae9527e283bf1894 -test_gnn_module_map[gpu-torch]__ntuple_finding_gnn.root: ae0c828b57f4d7b7e608fa92175af418647aece75b7ac1946bf30eb8e617d046 +test_gnn_module_map[gpu-torch]__ntuple_finding_gnn.root: 4ba97c2ab6595e07886d69217819168d5b93520ea61286fe7b19b807440a1e63 test_gnn_module_map[gpu-torch]__performance_finding_gnn.root: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 -test_gnn_module_map[gpu-onnx]__ntuple_finding_gnn.root: 664be95535722685effd783b148ed2cec61906aee20f5a531bedbd5253d2b101 +test_gnn_module_map[gpu-onnx]__ntuple_finding_gnn.root: d159b21aab3e05561023bd9c79e0ae45e37b467f2aab8f4f8ab4c6ace7dfe0ae test_gnn_module_map[gpu-onnx]__performance_finding_gnn.root: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 test_ML_Ambiguity_Solver__performance_finding_ambiML.root: c17fb877bb165e28db0a2b99881763093e7fc9a707c045feb6a6a6b68e0dd660 test_truth_tracking_kalman[generic-0.0]__trackstates_kf.root: 42a49abcef0277ca061350cc03c1ac9841e119055e2778662ec6a731e316ecd2 diff --git a/Python/Examples/tests/test_examples.py b/Python/Examples/tests/test_examples.py index ad19cf5e1a8..61d24479724 100644 --- a/Python/Examples/tests/test_examples.py +++ b/Python/Examples/tests/test_examples.py @@ -1160,7 +1160,9 @@ def test_gnn_module_map(tmp_path, assert_root_hash, backend, hardware): # Dict of required files - used for checking and as kwargs required_files = { - "moduleMapPath": str(ci_models / "module_map_odd_2k_events.1e-03.float"), + "moduleMapPath": str( + ci_models / "module_map_odd_2k_events.1e-03.float.v1_3_PATCH" + ), "gnnModel": str(ci_models / f"gnn_odd_module_map{model_ext}"), } diff --git a/cmake/ActsExternSources.cmake b/cmake/ActsExternSources.cmake index 79449190e8e..ecc803a2719 100644 --- a/cmake/ActsExternSources.cmake +++ b/cmake/ActsExternSources.cmake @@ -91,7 +91,7 @@ set(ACTS_ODD_SOURCE mark_as_advanced(ACTS_ODD_SOURCE) set(ACTS_MODULEMAPGRAPH_SOURCE - "GIT_REPOSITORY;https://gitlab.cern.ch/gnn4itkteam/ModuleMapGraph;GIT_TAG;1.2.0" + "GIT_REPOSITORY;https://gitlab.cern.ch/gnn4itkteam/ModuleMapGraph;GIT_TAG;1.4.0" CACHE STRING "Source to take ModuleMapGraph from" )