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

Jump to bottom

fix cray clang compiler errors #2392

Merged
merged 3 commits into from
Sep 24, 2024
Merged

fix cray clang compiler errors #2392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
128d446
fix cray clang compile issue
psychocoderHPC Sep 23, 2024
351935e
fix cray clang OpenMP linker issues
psychocoderHPC Sep 23, 2024
4dc8da6
remove clang `-frelaxed-template-template-args`
psychocoderHPC Sep 23, 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
20 changes: 5 additions & 15 deletions cmake/alpakaCommon.cmake
View file
Open in desktop
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 @@ -357,6 +350,11 @@ if(alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE OR alpaka_ACC_CPU_B_SEQ_T_OMP2_ENABLE)
else()
find_package(OpenMP REQUIRED COMPONENTS CXX)
target_link_libraries(alpaka INTERFACE OpenMP::OpenMP_CXX)
# shown with CMake 3.29 and cray clang 17
# workaround: cmake is missing to add '-fopenmp' to the linker flags
if(CMAKE_CXX_COMPILER_ID STREQUAL "CrayClang")
target_link_libraries(alpaka INTERFACE -fopenmp)
endif()
endif()
endif()

Expand Down Expand Up @@ -605,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 @@ -672,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
15 changes: 9 additions & 6 deletions include/alpaka/meta/Filter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ namespace alpaka::meta
{
namespace detail
{
template<template<typename...> class TList, template<typename> class TPred, typename... Ts>
template<template<typename...> class TList, template<typename...> class TPred, typename... Ts>
struct FilterImplHelper;

template<template<typename...> class TList, template<typename> class TPred>
template<template<typename...> class TList, template<typename...> class TPred>
struct FilterImplHelper<TList, TPred>
{
using type = TList<>;
};

template<template<typename...> class TList, template<typename> class TPred, typename T, typename... Ts>
template<template<typename...> class TList, template<typename...> class TPred, typename T, typename... Ts>
struct FilterImplHelper<TList, TPred, T, Ts...>
{
using type = std::conditional_t<
Expand All @@ -30,15 +30,18 @@ namespace alpaka::meta
typename FilterImplHelper<TList, TPred, Ts...>::type>;
};

template<typename TList, template<typename> class TPred>
template<typename TList, template<typename...> class TPred>
struct FilterImpl;

template<template<typename...> class TList, template<typename> class TPred, typename... Ts>
template<template<typename...> class TList, template<typename...> class TPred, typename... Ts>
struct FilterImpl<TList<Ts...>, TPred>
{
using type = typename detail::FilterImplHelper<TList, TPred, Ts...>::type;
};
} // namespace detail
template<typename TList, template<typename> class TPred>

/// \tparam TPred Only the first parameter is used, all other must be set by TPred to some default.
/// Using '...' instead of a single type is a workaround for CrayClang.
template<typename TList, template<typename...> class TPred>
using Filter = typename detail::FilterImpl<TList, TPred>::type;
} // namespace alpaka::meta
Loading