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

Externals Update, main branch (2024.12.03.) #792

Merged
merged 1 commit into from
Dec 3, 2024
Merged

Externals Update, main branch (2024.12.03.) #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 0 additions & 26 deletions extern/CMakeLists.txt
View file
Open in desktop

This file was deleted.

18 changes: 2 additions & 16 deletions extern/acts/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@
# Mozilla Public License Version 2.0

# CMake include(s).
cmake_minimum_required( VERSION 3.11 )
cmake_minimum_required( VERSION 3.25 )
include( FetchContent )

# Silence FetchContent warnings with CMake >=3.24.
if( POLICY CMP0135 )
cmake_policy( SET CMP0135 NEW )
endif()

# Tell the user what's happening.
message( STATUS "Building Acts as part of the TRACCC project" )

Expand All @@ -21,16 +16,7 @@ set( TRACCC_ACTS_SOURCE
"URL;https://github.com/acts-project/acts/archive/refs/tags/v38.0.0.tar.gz;URL_MD5;295c73b1069e571af92e6d853a069e65"
CACHE STRING "Source for Acts, when built as part of this project" )
mark_as_advanced( TRACCC_ACTS_SOURCE )

# Mark the import as a system library on modern CMake versions
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.25.0)
set(TRACCC_ACTS_SOURCE_FULL "${TRACCC_ACTS_SOURCE};SYSTEM")
else()
set(TRACCC_ACTS_SOURCE_FULL "${TRACCC_ACTS_SOURCE}")
endif()
mark_as_advanced( TRACCC_ACTS_SOURCE_FULL )

FetchContent_Declare( Acts ${TRACCC_ACTS_SOURCE_FULL} )
FetchContent_Declare( Acts SYSTEM ${TRACCC_ACTS_SOURCE} )

# Options used in the build of Acts.
set( ACTS_SETUP_EIGEN3 FALSE CACHE BOOL
Expand Down
20 changes: 3 additions & 17 deletions extern/algebra-plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,18 @@
# Mozilla Public License Version 2.0

# CMake include(s).
cmake_minimum_required( VERSION 3.14 )
cmake_minimum_required( VERSION 3.25 )
include( FetchContent )

# Silence FetchContent warnings with CMake >=3.24.
if( POLICY CMP0135 )
cmake_policy( SET CMP0135 NEW )
endif()

# Tell the user what's happening.
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.25.0.tar.gz;URL_MD5;8201744f8b2a8ff7fbcf21bd1b4549b9"
"URL;https://github.com/krasznaa/algebra-plugins/archive/refs/tags/v0.25.1.tar.gz;URL_MD5;fa75a55330ad37ec812842fd7a07eb15"
CACHE STRING "Source for Algebra Plugins, when built as part of this project" )

mark_as_advanced( TRACCC_ALGEBRA_PLUGINS_SOURCE )
FetchContent_Declare( AlgebraPlugins ${TRACCC_ALGEBRA_PLUGINS_SOURCE} )
FetchContent_Declare( AlgebraPlugins SYSTEM ${TRACCC_ALGEBRA_PLUGINS_SOURCE} )

