Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CI/dependencies/download_models.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Examples/Scripts/Python/gnn_module_map_odd.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#pragma once

#include <CUDA_graph_creator>
#include <MMG/CUDA_graph_creator>
#include <algorithm>
#include <iostream>
#include <vector>
Expand Down
8 changes: 4 additions & 4 deletions Plugins/Gnn/src/ModuleMapCuda.cu
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
#include "ActsPlugins/Gnn/detail/CudaUtils.hpp"
#include "ActsPlugins/Gnn/detail/ModuleMapUtils.cuh"

#include <CUDA_graph_creator>
#include <CUDA_module_map_doublet>
#include <CUDA_module_map_triplet>
#include <TTree_hits>
#include <MMG/CUDA_graph_creator>
#include <MMG/CUDA_module_map_doublet>
#include <MMG/CUDA_module_map_triplet>
#include <MMG/TTree_hits>
#include <chrono>

#include <cub/block/block_merge_sort.cuh>
Expand Down
2 changes: 1 addition & 1 deletion Python/Examples/tests/test_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -1158,7 +1158,7 @@ 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}"),
}

Expand Down
2 changes: 1 addition & 1 deletion cmake/ActsExternSources.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
Loading