Skip to content

Commit f26139e

Browse files
authored
[SYCL][E2E] Remove use of deprecated device selectors in FilterSelector tests (#15785)
Use new device selector callables, instead of deprecated device selector objects. These tests do not run on CI because they require multiple devices, so they were missed by the addition of `-Werror` to e2e tests.
1 parent e9d9013 commit f26139e

File tree

2 files changed

+11
-20
lines changed

2 files changed

+11
-20
lines changed

sycl/test-e2e/FilterSelector/select_device.cpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,29 @@ int main() {
2929
}
3030
if (!envVal.empty() || forcedPIs == "*" ||
3131
forcedPIs.find("level_zero:gpu") != std::string::npos) {
32-
default_selector ds;
33-
device d = ds.select_device();
32+
device d(default_selector_v);
3433
string name = d.get_platform().get_info<info::platform::name>();
3534
assert(name.find("Level-Zero") != string::npos);
3635
}
3736
if (envVal.empty() && forcedPIs != "*" &&
3837
forcedPIs.find("opencl:gpu") != std::string::npos) {
39-
gpu_selector gs;
40-
device d = gs.select_device();
38+
device d(gpu_selector_v);
4139
string name = d.get_platform().get_info<info::platform::name>();
4240
assert(name.find("OpenCL") != string::npos);
4341
}
4442
if (!envVal.empty() || forcedPIs == "*" ||
4543
forcedPIs.find("cpu") != std::string::npos) {
46-
cpu_selector cs;
47-
device d = cs.select_device();
44+
device d(cpu_selector_v);
4845
}
4946
if (!envVal.empty() || forcedPIs == "*" ||
5047
forcedPIs.find("fpga") != std::string::npos) {
51-
accelerator_selector as;
52-
device d = as.select_device();
48+
device d(accelerator_selector_v);
5349
}
5450
if (envVal.empty() && (forcedPIs.find("cpu") == std::string::npos &&
5551
forcedPIs.find("opencl") == std::string::npos &&
5652
forcedPIs.find("*") == std::string::npos)) {
5753
try {
58-
cpu_selector cs;
59-
device d = cs.select_device();
54+
device d(cpu_selector_v);
6055
} catch (...) {
6156
return 0; // expected
6257
}

sycl/test-e2e/FilterSelector/select_device_opencl.cpp

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,22 @@ int main() {
2323
}
2424

2525
{
26-
default_selector ds;
27-
device d = ds.select_device();
26+
device d(default_selector_v);
2827
string name = d.get_platform().get_info<info::platform::name>();
2928
assert(name.find("OpenCL") != string::npos &&
30-
"default_selector failed to find an opencl device");
29+
"default_selector_v failed to find an opencl device");
3130
}
3231
{
33-
gpu_selector gs;
34-
device d = gs.select_device();
32+
device d(gpu_selector_v);
3533
string name = d.get_platform().get_info<info::platform::name>();
3634
assert(name.find("OpenCL") != string::npos &&
37-
"gpu_selector failed to find an opencl device");
35+
"gpu_selector_v failed to find an opencl device");
3836
}
3937
{
40-
cpu_selector cs;
41-
device d = cs.select_device();
38+
device d(cpu_selector_v);
4239
}
4340
{
44-
accelerator_selector as;
45-
device d = as.select_device();
41+
device d(accelerator_selector_v);
4642
}
4743

4844
return 0;

0 commit comments

Comments
 (0)