# Options used in the build of Algebra Plugins.
set( ALGEBRA_PLUGINS_BUILD_TESTING FALSE CACHE BOOL
Expand All @@ -41,13 +35,5 @@ set( ALGEBRA_PLUGINS_SETUP_GOOGLETEST FALSE CACHE BOOL
set( ALGEBRA_PLUGINS_SETUP_BENCHMARK FALSE CACHE BOOL
"Do not set up GoogleTest in Algebra Plugins" )

# Disable a pesky warning coming from the Vc build.
include( CheckCXXCompilerFlag )
check_cxx_compiler_flag( "-Wno-deprecated-enum-enum-conversion"
TRACCC_HAS_NO_DEPRECATED_ENUM_ENUM_CONVERSION )
if( TRACCC_HAS_NO_DEPRECATED_ENUM_ENUM_CONVERSION )
traccc_add_flag( CMAKE_CXX_FLAGS "-Wno-deprecated-enum-enum-conversion" )
endif()

# Get it into the current directory.
FetchContent_MakeAvailable( AlgebraPlugins )
27 changes: 5 additions & 22 deletions extern/alpaka/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
# TRACCC library, part of the ACTS project (R&D line)
#
# (c) 2022 CERN for the benefit of the ACTS project
# (c) 2022-2024 CERN for the benefit of the ACTS project
#
# Mozilla Public License Version 2.0

# CMake include(s).
cmake_minimum_required( VERSION 3.16 )
cmake_minimum_required( VERSION 3.25 )
include( FetchContent )

# Silence FetchContent warnings with CMake >=3.24.
if( POLICY CMP0135 )
cmake_policy( SET CMP0135 NEW )
endif()

# Tell the user what's happening.
message( STATUS "Building Alpaka as part of the TRACCC project" )

Expand All @@ -21,22 +16,10 @@ set( TRACCC_ALPAKA_SOURCE
"URL;https://github.com/alpaka-group/alpaka/archive/refs/tags/1.2.0.tar.gz;URL_MD5;0e2dcf4ddf7987532835d7b2b3680843"
CACHE STRING "Source for Alpaka, when built as part of this project" )
mark_as_advanced( TRACCC_ALPAKA_SOURCE )
FetchContent_Declare( Alpaka ${TRACCC_ALPAKA_SOURCE} )
FetchContent_Declare( Alpaka SYSTEM ${TRACCC_ALPAKA_SOURCE} )

#Turn off build testing
if( DEFINED CACHE{BUILD_TESTING} )
set( _buildTestingValue ${BUILD_TESTING} )
endif()
set( BUILD_TESTING FALSE CACHE INTERNAL "Forceful setting of BUILD_TESTING" )
# Turn off build testing.
set( BUILD_TESTING FALSE )

# Get it into the current directory.
FetchContent_MakeAvailable( Alpaka )

# Reset the BUILD_TESTING variable.
if( DEFINED _buildTestingValue )
set( BUILD_TESTING ${_buildTestingValue} CACHE BOOL "Turn tests on/off"
FORCE )
unset( _buildTestingValue )
else()
unset( BUILD_TESTING CACHE )
endif()
22 changes: 5 additions & 17 deletions extern/benchmark/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@
# Mozilla Public License Version 2.0

# CMake include(s).
cmake_minimum_required(VERSION 3.11)
cmake_minimum_required(VERSION 3.25)
include(FetchContent)

# Silence FetchContent warnings with CMake >=3.24.
if( POLICY CMP0135 )
cmake_policy( SET CMP0135 NEW )
endif()

# Tell the user what's happening.
message(STATUS "Building Google Benchmark as part of the TRACCC project")

Expand All @@ -21,16 +16,7 @@ set(TRACCC_BENCHMARK_SOURCE
"URL;https://github.com/google/benchmark/archive/refs/tags/v1.8.3.tar.gz;URL_MD5;7b93dd03670665684f1b2e9b70ad17fe"
CACHE STRING "Source for Google Benchmark, when built as part of this project")
mark_as_advanced(TRACCC_BENCHMARK_SOURCE)

# Mark the import as a system library on modern CMake versions
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.25.0)
set(TRACCC_BENCHMARK_SOURCE_FULL "${TRACCC_BENCHMARK_SOURCE};SYSTEM")
else()
set(TRACCC_BENCHMARK_SOURCE_FULL "${TRACCC_BENCHMARK_SOURCE}")
endif()
mark_as_advanced( TRACCC_BENCHMARK_SOURCE_FULL )

FetchContent_Declare(Benchmark ${TRACCC_BENCHMARK_SOURCE_FULL})
FetchContent_Declare(Benchmark SYSTEM ${TRACCC_BENCHMARK_SOURCE})

# Options used in the build of Google Benchmark.
set(BUILD_SHARED_LIBS FALSE)
Expand All @@ -43,4 +29,6 @@ FetchContent_MakeAvailable(Benchmark)

# Set up an alias for the Google Benchmark target with the same name that it
# has when we find it pre-installed.
add_library(benchmark::benchmark ALIAS benchmark)
if( NOT TARGET benchmark::benchmark )
add_library(benchmark::benchmark ALIAS benchmark)
endif()
9 changes: 3 additions & 6 deletions extern/cccl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@
# Mozilla Public License Version 2.0

# CMake include(s).
cmake_minimum_required( VERSION 3.14 )
cmake_minimum_required( VERSION 3.25 )
include( FetchContent )

# Silence FetchContent warnings with CMake >=3.24.
if( POLICY CMP0135 )
cmake_policy( SET CMP0135 NEW )
endif()

# Tell the user what's happening.
message( STATUS "Building CCCL as part of the TRACCC project" )

Expand All @@ -21,6 +16,8 @@ set( TRACCC_CCCL_SOURCE
"GIT_REPOSITORY;https://github.com/stephenswat/cccl.git;GIT_TAG;build/allow_installing_when_downstream"
CACHE STRING "Source for CCCL, when built as part of this project" )
mark_as_advanced( TRACCC_CCCL_SOURCE )
# Note that we must not use SYSTEM here. Otherwise nvcc would pick up Thrust
# from its own installation, and not from the version that we are downloading.
FetchContent_Declare( CCCL ${TRACCC_CCCL_SOURCE} )

# There are a few things to configure here... May not all be necessary but
Expand Down
23 changes: 4 additions & 19 deletions extern/covfie/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,22 @@
# TRACCC library, part of the ACTS project (R&D line)
#
# (c) 2023 CERN for the benefit of the ACTS project
# (c) 2023-2024 CERN for the benefit of the ACTS project
#
# Mozilla Public License Version 2.0

# CMake include(s).
cmake_minimum_required( VERSION 3.14 )
cmake_minimum_required( VERSION 3.25 )
include( FetchContent )

# Silence FetchContent warnings with CMake >=3.24.
if( POLICY CMP0135 )
cmake_policy( SET CMP0135 NEW )
endif()

# Tell the user what's happening.
message( STATUS "Fetching covfie as part of the traccc project" )

# Declare where to get covfie from.
set( TRACCC_COVFIE_SOURCE
"URL;https://github.com/acts-project/covfie/archive/refs/tags/v0.8.1.tar.gz;URL_MD5;0b4dc9624533d1ed4ea7a763da47f07e"
"URL;https://github.com/acts-project/covfie/archive/refs/tags/v0.11.0.tar.gz;URL_MD5;9f41c9308e7801ac6319c470a1ec4212"
CACHE STRING "Source for covfie, when built as part of this project" )
mark_as_advanced( TRACCC_COVFIE_SOURCE )

# Mark the import as a system library on modern CMake versions
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.25.0)
set(TRACCC_COVFIE_SOURCE_FULL "${TRACCC_COVFIE_SOURCE};SYSTEM")
else()
set(TRACCC_COVFIE_SOURCE_FULL "${TRACCC_COVFIE_SOURCE}")
endif()
mark_as_advanced( TRACCC_COVFIE_SOURCE_FULL )

