Skip to content

Commit b459bab

Browse files
committed
Tests changed for using sycl function objects
1 parent cab4e5c commit b459bab

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

sycl/test/on-device/group_algorithms_sycl2020/exclusive_scan.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,16 +138,16 @@ int main() {
138138
std::iota(input.begin(), input.end(), 0);
139139
std::fill(output.begin(), output.end(), 0);
140140

141-
test<class KernelNamePlusV>(q, input, output, std::plus<>(), 0);
142-
test<class KernelNameMinimumV>(q, input, output, sycl::ONEAPI::minimum<>(),
141+
test<class KernelNamePlusV>(q, input, output, sycl::plus<>(), 0);
142+
test<class KernelNameMinimumV>(q, input, output, sycl::minimum<>(),
143143
std::numeric_limits<int>::max());
144-
test<class KernelNameMaximumV>(q, input, output, sycl::ONEAPI::maximum<>(),
144+
test<class KernelNameMaximumV>(q, input, output, sycl::maximum<>(),
145145
std::numeric_limits<int>::lowest());
146146

147-
test<class KernelNamePlusI>(q, input, output, std::plus<int>(), 0);
148-
test<class KernelNameMinimumI>(q, input, output, sycl::ONEAPI::minimum<int>(),
147+
test<class KernelNamePlusI>(q, input, output, sycl::plus<int>(), 0);
148+
test<class KernelNameMinimumI>(q, input, output, sycl::minimum<int>(),
149149
std::numeric_limits<int>::max());
150-
test<class KernelNameMaximumI>(q, input, output, sycl::ONEAPI::maximum<int>(),
150+
test<class KernelNameMaximumI>(q, input, output, sycl::maximum<int>(),
151151
std::numeric_limits<int>::lowest());
152152

153153
#ifdef SPIRV_1_3

sycl/test/on-device/group_algorithms_sycl2020/inclusive_scan.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,16 +138,16 @@ int main() {
138138
std::iota(input.begin(), input.end(), 0);
139139
std::fill(output.begin(), output.end(), 0);
140140

141-
test<class KernelNamePlusV>(q, input, output, std::plus<>(), 0);
142-
test<class KernelNameMinimumV>(q, input, output, sycl::ONEAPI::minimum<>(),
141+
test<class KernelNamePlusV>(q, input, output, sycl::plus<>(), 0);
142+
test<class KernelNameMinimumV>(q, input, output, sycl::minimum<>(),
143143
std::numeric_limits<int>::max());
144-
test<class KernelNameMaximumV>(q, input, output, sycl::ONEAPI::maximum<>(),
144+
test<class KernelNameMaximumV>(q, input, output, sycl::maximum<>(),
145145
std::numeric_limits<int>::lowest());
146146

147-
test<class KernelNamePlusI>(q, input, output, std::plus<int>(), 0);
148-
test<class KernelNameMinimumI>(q, input, output, sycl::ONEAPI::minimum<int>(),
147+
test<class KernelNamePlusI>(q, input, output, sycl::plus<int>(), 0);
148+
test<class KernelNameMinimumI>(q, input, output, sycl::minimum<int>(),
149149
std::numeric_limits<int>::max());
150-
test<class KernelNameMaximumI>(q, input, output, sycl::ONEAPI::maximum<int>(),
150+
test<class KernelNameMaximumI>(q, input, output, sycl::maximum<int>(),
151151
std::numeric_limits<int>::lowest());
152152

153153
#ifdef SPIRV_1_3

sycl/test/on-device/group_algorithms_sycl2020/reduce.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,16 @@ int main() {
7474
std::iota(input.begin(), input.end(), 0);
7575
std::fill(output.begin(), output.end(), 0);
7676

77-
test<class KernelNamePlusV>(q, input, output, std::plus<>(), 0);
78-
test<class KernelNameMinimumV>(q, input, output, sycl::ONEAPI::minimum<>(),
77+
test<class KernelNamePlusV>(q, input, output, sycl::plus<>(), 0);
78+
test<class KernelNameMinimumV>(q, input, output, sycl::minimum<>(),
7979
std::numeric_limits<int>::max());
80-
test<class KernelNameMaximumV>(q, input, output, sycl::ONEAPI::maximum<>(),
80+
test<class KernelNameMaximumV>(q, input, output, sycl::maximum<>(),
8181
std::numeric_limits<int>::lowest());
8282

83-
test<class KernelNamePlusI>(q, input, output, std::plus<int>(), 0);
84-
test<class KernelNameMinimumI>(q, input, output, sycl::ONEAPI::minimum<int>(),
83+
test<class KernelNamePlusI>(q, input, output, sycl::plus<int>(), 0);
84+
test<class KernelNameMinimumI>(q, input, output, sycl::minimum<int>(),
8585
std::numeric_limits<int>::max());
86-
test<class KernelNameMaximumI>(q, input, output, sycl::ONEAPI::maximum<int>(),
86+
test<class KernelNameMaximumI>(q, input, output, sycl::maximum<int>(),
8787
std::numeric_limits<int>::lowest());
8888

8989
#ifdef SPIRV_1_3

0 commit comments

Comments
 (0)