Skip to content

Commit 3cb0ba4

Browse files
committed
Fix ABI breakage
1 parent 77a6de1 commit 3cb0ba4

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

sycl/include/sycl/handler.hpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ class pipe;
163163
}
164164

165165
namespace ext ::oneapi ::experimental {
166+
template <typename, typename>
167+
class work_group_memory;
166168
struct image_descriptor;
167169
} // namespace ext::oneapi::experimental
168170

@@ -636,6 +638,8 @@ class __SYCL_EXPORT handler {
636638
#endif
637639
}
638640

641+
void setArgHelper(int ArgIndex, detail::work_group_memory_impl &Arg);
642+
639643
// setArgHelper for non local accessor argument.
640644
template <typename DataT, int Dims, access::mode AccessMode,
641645
access::target AccessTarget, access::placeholder IsPlaceholder>
@@ -1871,7 +1875,13 @@ class __SYCL_EXPORT handler {
18711875
setArgHelper(ArgIndex, std::move(Arg));
18721876
}
18731877

1874-
void set_arg(int ArgIndex, detail::work_group_memory_impl &Arg);
1878+
template <typename DataT, typename PropertyListT =
1879+
ext::oneapi::experimental::empty_properties_t>
1880+
void set_arg(
1881+
int ArgIndex,
1882+
ext::oneapi::experimental::work_group_memory<DataT, PropertyListT> &Arg) {
1883+
setArgHelper(ArgIndex, Arg);
1884+
}
18751885

18761886
// set_arg for graph dynamic_parameters
18771887
template <typename T>

sycl/source/detail/handler_impl.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <detail/kernel_bundle_impl.hpp>
1414
#include <memory>
1515
#include <sycl/ext/oneapi/experimental/graph.hpp>
16-
#include <sycl/ext/oneapi/experimental/work_group_memory.hpp>
1716

1817
namespace sycl {
1918
inline namespace _V1 {

sycl/source/handler.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include <sycl/stream.hpp>
3535

3636
#include <sycl/ext/oneapi/bindless_images_memory.hpp>
37+
#include <sycl/ext/oneapi/experimental/work_group_memory.hpp>
3738
#include <sycl/ext/oneapi/memcpy2d.hpp>
3839

3940
namespace sycl {
@@ -818,7 +819,7 @@ void handler::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
818819
}
819820
}
820821

821-
void handler::set_arg(int ArgIndex, detail::work_group_memory_impl &Arg) {
822+
void handler::setArgHelper(int ArgIndex, detail::work_group_memory_impl &Arg) {
822823
impl->MWorkGroupMemoryObjects.push_back(
823824
std::make_shared<detail::work_group_memory_impl>(Arg));
824825
addArg(detail::kernel_param_kind_t::kind_work_group_memory,

0 commit comments

Comments
 (0)