FetchContent_Declare( covfie ${TRACCC_COVFIE_SOURCE_FULL} )
FetchContent_Declare( covfie SYSTEM ${TRACCC_COVFIE_SOURCE} )

# Options used for covfie.
set( COVFIE_BUILD_EXAMPLES OFF CACHE BOOL "Build covfie examples")
Expand All @@ -40,7 +26,6 @@ set( COVFIE_BUILD_BENCHMARKS OFF CACHE BOOL "Build covfie benchmarks")
set( COVFIE_PLATFORM_CPU ON CACHE BOOL "Enable covfie CPU platform")
set( COVFIE_PLATFORM_CUDA ${TRACCC_BUILD_CUDA} CACHE BOOL "Enable covfie CUDA platform")

set( COVFIE_REQUIRE_CXX20 OFF CACHE BOOL "Enable covfie C++20 requirement")
set( COVFIE_QUIET ON CACHE BOOL "Quiet covfie feature warnings")

# Get it into the current directory.
Expand Down
31 changes: 5 additions & 26 deletions extern/detray/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,18 @@
# Mozilla Public License Version 2.0

# CMake include(s).
cmake_minimum_required( VERSION 3.14 )
cmake_minimum_required( VERSION 3.25 )
include( FetchContent )

# Silence FetchContent warnings with CMake >=3.24.
if( POLICY CMP0135 )
cmake_policy( SET CMP0135 NEW )
endif()

# Tell the user what's happening.
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.82.0.tar.gz;URL_MD5;09d777ce126c547f5c3d4ec509f9a0c0"
"URL;https://github.com/acts-project/detray/archive/refs/tags/v0.83.0.tar.gz;URL_MD5;99542ac2b8b4235678a16f3c4fb25382"
CACHE STRING "Source for Detray, when built as part of this project" )

mark_as_advanced( TRACCC_DETRAY_SOURCE )

# Mark the import as a system library on modern CMake versions
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.25.0)
set(TRACCC_DETRAY_SOURCE_FULL "${TRACCC_DETRAY_SOURCE};SYSTEM")
else()
set(TRACCC_DETRAY_SOURCE_FULL "${TRACCC_DETRAY_SOURCE}")
endif()
mark_as_advanced( TRACCC_DETRAY_SOURCE_FULL )

