Skip to content

Commit e720b3a

Browse files
Switch most of GroupAlgorithm/* tests to use <sycl/detail/core.hpp> (#13130)
1 parent 9814b6a commit e720b3a

19 files changed

+42
-19
lines changed

sycl/test-e2e/GroupAlgorithm/SYCL2020/all_of.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
#include <cassert>
77
#include <iostream>
88
#include <numeric>
9-
#include <sycl/sycl.hpp>
9+
#include <sycl/detail/core.hpp>
10+
#include <sycl/group_algorithm.hpp>
1011
using namespace sycl;
1112

1213
template <class Predicate> class all_of_kernel;

sycl/test-e2e/GroupAlgorithm/SYCL2020/any_of.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
#include <cassert>
77
#include <iostream>
88
#include <numeric>
9-
#include <sycl/sycl.hpp>
9+
#include <sycl/detail/core.hpp>
10+
#include <sycl/group_algorithm.hpp>
1011
using namespace sycl;
1112

1213
template <class Predicate> class any_of_kernel;

sycl/test-e2e/GroupAlgorithm/SYCL2020/exclusive_scan.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
#include <iostream>
99
#include <limits>
1010
#include <numeric>
11-
#include <sycl/sycl.hpp>
11+
#include <sycl/detail/core.hpp>
12+
#include <sycl/group_algorithm.hpp>
1213
#include <vector>
1314
using namespace sycl;
1415

sycl/test-e2e/GroupAlgorithm/SYCL2020/group_broadcast.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
#include <complex>
88
#include <iostream>
99
#include <numeric>
10-
#include <sycl/sycl.hpp>
10+
#include <sycl/detail/core.hpp>
11+
#include <sycl/group_algorithm.hpp>
1112
using namespace sycl;
1213

1314
template <typename T> bool equal(const T &a, const T &b) { return a == b; }

sycl/test-e2e/GroupAlgorithm/SYCL2020/helpers.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
#include <cmath>
1010
#include <complex>
1111
#include <iostream>
12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/group_algorithm.hpp>
1314

1415
using namespace sycl;
1516

sycl/test-e2e/GroupAlgorithm/SYCL2020/inclusive_scan.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
#include <iostream>
99
#include <limits>
1010
#include <numeric>
11-
#include <sycl/sycl.hpp>
11+
#include <sycl/detail/core.hpp>
12+
#include <sycl/group_algorithm.hpp>
1213
#include <vector>
1314
using namespace sycl;
1415

sycl/test-e2e/GroupAlgorithm/SYCL2020/none_of.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
#include <cassert>
77
#include <iostream>
88
#include <numeric>
9-
#include <sycl/sycl.hpp>
9+
#include <sycl/detail/core.hpp>
10+
#include <sycl/group_algorithm.hpp>
1011
using namespace sycl;
1112

1213
template <class Predicate> class none_of_kernel;

sycl/test-e2e/GroupAlgorithm/SYCL2020/permute_select.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
#include "helpers.hpp"
1010
#include <iostream>
11-
#include <sycl/sycl.hpp>
11+
#include <sycl/detail/core.hpp>
12+
#include <sycl/group_algorithm.hpp>
1213
template <typename T, int N> class sycl_subgr;
1314

1415
using namespace sycl;

sycl/test-e2e/GroupAlgorithm/SYCL2020/reduce.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
#include <iostream>
88
#include <limits>
99
#include <numeric>
10-
#include <sycl/sycl.hpp>
10+
#include <sycl/detail/core.hpp>
11+
#include <sycl/group_algorithm.hpp>
1112
using namespace sycl;
1213

1314
template <typename SpecializationKernelName, typename InputContainer,

sycl/test-e2e/GroupAlgorithm/SYCL2020/reduce_over_group_size.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
(ie, byte size versus vector size)
1717
*/
1818

19-
#include <sycl/sycl.hpp>
19+
#include <sycl/detail/core.hpp>
20+
#include <sycl/group_algorithm.hpp>
21+
#include <sycl/usm.hpp>
2022

2123
using namespace sycl;
2224

sycl/test-e2e/GroupAlgorithm/SYCL2020/shift_left_right.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "helpers.hpp"
10-
#include <sycl/sycl.hpp>
10+
#include <sycl/detail/core.hpp>
11+
#include <sycl/group_algorithm.hpp>
1112
template <typename T, int N> class sycl_subgr;
1213

1314
using namespace sycl;

sycl/test-e2e/GroupAlgorithm/SYCL2020/sort.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
// TODO: Consider using USM instead of buffers
2626
// TODO: Add support for sorting over workgroup for CUDA and HIP BE
2727

28-
#include <sycl/sycl.hpp>
28+
#include <sycl/detail/core.hpp>
29+
30+
#include <sycl/builtins.hpp>
31+
#include <sycl/ext/oneapi/experimental/group_sort.hpp>
32+
#include <sycl/group_algorithm.hpp>
2933

3034
#include <algorithm>
3135
#include <iostream>

sycl/test-e2e/GroupAlgorithm/SYCL2020/support.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#include <sycl/sycl.hpp>
1+
#include <sycl/detail/core.hpp>
2+
#include <sycl/group_algorithm.hpp>
23
using namespace sycl;
34

45
bool isSupportedDevice(device D) {

sycl/test-e2e/GroupAlgorithm/different_types.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
#include <cstdint>
77
#include <limits>
88
#include <numeric>
9-
#include <sycl/sycl.hpp>
9+
#include <sycl/detail/core.hpp>
10+
#include <sycl/group_algorithm.hpp>
1011

1112
using namespace sycl;
1213

sycl/test-e2e/GroupAlgorithm/exclusive_scan_over_group.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
#include <algorithm>
99
#include <iostream>
10-
#include <sycl/sycl.hpp>
10+
#include <sycl/detail/core.hpp>
11+
#include <sycl/group_algorithm.hpp>
1112

1213
template <typename T, typename AccessorT>
1314
sycl::event compiler_group_scan_impl(sycl::queue *queue, AccessorT &in_data,

sycl/test-e2e/GroupAlgorithm/exclusive_scan_sycl2020.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
#include <iostream>
1010
#include <limits>
1111
#include <numeric>
12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/group_algorithm.hpp>
1314
#include <vector>
1415
using namespace sycl;
1516

sycl/test-e2e/GroupAlgorithm/inclusive_scan_sycl2020.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
#include <iostream>
1010
#include <limits>
1111
#include <numeric>
12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/group_algorithm.hpp>
1314
#include <vector>
1415
using namespace sycl;
1516

sycl/test-e2e/GroupAlgorithm/leader.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
#include <cassert>
55
#include <iostream>
6-
#include <sycl/sycl.hpp>
6+
#include <sycl/detail/core.hpp>
7+
#include <sycl/group_algorithm.hpp>
78

89
using namespace sycl;
910

sycl/test-e2e/GroupAlgorithm/support.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include <iostream>
2-
#include <sycl/sycl.hpp>
2+
#include <sycl/detail/core.hpp>
3+
#include <sycl/group_algorithm.hpp>
34

45
using namespace sycl;
56
using namespace sycl::ext::oneapi;

0 commit comments

Comments
 (0)