Skip to content

Commit

Permalink
remove clang -frelaxed-template-template-args
Browse files Browse the repository at this point in the history
remove clang workaround
  • Loading branch information
psychocoderHPC committed Sep 23, 2024
1 parent 351935e commit 4dc8da6
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions cmake/alpakaCommon.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,6 @@ else()
endif()
endif()

# C++17 relaxed template template argument matching is disabled by default until Clang 19
# https://github.com/llvm/llvm-project/commit/b86e0992bfa6
# https://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#150
# for example, is required to create alpaka::EnabledAccTags
# the feature is implemented since Clang 4
alpaka_set_compiler_options(HOST_DEVICE target alpaka "$<$<AND:$<CXX_COMPILER_ID:Clang,AppleClang,IntelLLVM>>:SHELL:-frelaxed-template-template-args>")

# Add debug optimization levels. CMake doesn't do this by default.
# Note that -Og is the recommended gcc optimization level for debug mode but is equivalent to -O1 for clang (and its derivates).
alpaka_set_compiler_options(HOST_DEVICE target alpaka "$<$<AND:$<CONFIG:Debug>,$<CXX_COMPILER_ID:GNU>,$<COMPILE_LANGUAGE:CXX>>:SHELL:-Og>"
Expand Down Expand Up @@ -610,13 +603,6 @@ if(alpaka_ACC_GPU_HIP_ENABLE)
alpaka_set_compiler_options(HOST_DEVICE target alpaka "$<$<COMPILE_LANGUAGE:CXX>:-D__HIP_PLATFORM_HCC__>")
endif()

# C++17 relaxed template template argument matching is disabled by default until Clang 19
# https://github.com/llvm/llvm-project/commit/b86e0992bfa6
# https://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#150
# for example, is required to create alpaka::EnabledAccTags
# TODO(SimeonEhrig): restict HIP version, if first HIP version is release using Clang 19
alpaka_set_compiler_options(HOST_DEVICE target alpaka "$<$<COMPILE_LANGUAGE:HIP>:SHELL:-frelaxed-template-template-args>")

alpaka_compiler_option(HIP_KEEP_FILES "Keep all intermediate files that are generated during internal compilation steps 'CMakeFiles/<targetname>.dir'" OFF)
if(alpaka_HIP_KEEP_FILES)
alpaka_set_compiler_options(HOST_DEVICE target alpaka "$<$<COMPILE_LANGUAGE:HIP>:SHELL:-save-temps>")
Expand Down Expand Up @@ -677,7 +663,6 @@ if(alpaka_ACC_SYCL_ENABLE)
alpaka_set_compiler_options(HOST_DEVICE target alpaka "-fsycl")
target_link_options(alpaka INTERFACE "-fsycl")
alpaka_set_compiler_options(HOST_DEVICE target alpaka "-sycl-std=2020")
alpaka_set_compiler_options(HOST_DEVICE target alpaka "-frelaxed-template-template-args")

#-----------------------------------------------------------------------------------------------------------------
# Determine SYCL targets
Expand Down

0 comments on commit 4dc8da6

Please sign in to comment.