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.

Sign up for GitHub

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

ref: Update to detray version 0.79.0 and algebra-plugins version 0.25.0 #737

Merged
merged 2 commits into from
Oct 15, 2024
Merged

ref: Update to detray version 0.79.0 and algebra-plugins version 0.25.0 #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9af8e2a
Update to detray version 0.79.0 and algebra-plugins version 0.25.0
niermann999 Oct 14, 2024
0aaeca7
Merge branch 'main' into ref-update-detray
stephenswat Oct 15, 2024
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
2 changes: 1 addition & 1 deletion extern/algebra-plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ message( STATUS "Building Algebra Plugins as part of the TRACCC project" )

# Declare where to get Algebra Plugins from.
set( TRACCC_ALGEBRA_PLUGINS_SOURCE
"URL;https://github.com/acts-project/algebra-plugins/archive/refs/tags/v0.24.0.tar.gz;URL_MD5;e9b4c531c61d9988aae6cab95f257948"
"URL;https://github.com/acts-project/algebra-plugins/archive/refs/tags/v0.25.0.tar.gz;URL_MD5;8201744f8b2a8ff7fbcf21bd1b4549b9"
CACHE STRING "Source for Algebra Plugins, when built as part of this project" )

mark_as_advanced( TRACCC_ALGEBRA_PLUGINS_SOURCE )
Expand Down
10 changes: 7 additions & 3 deletions extern/detray/CMakeLists.txt
View file
Open in desktop
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.78.0.tar.gz;URL_MD5;9ab5782683f14041e2ec528b5f2d4cb0"
"URL;https://github.com/acts-project/detray/archive/refs/tags/v0.79.0.tar.gz;URL_MD5;b2eb38b7a58c55f41aa5e295c21e1aeb"
CACHE STRING "Source for Detray, when built as part of this project" )

mark_as_advanced( TRACCC_DETRAY_SOURCE )
Expand All @@ -43,12 +43,14 @@ set( DETRAY_BUILD_INTEGRATIONTESTS FALSE CACHE BOOL
"Turn off the build of the Detray integration tests" )
set( DETRAY_BUILD_BENCHMARKS FALSE CACHE BOOL
"Turn off the build of the Detray benchmarks" )
set( DETRAY_BUILD_CLI_TOOLS FALSE CACHE BOOL
"Turn off the build of the Detray CLI tools" )
set( DETRAY_BUILD_TUTORIALS FALSE CACHE BOOL
"Turn off the build of the Detray tutorials" )
set( DETRAY_EIGEN_PLUGIN TRUE CACHE BOOL
"Turn on the build of the Detray Eigen code" )
set( DETRAY_VC_PLUGIN TRUE CACHE BOOL
"Turn on the build of the Detray Vc code" )
set( DETRAY_VC_AOS_PLUGIN TRUE CACHE BOOL
"Turn on the build of the Detray Vc AoS code" )

# Needed for 'performance', 'simulation', 'examples', 'tests' and 'benchmarks'
if( TRACCC_BUILD_IO OR TRACCC_BUILD_EXAMPLES OR (BUILD_TESTING AND TRACCC_BUILD_TESTING) OR TRACCC_BUILD_BENCHMARKS )
Expand All @@ -58,6 +60,8 @@ else()
set( DETRAY_BUILD_TEST_UTILS FALSE CACHE BOOL
"Turn off the build of the Detray tests utilities" )
endif()
set( DETRAY_BUILD_VALIDATION_TOOLS FALSE CACHE BOOL
"Turn off the build of the Detray validation tools" )

set( DETRAY_SETUP_VECMEM FALSE CACHE BOOL
"Do not set up VecMem as part of Detray" )
Expand Down
4 changes: 2 additions & 2 deletions plugins/algebra/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ if( ALGEBRA_PLUGINS_INCLUDE_SMATRIX )
target_link_libraries( traccc_algebra INTERFACE traccc::smatrix )
endif()

# Make use of algebra::vc_vc, if it is available.
# Make use of algebra::vc_aos, if it is available.
if( ALGEBRA_PLUGINS_INCLUDE_VC )
add_subdirectory( vc )
target_link_libraries( traccc_algebra INTERFACE traccc::vc )
target_link_libraries( traccc_algebra INTERFACE traccc::vc_aos )
endif()
12 changes: 6 additions & 6 deletions plugins/algebra/vc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# TRACCC library, part of the ACTS project (R&D line)
#
# (c) 2021-2022 CERN for the benefit of the ACTS project
# (c) 2021-2024 CERN for the benefit of the ACTS project
#
# Mozilla Public License Version 2.0

# Set up the "build" of the traccc::vc library.
traccc_add_library( traccc_vc vc TYPE INTERFACE
# Set up the "build" of the traccc::vc_aos library.
traccc_add_library( traccc_vc_aos vc_aos TYPE INTERFACE
"include/traccc/plugins/algebra/vc_definitions.hpp" )
target_link_libraries( traccc_vc
INTERFACE algebra::vc_vc detray::algebra_vc vecmem::core )
target_compile_definitions( traccc_vc
target_link_libraries( traccc_vc_aos
INTERFACE algebra::vc_cmath detray::algebra_vc_aos vecmem::core )
target_compile_definitions( traccc_vc_aos
INTERFACE TRACCC_CUSTOM_SCALARTYPE=${TRACCC_CUSTOM_SCALARTYPE} )
Loading