Skip to content

Commit 9abe201

Browse files
authored
[SYCL][Group algorithms] Move group sort extension to experimental (#5169)
Changes for the spec: #4666 Test: intel/llvm-test-suite#633 Signed-off-by: Fedorov, Andrey <[email protected]>
1 parent 13443a9 commit 9abe201

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

sycl/include/CL/sycl/group_algorithm.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#include <CL/sycl/known_identity.hpp>
1818
#include <CL/sycl/nd_item.hpp>
1919
#include <CL/sycl/sub_group.hpp>
20+
#include <sycl/ext/oneapi/experimental/group_sort.hpp>
2021
#include <sycl/ext/oneapi/functional.hpp>
21-
#include <sycl/ext/oneapi/group_sort.hpp>
2222

2323
__SYCL_INLINE_NAMESPACE(cl) {
2424
namespace sycl {

sycl/include/sycl/ext/oneapi/group_sort.hpp renamed to sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
#include <CL/sycl/detail/type_traits.hpp>
1515
#include <type_traits>
1616

17-
#include "experimental/group_helpers_sorters.hpp"
17+
#include "group_helpers_sorters.hpp"
1818

1919
__SYCL_INLINE_NAMESPACE(cl) {
2020
namespace sycl {
2121
namespace ext {
2222
namespace oneapi {
23+
namespace experimental {
2324
namespace detail {
2425

2526
// ---- traits
@@ -41,8 +42,7 @@ struct is_sorter_impl {
4142
template <typename G = Group>
4243
static decltype(
4344
std::integral_constant<bool, is_expected_return_type<G>::value &&
44-
sycl::is_group_v<G>>{})
45-
test(int);
45+
sycl::is_group_v<G>>{}) test(int);
4646

4747
template <typename = Group> static std::false_type test(...);
4848
};
@@ -56,8 +56,7 @@ struct is_sorter_impl<
5656
template <typename G = Group>
5757
static decltype(std::declval<Sorter>()(std::declval<G>(), std::declval<Ptr>(),
5858
std::declval<Ptr>()),
59-
sycl::detail::is_generic_group<G>{})
60-
test(int);
59+
sycl::detail::is_generic_group<G>{}) test(int);
6160

6261
template <typename = Group> static std::false_type test(...);
6362
};
@@ -135,6 +134,7 @@ joint_sort(experimental::group_with_scratchpad<Group, Extent> exec, Iter first,
135134
experimental::default_sorter<>(exec.get_memory()));
136135
}
137136

137+
} // namespace experimental
138138
} // namespace oneapi
139139
} // namespace ext
140140
} // namespace sycl

0 commit comments

Comments
 (0)