Bugfix for device copyable of unique copy helper (#2004)

The ValueType should not be necessary for device copyability because it is not a member field of the helper struct. It is only the return value of the callable. Therefore, we should not base device copyability on it. Signed-off-by: Dan Hoeflinger <[email protected]>
uxlfoundation · Jan 24, 2025 · a3ea7ca · a3ea7ca
1 parent 780705c
commit a3ea7ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/include/oneapi/dpl/pstl/hetero/dpcpp/sycl_traits.h b/include/oneapi/dpl/pstl/hetero/dpcpp/sycl_traits.h
@@ -220,7 +220,7 @@ struct sycl::is_device_copyable<_ONEDPL_SPECIALIZE_FOR(oneapi::dpl::__internal::
 template <typename _Predicate, typename _ValueType>
 struct sycl::is_device_copyable<_ONEDPL_SPECIALIZE_FOR(oneapi::dpl::__internal::__create_mask_unique_copy, _Predicate,
                                                        _ValueType)>
-    : oneapi::dpl::__internal::__are_all_device_copyable<_Predicate, _ValueType>
+    : oneapi::dpl::__internal::__are_all_device_copyable<_Predicate>
 {
 };
 

diff --git a/test/general/implementation_details/device_copyable.pass.cpp b/test/general/implementation_details/device_copyable.pass.cpp
@@ -288,6 +288,10 @@ test_device_copyable()
     static_assert(sycl::is_device_copyable_v<
                       oneapi::dpl::__internal::__create_mask_unique_copy<noop_device_copyable, int_device_copyable>>,
                   "__create_mask_unique_copy is not device copyable with device copyable types");
+    static_assert(sycl::is_device_copyable_v<
+                      oneapi::dpl::__internal::__create_mask_unique_copy<noop_device_copyable,
+                      int_non_device_copyable>>,
+                  "__create_mask_unique_copy is incorrectly not device copyable because of non member field template arg");
     //tuple
     static_assert(sycl::is_device_copyable_v<oneapi::dpl::__internal::tuple<int_device_copyable, int_device_copyable>>,
                   "tuple is not device copyable with device copyable types");