Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit 6ec4410

Browse files
bso-intelbso-intel
committed
fixed ONEAPI scope
Signed-off-by: Byoungro So <[email protected]>
1 parent bf61d00 commit 6ec4410

File tree

2 files changed

+25
-33
lines changed

2 files changed

+25
-33
lines changed

‎SYCL/FilterSelector/reuse.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
#include <CL/sycl.hpp>
1616

1717
using namespace cl::sycl;
18-
// TODO: change to 'using namespace cl::sycl::oneapi' after PR intel/llvm:4014
19-
// is merged
20-
using namespace cl::sycl::ONEAPI;
18+
using namespace cl::sycl::ext::oneapi;
2119

2220
int main() {
2321
std::vector<device> Devs;
@@ -27,17 +25,15 @@ int main() {
2725
std::cout << "# Devices found: " << Devs.size() << std::endl;
2826

2927
if (Devs.size() > 1) {
30-
// TODO: change all occurrences of filter_selector to 'filter_selector' or
31-
// 'oneapi::filter_selector' after PR intel/llvm:4014 is merged
32-
ONEAPI::filter_selector filter("1");
28+
filter_selector filter("1");
3329

3430
device d1(filter);
3531
device d2(filter);
3632

3733
assert(d1 == d2);
3834

39-
ONEAPI::filter_selector f1("0");
40-
ONEAPI::filter_selector f2("1");
35+
filter_selector f1("0");
36+
filter_selector f2("1");
4137
device d3(f1);
4238
device d4(f2);
4339

‎SYCL/FilterSelector/select.cpp

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
#include <CL/sycl.hpp>
1616

1717
using namespace cl::sycl;
18-
// TODO: change to 'using namespace cl::sycl::oneapi' after PR intel/llvm:4014
19-
// is merged
20-
using namespace cl::sycl::ONEAPI;
18+
using namespace cl::sycl::ext::oneapi;
2119

2220
int main() {
2321
std::vector<device> CPUs;
@@ -73,62 +71,60 @@ int main() {
7371

7472
if (!CPUs.empty()) {
7573
std::cout << "Test 'cpu'";
76-
// TODO: change all occurrences of filter_selector to 'filter_selector' or
77-
// 'oneapi::filter_selector' after PR intel/llvm:4014 is merged
78-
device d1(ONEAPI::filter_selector("cpu"));
74+
device d1(filter_selector("cpu"));
7975
assert(d1.is_cpu());
8076
std::cout << "...PASS" << std::endl;
8177
}
8278

8379
if (!GPUs.empty()) {
8480
std::cout << "Test 'gpu'";
85-
device d2(ONEAPI::filter_selector("gpu"));
81+
device d2(filter_selector("gpu"));
8682
assert(d2.is_gpu());
8783
std::cout << "...PASS" << std::endl;
8884
}
8985

9086
if (!CPUs.empty() || !GPUs.empty()) {
9187
std::cout << "Test 'cpu,gpu'";
92-
device d3(ONEAPI::filter_selector("cpu,gpu"));
88+
device d3(filter_selector("cpu,gpu"));
9389
assert((d3.is_gpu() || d3.is_cpu()));
9490
std::cout << "...PASS" << std::endl;
9591
}
9692

9793
if (HasOpenCLDevices) {
9894
std::cout << "Test 'opencl'";
99-
device d4(ONEAPI::filter_selector("opencl"));
95+
device d4(filter_selector("opencl"));
10096
assert(d4.get_platform().get_backend() == backend::opencl);
10197
std::cout << "...PASS" << std::endl;
10298

10399
if (!CPUs.empty()) {
104100
std::cout << "Test 'opencl:cpu'";
105-
device d5(ONEAPI::filter_selector("opencl:cpu"));
101+
device d5(filter_selector("opencl:cpu"));
106102
assert(d5.is_cpu() && d5.get_platform().get_backend() == backend::opencl);
107103
std::cout << "...PASS" << std::endl;
108104

109105
std::cout << "Test 'opencl:cpu:0'";
110-
device d6(ONEAPI::filter_selector("opencl:cpu:0"));
106+
device d6(filter_selector("opencl:cpu:0"));
111107
assert(d6.is_cpu() && d6.get_platform().get_backend() == backend::opencl);
112108
std::cout << "...PASS" << std::endl;
113109
}
114110

115111
if (HasOpenCLGPU) {
116112
std::cout << "Test 'opencl:gpu'" << std::endl;
117-
device d7(ONEAPI::filter_selector("opencl:gpu"));
113+
device d7(filter_selector("opencl:gpu"));
118114
assert(d7.is_gpu() && d7.get_platform().get_backend() == backend::opencl);
119115
}
120116
}
121117

122118
std::cout << "Test '0'";
123-
device d8(ONEAPI::filter_selector("0"));
119+
device d8(filter_selector("0"));
124120
std::cout << "...PASS" << std::endl;
125121

126122
std::string ErrorMesg(
127123
"Could not find a device that matches the specified filter(s)!");
128124

129125
try {
130126
// pick something crazy
131-
device d9(ONEAPI::filter_selector("gpu:999"));
127+
device d9(filter_selector("gpu:999"));
132128
std::cout << "d9 = " << d9.get_info<info::device::name>() << std::endl;
133129
} catch (const sycl::runtime_error &e) {
134130
assert(ErrorMesg.find_first_of(e.what()) == 0);
@@ -137,7 +133,7 @@ int main() {
137133

138134
try {
139135
// pick something crazy
140-
device d10(ONEAPI::filter_selector("bob:gpu"));
136+
device d10(filter_selector("bob:gpu"));
141137
std::cout << "d10 = " << d10.get_info<info::device::name>() << std::endl;
142138
} catch (const sycl::runtime_error &e) {
143139
assert(ErrorMesg.find_first_of(e.what()) == 0);
@@ -146,7 +142,7 @@ int main() {
146142

147143
try {
148144
// pick something crazy
149-
device d11(ONEAPI::filter_selector("opencl:bob"));
145+
device d11(filter_selector("opencl:bob"));
150146
std::cout << "d11 = " << d11.get_info<info::device::name>() << std::endl;
151147
} catch (const sycl::runtime_error &e) {
152148
assert(ErrorMesg.find_first_of(e.what()) == 0);
@@ -155,19 +151,19 @@ int main() {
155151

156152
if (HasLevelZeroDevices && HasLevelZeroGPU) {
157153
std::cout << "Test 'level_zero'";
158-
device d12(ONEAPI::filter_selector("level_zero"));
154+
device d12(filter_selector("level_zero"));
159155
assert(d12.get_platform().get_backend() == backend::level_zero);
160156
std::cout << "...PASS" << std::endl;
161157

162158
std::cout << "Test 'level_zero:gpu'";
163-
device d13(ONEAPI::filter_selector("level_zero:gpu"));
159+
device d13(filter_selector("level_zero:gpu"));
164160
assert(d13.is_gpu() &&
165161
d13.get_platform().get_backend() == backend::level_zero);
166162
std::cout << "...PASS" << std::endl;
167163

168164
if (HasOpenCLDevices && !CPUs.empty()) {
169165
std::cout << "Test 'level_zero:gpu,cpu'";
170-
device d14(ONEAPI::filter_selector("level_zero:gpu,cpu"));
166+
device d14(filter_selector("level_zero:gpu,cpu"));
171167
assert((d14.is_gpu() || d14.is_cpu()));
172168
std::cout << "...PASS 1/2" << std::endl;
173169
if (d14.is_gpu()) {
@@ -179,37 +175,37 @@ int main() {
179175

180176
if (Devs.size() > 1) {
181177
std::cout << "Test '1'";
182-
device d15(ONEAPI::filter_selector("1"));
178+
device d15(filter_selector("1"));
183179
std::cout << "...PASS" << std::endl;
184180
}
185181

186182
if (HasCUDADevices) {
187183
std::cout << "Test 'cuda'";
188-
device d16(ONEAPI::filter_selector("cuda"));
184+
device d16(filter_selector("cuda"));
189185
assert(d16.get_platform().get_backend() == backend::cuda);
190186
std::cout << "...PASS" << std::endl;
191187

192188
std::cout << "Test 'cuda:gpu'";
193-
device d17(ONEAPI::filter_selector("cuda:gpu"));
189+
device d17(filter_selector("cuda:gpu"));
194190
assert(d17.is_gpu() && d17.get_platform().get_backend() == backend::cuda);
195191
std::cout << "...PASS" << std::endl;
196192
}
197193

198194
if (!Accels.empty()) {
199195
std::cout << "Test 'accelerator'";
200-
device d18(ONEAPI::filter_selector("accelerator"));
196+
device d18(filter_selector("accelerator"));
201197
assert(d18.is_accelerator());
202198
std::cout << "...PASS" << std::endl;
203199
}
204200

205201
if (HasROCmDevices) {
206202
std::cout << "Test 'rocm'";
207-
device d19(ONEAPI::filter_selector("rocm"));
203+
device d19(filter_selector("rocm"));
208204
assert(d19.get_platform().get_backend() == backend::rocm);
209205
std::cout << "...PASS" << std::endl;
210206

211207
std::cout << "test 'rocm:gpu'";
212-
device d20(ONEAPI::filter_selector("rocm:gpu"));
208+
device d20(filter_selector("rocm:gpu"));
213209
assert(d20.is_gpu() && d19.get_platform().get_backend() == backend::rocm);
214210
std::cout << "...PASS" << std::endl;
215211
}

0 commit comments

Comments
 (0)