Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update detray to v0.78.0 #723

Merged
merged 2 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
5 changes: 0 additions & 5 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ jobs:
cxx_standard: "20"
options:
run_tests: true
- name: HIP
container: ghcr.io/acts-project/ubuntu2204_rocm_clang_cxx20:56
cxx_standard: "20"
options: -DTRACCC_BUILD_HIP=TRUE -DTRACCC_SETUP_ROCTHRUST=TRUE
run_tests: false
- name: CUDA
container: ghcr.io/acts-project/ubuntu2404_cuda:56
cxx_standard: "20"
Expand Down
6 changes: 3 additions & 3 deletions core/include/traccc/finding/finding_algorithm.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ class finding_algorithm

/// Actor chain for propagate to the next surface and its propagator type
using actor_type =
detray::actor_chain<std::tuple, detray::pathlimit_aborter, transporter,
interaction_register<interactor>, interactor,
ckf_aborter>;
detray::actor_chain<detray::tuple, detray::pathlimit_aborter,
transporter, interaction_register<interactor>,
interactor, ckf_aborter>;

using propagator_type =
detray::propagator<stepper_t, navigator_t, actor_type>;
Expand Down
2 changes: 1 addition & 1 deletion extern/detray/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ message( STATUS "Building Detray as part of the TRACCC project" )

# Declare where to get Detray from.
set( TRACCC_DETRAY_SOURCE
"URL;https://github.com/acts-project/detray/archive/refs/tags/v0.76.1.tar.gz;URL_MD5;4cfeab557e9fef8aa4e02c7839053daf"
"URL;https://github.com/acts-project/detray/archive/refs/tags/v0.78.0.tar.gz;URL_MD5;9ab5782683f14041e2ec528b5f2d4cb0"
CACHE STRING "Source for Detray, when built as part of this project" )

mark_as_advanced( TRACCC_DETRAY_SOURCE )
Expand Down
4 changes: 2 additions & 2 deletions simulation/include/traccc/simulation/measurement_smearer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ struct measurement_smearer {
io::csv::measurement& iomeas) {

// Line detector
if constexpr (std::is_same_v<typename mask_t::local_frame_type,
if constexpr (std::is_same_v<typename mask_t::local_frame,
detray::line2D<traccc::default_algebra>>) {
iomeas.local_key = 2;
}
Expand Down Expand Up @@ -94,7 +94,7 @@ struct measurement_smearer {
matrix_type<1u, 1u> meas = proj * bound_params.vector();

if constexpr (std::is_same_v<
typename mask_t::local_frame_type,
typename mask_t::local_frame,
detray::line2D<traccc::default_algebra>>) {
iomeas.local0 = static_cast<float>(
std::max(std::abs(matrix_operator().element(meas, 0u, 0u)) +
Expand Down
1 change: 0 additions & 1 deletion tests/io/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ traccc_add_test( io
"test_binary.cpp"
"test_csv.cpp"
"test_mapper.cpp"
"test_event_map.cpp"
LINK_LIBRARIES GTest::gtest_main traccc_tests_common
traccc::core traccc::io )

Expand Down
34 changes: 0 additions & 34 deletions tests/io/test_event_map.cpp

This file was deleted.

Loading