Skip to content
Open
Changes from all commits
Commits
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
14 changes: 6 additions & 8 deletions sycl/include/sycl/queue.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@ auto submit_kernel_direct(
const detail::code_location &CodeLoc = detail::code_location::current()) {
detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);

using KernelType =
std::remove_const_t<std::remove_reference_t<KernelTypeUniversalRef>>;
using KernelType = std::decay_t<KernelTypeUniversalRef>;

using NameT =
typename detail::get_kernel_name_t<KernelName, KernelType>::name;
Expand Down Expand Up @@ -209,8 +208,7 @@ auto submit_kernel_direct_parallel_for(
const PropertiesT &Props = ext::oneapi::experimental::empty_properties_t{},
const detail::code_location &CodeLoc = detail::code_location::current()) {

using KernelType =
std::remove_const_t<std::remove_reference_t<KernelTypeUniversalRef>>;
using KernelType = std::decay_t<KernelTypeUniversalRef>;

using LambdaArgType =
sycl::detail::lambda_arg_type<KernelType, nd_item<Dims>>;
Expand Down Expand Up @@ -3310,7 +3308,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
RestT &&...Rest) {
constexpr detail::code_location CodeLoc = getCodeLocation<KernelName>();
detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
using KernelType = std::tuple_element_t<0, std::tuple<RestT...>>;
using KernelType = std::decay_t<detail::nth_type_t<0, RestT...>>;

// TODO The handler-less path does not support reductions, and
// kernel functions with the kernel_handler type argument yet.
Expand Down Expand Up @@ -3340,7 +3338,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
parallel_for(nd_range<Dims> Range, RestT &&...Rest) {
constexpr detail::code_location CodeLoc = getCodeLocation<KernelName>();
detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
using KernelType = std::tuple_element_t<0, std::tuple<RestT...>>;
using KernelType = std::decay_t<detail::nth_type_t<0, RestT...>>;

// TODO The handler-less path does not support reductions, and
// kernel functions with the kernel_handler type argument yet.
Expand Down Expand Up @@ -3402,7 +3400,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
parallel_for(nd_range<Dims> Range, event DepEvent, RestT &&...Rest) {
constexpr detail::code_location CodeLoc = getCodeLocation<KernelName>();
detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
using KernelType = std::tuple_element_t<0, std::tuple<RestT...>>;
using KernelType = std::decay_t<detail::nth_type_t<0, RestT...>>;

// TODO The handler-less path does not support reductions, and
// kernel functions with the kernel_handler type argument yet.
Expand Down Expand Up @@ -3469,7 +3467,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
RestT &&...Rest) {
constexpr detail::code_location CodeLoc = getCodeLocation<KernelName>();
detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
using KernelType = std::tuple_element_t<0, std::tuple<RestT...>>;
using KernelType = std::decay_t<detail::nth_type_t<0, RestT...>>;

// TODO The handler-less path does not support reductions, and
// kernel functions with the kernel_handler type argument yet.
Expand Down