Skip to content

Commit 9597341

Browse files
Use clang-p2996 with c++26 and -freflection
1 parent 85d4143 commit 9597341

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

GPU/GPUTracking/Standalone/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ endif()
4747
# Set Build and Compiler settings
4848
set(ALIGPU_BUILD_TYPE "Standalone")
4949
add_definitions(-DGPUCA_STANDALONE)
50-
set(CMAKE_CXX_STANDARD 20)
50+
set(CMAKE_CXX_STANDARD 26)
5151
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
5252
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
5353

@@ -72,8 +72,8 @@ else()
7272
endif()
7373
string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra -Wshadow -Wno-unused-function -Wno-unused-parameter -Wno-unused-local-typedefs -Wno-unknown-pragmas -Wno-write-strings")
7474
string(APPEND CMAKE_SHARED_LINKER_FLAGS " -rdynamic -Wl,--no-undefined")
75-
if(CMAKE_CXX_COMPILER MATCHES "clang\\+\\+")
76-
string(APPEND CMAKE_CXX_FLAGS " -Wno-vla-cxx-extension")
75+
if(CMAKE_CXX_COMPILER MATCHES "clang")
76+
string(APPEND CMAKE_CXX_FLAGS " -Wno-vla-cxx-extension -freflection")
7777
endif()
7878

7979
# Find mandatory packages

GPU/GPUTracking/Standalone/cmake/config.cmake

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
# This is the configuration file for the standalone build
1313
# Its options do not affect the O2 build !!!!
1414

15-
set(ENABLE_CUDA AUTO)
16-
set(ENABLE_HIP AUTO)
17-
set(ENABLE_OPENCL AUTO)
15+
set(ENABLE_CUDA 0)
16+
set(ENABLE_HIP 0)
17+
set(ENABLE_OPENCL 0)
1818
set(GPUCA_CONFIG_VC 1)
1919
set(GPUCA_CONFIG_FMT 1)
2020
set(GPUCA_CONFIG_ROOT 1)
2121
set(GPUCA_CONFIG_ONNX 0)
22-
set(GPUCA_BUILD_EVENT_DISPLAY 1)
22+
set(GPUCA_BUILD_EVENT_DISPLAY 0)
2323
set(GPUCA_BUILD_EVENT_DISPLAY_FREETYPE 1)
2424
set(GPUCA_BUILD_EVENT_DISPLAY_VULKAN 1)
2525
set(GPUCA_BUILD_EVENT_DISPLAY_WAYLAND 1)
@@ -29,7 +29,7 @@ set(GPUCA_CONFIG_O2 1)
2929
set(GPUCA_BUILD_DEBUG 0)
3030
set(GPUCA_BUILD_DEBUG_SANITIZE 0)
3131
set(GPUCA_BUILD_DEBUG_HOSTONLY 0)
32-
set(GPUCA_DETERMINISTIC_MODE 0) # OFF / NO_FAST_MATH / OPTO2 / GPU / WHOLEO2
32+
set(GPUCA_DETERMINISTIC_MODE OFF) # OFF / NO_FAST_MATH / OPTO2 / GPU / WHOLEO2
3333
#set(GPUCA_CUDA_GCCBIN c++-14)
3434
#set(GPUCA_OPENCL_CLANGBIN clang-20)
3535
set(HIP_AMDGPUTARGET "default") # "gfx906;gfx908;gfx90a"
@@ -42,3 +42,7 @@ set(CUDA_COMPUTETARGET "default") # 86 89
4242
#set(GPUCA_CONFIG_WERROR 1)
4343
#add_definitions(-DGPUCA_GPU_DEBUG_PRINT)
4444
#set(GPUCA_OVERRIDE_PARAMETER_FILE "foo.csv")
45+
46+
set(GPUCA_CONFIG_COMPILER /usr/bin/clang)
47+
add_compile_options(--gcc-toolchain=/cvmfs/alice.cern.ch/el9-x86_64/Packages/GCC-Toolchain/v14.2.0-alice2-1)
48+
add_link_options(--gcc-toolchain=/cvmfs/alice.cern.ch/el9-x86_64/Packages/GCC-Toolchain/v14.2.0-alice2-1 -lstdc++ -lm)

0 commit comments

Comments
 (0)