|
14 | 14 | #define GGML_SYCL_DPCT_HELPER_HPP
|
15 | 15 |
|
16 | 16 | #include <map>
|
17 |
| -#include <sycl/ext/oneapi/experimental/enqueue_functions.hpp> |
18 |
| -#include <sycl/half_type.hpp> |
19 | 17 | #include <sycl/sycl.hpp>
|
| 18 | +#include <sycl/half_type.hpp> |
20 | 19 | #include <syclcompat/math.hpp>
|
21 | 20 |
|
22 | 21 | #ifdef GGML_SYCL_USE_INTEL_ONEMKL
|
@@ -119,32 +118,32 @@ inline auto get_onemath_backend(sycl::queue& queue)
|
119 | 118 | #endif
|
120 | 119 | }
|
121 | 120 |
|
122 |
| -template <int NR = 3, typename L> |
123 |
| -__dpct_inline__ auto sycl_parallel_for(sycl::handler & cgh, sycl::nd_range<NR> nd_range, L && func) { |
| 121 | +template <int NR, typename Func> |
| 122 | +__dpct_inline__ void sycl_parallel_for(sycl::handler & cgh, sycl::nd_range<NR> nd_range, Func && func) { |
124 | 123 | #ifdef SYCL_EXT_ONEAPI_ENQUEUE_FUNCTIONS
|
125 | 124 | namespace syclex = sycl::ext::oneapi::experimental;
|
126 | 125 | syclex::nd_launch(cgh, nd_range, func);
|
127 | 126 | #else
|
128 |
| - return cgh.parallel_for(nd_range, func); |
| 127 | + cgh.parallel_for(nd_range, func); |
129 | 128 | #endif
|
130 | 129 | }
|
131 | 130 |
|
132 |
| -template <int NR = 3, typename L> |
133 |
| -__dpct_inline__ auto sycl_parallel_for(sycl::queue * q, sycl::nd_range<NR> nd_range, L && func) { |
| 131 | +template <int NR, typename Func> |
| 132 | +__dpct_inline__ void sycl_parallel_for(sycl::queue * q, sycl::nd_range<NR> nd_range, Func && func) { |
134 | 133 | #ifdef SYCL_EXT_ONEAPI_ENQUEUE_FUNCTIONS
|
135 | 134 | namespace syclex = sycl::ext::oneapi::experimental;
|
136 | 135 | syclex::nd_launch(*q, nd_range, func);
|
137 | 136 | #else
|
138 |
| - return q->parallel_for(nd_range, func); |
| 137 | + q->parallel_for(nd_range, func); |
139 | 138 | #endif
|
140 | 139 | }
|
141 | 140 |
|
142 |
| -template <typename L> __dpct_inline__ auto sycl_launch(sycl::queue * stream, L && func) { |
| 141 | +template <typename Func> __dpct_inline__ void sycl_launch(sycl::queue * stream, Func && func) { |
143 | 142 | #ifdef SYCL_EXT_ONEAPI_ENQUEUE_FUNCTIONS
|
144 | 143 | namespace syclex = sycl::ext::oneapi::experimental;
|
145 | 144 | syclex::submit(*stream, func);
|
146 | 145 | #else
|
147 |
| - return stream->submit(func); |
| 146 | + stream->submit(func); |
148 | 147 | #endif
|
149 | 148 | }
|
150 | 149 |
|
|
0 commit comments