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

build: update extern tags #628

Merged
merged 17 commits into from
Aug 1, 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
11 changes: 8 additions & 3 deletions cmake/traccc-config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ set( TRACCC_BUILD_KOKKOS @TRACCC_BUILD_KOKKOS@ )
set( TRACCC_BUILD_ALPAKA @TRACCC_BUILD_ALPAKA@ )
set( TRACCC_BUILD_EXAMPLES @TRACCC_BUILD_EXAMPLES@ )
set( TRACCC_USE_ROOT @TRACCC_USE_ROOT@ )
set( TRACCC_BUILD_IO @TRACCC_BUILD_IO@ )

# Set up some simple variables for using the package.
set( traccc_VERSION "@PROJECT_VERSION@" )
Expand All @@ -40,7 +41,9 @@ endif()
if( TRACCC_BUILD_FUTHARK )
find_dependency( Futhark )
endif()
find_dependency( Acts )
if ( TRACCC_BUILD_IO )
find_dependency( Acts )
endif()
stephenswat marked this conversation as resolved.
Show resolved Hide resolved
find_dependency( vecmem )
find_dependency( algebra-plugins )
find_dependency( detray )
Expand All @@ -52,8 +55,10 @@ if( TRACCC_BUILD_EXAMPLES )
endif()

# Set up the traccc::Thrust target.
set( TRACCC_THRUST_OPTIONS @TRACCC_THRUST_OPTIONS@ )
thrust_create_target( traccc::Thrust ${TRACCC_THRUST_OPTIONS} )
if ( NOT TARGET traccc::Thrust )
set( TRACCC_THRUST_OPTIONS @TRACCC_THRUST_OPTIONS@ )
thrust_create_target( traccc::Thrust ${TRACCC_THRUST_OPTIONS} )
endif()

# Include the file listing all the imported targets and options.
include( "${traccc_CMAKE_DIR}/traccc-config-targets.cmake" )
Expand Down
6 changes: 2 additions & 4 deletions core/include/traccc/finding/finding_algorithm.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,8 @@ finding_algorithm<stepper_t, navigator_t>::operator()(
// Apply interactor
typename interactor_type::state interactor_state;
interactor_type{}.update(
in_param, interactor_state,
static_cast<int>(detray::navigation::direction::e_forward), sf,
std::abs(
sf.cos_angle(ctx, in_param.dir(), in_param.bound_local())));
ctx, in_param, interactor_state,
static_cast<int>(detray::navigation::direction::e_forward), sf);

// Get barcode and measurements range on surface
const auto bcd = in_param.surface_link();
Expand Down
6 changes: 2 additions & 4 deletions core/include/traccc/utils/seed_generator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,8 @@ struct seed_generator {
typename interactor_type::state interactor_state;
interactor_state.do_multiple_scattering = false;
interactor_type{}.update(
bound_param, interactor_state,
static_cast<int>(detray::navigation::direction::e_backward), sf,
std::abs(sf.cos_angle(ctx, bound_param.dir(),
bound_param.bound_local())));
ctx, bound_param, interactor_state,
static_cast<int>(detray::navigation::direction::e_backward), sf);

for (std::size_t i = 0; i < e_bound_size; i++) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
// Project include(s).
#include "traccc/definitions/qualifiers.hpp"

// Thrust include(s)
#include <thrust/binary_search.h>

// System include(s)
#include <iterator>

namespace traccc::device {

/// Function evalulating the number of measurements to be iterated per thread
Expand Down Expand Up @@ -39,4 +45,4 @@ TRACCC_DEVICE inline void count_measurements(
} // namespace traccc::device

// Include the implementation.
#include "traccc/finding/device/impl/count_measurements.ipp"
#include "traccc/finding/device/impl/count_measurements.ipp"
5 changes: 4 additions & 1 deletion device/common/include/traccc/finding/device/find_tracks.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
#include "traccc/edm/measurement.hpp"
#include "traccc/edm/track_parameters.hpp"

// Thrust include(s)
#include <thrust/binary_search.h>

namespace traccc::device {

/// Function for combinatorial finding.
Expand Down Expand Up @@ -60,4 +63,4 @@ TRACCC_DEVICE inline void find_tracks(
} // namespace traccc::device

// Include the implementation.
#include "traccc/finding/device/impl/find_tracks.ipp"
#include "traccc/finding/device/impl/find_tracks.ipp"
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,8 @@ TRACCC_DEVICE inline void apply_interaction(
// Apply interactor
typename interactor_type::state interactor_state;
interactor_type{}.update(
bound_param, interactor_state,
static_cast<int>(detray::navigation::direction::e_forward), sf,
math::fabs(
sf.cos_angle(ctx, bound_param.dir(), bound_param.bound_local())));
ctx, bound_param, interactor_state,
static_cast<int>(detray::navigation::direction::e_forward), sf);
}

} // namespace traccc::device
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.69.1.tar.gz;URL_MD5;38a0f8e786ac6a61fabcd3a28d7bb2d6"
"URL;https://github.com/acts-project/detray/archive/refs/tags/v0.72.1.tar.gz;URL_MD5;342ab0bfba45c5764c8eef3842897c16"
CACHE STRING "Source for Detray, when built as part of this project" )

mark_as_advanced( TRACCC_DETRAY_SOURCE )
Expand Down
Loading