FetchContent_Declare( Detray ${TRACCC_DETRAY_SOURCE_FULL} )
FetchContent_Declare( Detray SYSTEM ${TRACCC_DETRAY_SOURCE} )

# Options used in the build of Detray.
set( DETRAY_CUSTOM_SCALARTYPE "float" CACHE STRING
Expand All @@ -50,14 +35,8 @@ set( DETRAY_BUILD_TUTORIALS FALSE CACHE BOOL
set( DETRAY_EIGEN_PLUGIN TRUE CACHE BOOL
"Turn on the build of the Detray Eigen 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 )
set( DETRAY_BUILD_TEST_UTILS TRUE CACHE BOOL
"Turn on the build of the Detray tests utilities if needed" )
else()
set( DETRAY_BUILD_TEST_UTILS FALSE CACHE BOOL
"Turn off the build of the Detray tests utilities" )
endif()
set( DETRAY_BUILD_TEST_UTILS TRUE CACHE BOOL
"Turn on the build of the Detray tests utilities, needed in this project" )
set( DETRAY_BUILD_VALIDATION_TOOLS FALSE CACHE BOOL
"Turn off the build of the Detray validation tools" )

Expand Down
16 changes: 3 additions & 13 deletions extern/dfelibs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +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

# CMake include(s).
cmake_minimum_required( VERSION 3.11 )
cmake_minimum_required( VERSION 3.25 )
include( FetchContent )

# Silence FetchContent warnings with CMake >=3.24.
if( POLICY CMP0135 )
cmake_policy( SET CMP0135 NEW )
endif()

# Tell the user what's happening.
message( STATUS "Building dfelibs as part of the TRACCC project" )

Expand All @@ -21,7 +16,7 @@ set( TRACCC_DFELIBS_SOURCE
"URL;https://github.com/acts-project/dfelibs/archive/refs/tags/v20211029.tar.gz;URL_MD5;87fb09c5a11b98250f5e266e9cd501ea"
CACHE STRING "Source for dfelibs, when built as part of this project" )
mark_as_advanced( TRACCC_DFELIBS_SOURCE )
FetchContent_Declare( dfelibs ${TRACCC_DFELIBS_SOURCE} )
FetchContent_Declare( dfelibs SYSTEM ${TRACCC_DFELIBS_SOURCE} )

# Options used in the build of dfelibs.
set( dfelibs_BUILD_EXAMPLES FALSE CACHE BOOL
Expand All @@ -33,8 +28,3 @@ set( dfelibs_ENABLE_INSTALL TRUE CACHE BOOL

# Get it into the current directory.
FetchContent_MakeAvailable( dfelibs )

get_target_property( _incDirs dfelibs INTERFACE_INCLUDE_DIRECTORIES )
target_include_directories( dfelibs
SYSTEM INTERFACE ${_incDirs} )
unset( _incDirs )
16 changes: 2 additions & 14 deletions extern/dpl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@
# Mozilla Public License Version 2.0

# CMake include(s).
cmake_minimum_required( VERSION 3.14 )
cmake_minimum_required( VERSION 3.25 )
include( FetchContent )

# Silence FetchContent warnings with CMake >=3.24.
if( POLICY CMP0135 )
cmake_policy( SET CMP0135 NEW )
endif()

# Tell the user what's happening.
message( STATUS "Building oneDPL as part of the TRACCC project" )

Expand All @@ -21,17 +16,10 @@ set( TRACCC_DPL_SOURCE
"URL;https://github.com/oneapi-src/oneDPL/archive/refs/tags/oneDPL-2022.6.0-rc1.tar.gz;URL_MD5;f52a2ed5c9e4cdb3c65c2465b50abecf"
CACHE STRING "Source for DPL, when built as part of this project" )
mark_as_advanced( TRACCC_DPL_SOURCE )
FetchContent_Declare( DPL ${TRACCC_DPL_SOURCE} )
FetchContent_Declare( DPL SYSTEM ${TRACCC_DPL_SOURCE} )

# Set the default oneDPL threading backend.
set( ONEDPL_BACKEND "dpcpp" CACHE STRING "oneDPL threading backend" )

# Get it into the current directory.
FetchContent_MakeAvailable( DPL )

# Treat the oneDPL headers as "system headers", to avoid getting warnings from
# them.
get_target_property( _incDirs oneDPL INTERFACE_INCLUDE_DIRECTORIES )
target_include_directories( oneDPL
SYSTEM INTERFACE ${_incDirs} )
unset( _incDirs )
Loading
Loading