Skip to content

Commit

Permalink
build: Update traccc to v0.16.0
Browse files Browse the repository at this point in the history
This commit updates traccc to version 0.16.0 and, with it, detray to
v0.75.2.
  • Loading branch information
stephenswat committed Sep 23, 2024
1 parent cb124e8 commit 026f7d0
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 55 deletions.
8 changes: 6 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,10 @@ set_option_if(
ACTS_BUILD_PLUGIN_JSON
ACTS_BUILD_PLUGIN_TRACCC
)
set_option_if(
ACTS_BUILD_PLUGIN_ACTSVG
ACTS_BUILD_PLUGIN_TRACCC
)
set_option_if(
ACTS_BUILD_PLUGIN_HASHING
ACTS_BUILD_EXAMPLES_HASHING
Expand Down Expand Up @@ -237,8 +241,8 @@ set(_acts_root_version 6.20)
set(_acts_tbb_version 2020.1)
set(_acts_pythia8_version 8.309)
set(_acts_pybind11_version 2.13.1)
set(_acts_detray_version 0.72.1)
set(_acts_traccc_version 0.15.0)
set(_acts_detray_version 0.75.2)
set(_acts_traccc_version 0.16.0)
set(_acts_covfie_version 0.10.0)
set(_acts_vecmem_version 1.4.0)
set(_acts_algebraplugins_version 0.22.0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "ActsExamples/Traccc/DetrayStore.hpp"

#include <detray/navigation/navigator.hpp>
#include <detray/utils/inspectors.hpp>
#include <detray/test/utils/inspectors.hpp>

namespace ActsExamples {

Expand Down
5 changes: 3 additions & 2 deletions Examples/Python/src/Traccc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include <detray/propagator/actor_chain.hpp>
#include <detray/propagator/line_stepper.hpp>
#include <detray/propagator/propagator.hpp>
#include <detray/utils/inspectors.hpp>
#include <pybind11/pybind11.h>
#include <vecmem/memory/host_memory_resource.hpp>
#include <vecmem/memory/memory_resource.hpp>
Expand Down Expand Up @@ -72,7 +71,9 @@ void addTraccc(Context& ctx) {

// Navigation with inspection
using DetrayNavigator =
detray::navigator<DetrayHostDetector, DetrayInspector>;
detray::navigator<DetrayHostDetector,
detray::navigation::default_cache_size,
DetrayInspector>;
// Line stepper
using DetrayLineStepper =
detray::line_stepper<typename DetrayHostDetector::algebra_type>;
Expand Down
3 changes: 2 additions & 1 deletion Plugins/Detray/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ target_link_libraries(
detray::core
detray::core_array
detray::io
detray::utils
detray::detectors
detray::test_utils
vecmem::core
)

Expand Down
1 change: 1 addition & 0 deletions cmake/ActsConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ if(PluginDetray IN_LIST Acts_COMPONENTS)
find_dependency(vecmem @vecmem_VERSION@ CONFIG EXACT)
find_dependency(covfie @cofvie_VERSION@ CONFIG EXACT)
find_dependency(algebra-plugins @algebra-plugins_VERSION@ CONFIG EXACT)
find_dependency(actsvg @actsvg_VERSION@ CONFIG EXACT)
find_dependency(detray @detray_VERSION@ CONFIG EXACT)
endif()

Expand Down
4 changes: 2 additions & 2 deletions cmake/ActsExternSources.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ set(ACTS_COVFIE_SOURCE
mark_as_advanced(ACTS_COVFIE_SOURCE)

set(ACTS_DETRAY_SOURCE
"URL;https://github.com/acts-project/detray/archive/refs/tags/v${_acts_detray_version}.tar.gz;URL_HASH;SHA256=6cc8d34bc0d801338e9ab142c4a9884d19d9c02555dbb56972fab86b98d0f75b"
"URL;https://github.com/acts-project/detray/archive/refs/tags/v${_acts_detray_version}.tar.gz;URL_HASH;SHA256=249066c138eac4114032e8d558f3a05885140a809332a347c7667978dbff54ee"
CACHE STRING
"Source to take DETRAY from"
)
mark_as_advanced(ACTS_DETRAY_SOURCE)

set(ACTS_TRACCC_SOURCE
"URL;https://github.com/acts-project/traccc/archive/refs/tags/v${_acts_traccc_version}.tar.gz;URL_HASH;SHA256=1a9a1d0d2f6c4a7773eae3119b1e044fb52031ca49dfc88e6dc4ab8a11df167e"
"URL;https://github.com/acts-project/traccc/archive/refs/tags/v${_acts_traccc_version}.tar.gz;URL_HASH;SHA256=86e0ebe7364d3a2106301d50a89feef583470da53c9dae6d1430dcc6eda7dba9"
CACHE STRING
"Source to take TRACCC from"
)
Expand Down
17 changes: 16 additions & 1 deletion thirdparty/detray/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,31 @@ set(DETRAY_CUSTOM_SCALARTYPE
"Scalar type to use in the Detray code"
)

set(DETRAY_BUILD_TESTING
set(DETRAY_BUILD_TEST_UTILS
ON
CACHE BOOL
"Turn on the build of the Detray test utilities"
)
set(DETRAY_BUILD_UNITTESTS
OFF
CACHE BOOL
"Turn off the build of the Detray unit tests"
)
set(DETRAY_BUILD_INTEGRATIONTESTS
OFF
CACHE BOOL
"Turn off the build of the Detray integration tests"
)
set(DETRAY_BUILD_TUTORIALS
OFF
CACHE BOOL
"Turn off the build of the Detray tutorials"
)
set(DETRAY_BUILD_BENCHMARKS
OFF
CACHE BOOL
"Turn off the build of the Detray benchmarks"
)
set(DETRAY_EIGEN_PLUGIN
ON
CACHE BOOL
Expand Down
7 changes: 1 addition & 6 deletions thirdparty/traccc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,7 @@ message(STATUS "Building traccc as part of the Acts project")
set(TRACCC_VERSION "${_acts_traccc_version}")

# Declare where to get traccc from.
FetchContent_Declare(
traccc
${ACTS_TRACCC_SOURCE}
# Needed until https://github.com/acts-project/traccc/pull/682 and https://github.com/acts-project/traccc/pull/683 are deployed
PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/warnings.diff
)
FetchContent_Declare(traccc ${ACTS_TRACCC_SOURCE})

if(ACTS_CUSTOM_SCALARTYPE)
set(ACTS_TRACCC_SCALARTYPE ${ACTS_CUSTOM_SCALARTYPE})
Expand Down
40 changes: 0 additions & 40 deletions thirdparty/traccc/warnings.diff

This file was deleted.

0 comments on commit 026f7d0

Please sign in to comment.