Skip to content

Commit

Permalink
SYCL: Restrict workaround for is_device_copyable to oneAPI versions b…
Browse files Browse the repository at this point in the history
…efore 2024.0.0 (#6532)

* SYCL: Restrict workaround for is_device_copyable to oneAPI versions before 2024.0.0

* Allow for checking __LIBSYCL_MAJOR_VERSION as well

* Drop check for KOKKOS_ENABLE_SYCL

* Fix __LIBSYCL_MAJOR_VERSION check
  • Loading branch information
masterleinad committed Dec 4, 2023
1 parent c3dde62 commit a41dba5
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions core/src/SYCL/Kokkos_SYCL_Instance.hpp
Expand Up @@ -333,8 +333,8 @@ struct sycl::is_device_copyable<
Kokkos::Experimental::Impl::SYCLFunctionWrapper<Functor, Storage, false>>
: std::true_type {};

// FIXME_SYCL Remove when this specialization when specializations for
// sycl::device_copyable also apply to const-qualified types.
#if (defined(__INTEL_LLVM_COMPILER) && __INTEL_LLVM_COMPILER < 20240000) || \
(defined(__LIBSYCL_MAJOR_VERSION) && __LIBSYCL_MAJOR_VERSION < 7)
template <typename>
struct NonTriviallyCopyableAndDeviceCopyable {
NonTriviallyCopyableAndDeviceCopyable(
Expand All @@ -359,3 +359,4 @@ struct sycl::is_device_copyable<
: std::true_type {};
#endif
#endif
#endif

0 comments on commit a41dba5

Please sign in to comment.