Skip to content

Commit 5fce862

Browse files
committed
Update NVIDIA CCCL to v2.7.0
This commit updates NVIDIA CCCL to version 2.7.0 and starts following the official repository rather than my fork. In order to make this work, I had to incorporate a temporary workaround for intel/llvm#15544 until we start using a release with intel/llvm#15443. Closes acts-project#660.
1 parent 56a344e commit 5fce862

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

device/common/include/traccc/finding/device/impl/find_tracks.ipp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@
77

88
#pragma once
99

10+
// HACK: Fix for intel/llvm#15544
11+
// As of Intel LLVM 2025.0, enabling an AMD SYCL target inadvertently sets the
12+
// `__CUDA_ARCH__` preprocessor definition which breaks all sorts of internal
13+
// logic in Thrust. Thus, we very selectively undefine the `__CUDA_ARCH__`
14+
// definition when we are are compiling SYCL code using the Intel LLVM
15+
// compiler. This can be removed when intel/llvm#15443 makes it into a OneAPI
16+
// release.
17+
#if defined(__INTEL_LLVM_COMPILER) && defined(SYCL_LANGUAGE_VERSION)
18+
#undef __CUDA_ARCH__
19+
#endif
20+
1021
// Project include(s).
1122
#include "traccc/fitting/kalman_filter/gain_matrix_updater.hpp"
1223

extern/cccl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ message( STATUS "Building CCCL as part of the TRACCC project" )
1313

1414
# Declare where to get Thrust from.
1515
set( TRACCC_CCCL_SOURCE
16-
"GIT_REPOSITORY;https://github.com/stephenswat/cccl.git;GIT_TAG;build/allow_installing_when_downstream"
16+
"URL;https://github.com/NVIDIA/cccl/archive/refs/tags/v2.7.0.tar.gz;URL_MD5;83e431ebcb0a5c055fbd927754bec951"
1717
CACHE STRING "Source for CCCL, when built as part of this project" )
1818
mark_as_advanced( TRACCC_CCCL_SOURCE )
1919
# Note that we must not use SYSTEM here. Otherwise nvcc would pick up Thrust

0 commit comments

Comments
 (0)