Skip to content

Commit 19052da

Browse files
authored
[SYCL][E2E] Use callable device selector in FilterSelector e2e tests (#14162)
Instead of using old device selector objects, use SYCL 2020 device selector callables to construct devices in `FilterSelector` e2e tests.
1 parent 579484f commit 19052da

File tree

3 files changed

+12
-26
lines changed

3 files changed

+12
-26
lines changed

sycl/test-e2e/FilterSelector/select_device_acc.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,31 @@ int main() {
2222
forcedPIs = envVal;
2323
}
2424
{
25-
default_selector ds;
26-
device d = ds.select_device();
25+
device d(default_selector_v);
2726
string name = d.get_platform().get_info<info::platform::name>();
2827
assert(name.find("OpenCL") != string::npos &&
2928
"default selector failed to find acc device");
3029
}
3130
{
32-
gpu_selector gs;
3331
try {
34-
device d = gs.select_device();
32+
device d(gpu_selector_v);
3533
std::cerr << "GPU Device is found in error: " << std::boolalpha
3634
<< d.is_gpu() << std::endl;
3735
return -1;
3836
} catch (...) {
3937
}
4038
}
4139
{
42-
cpu_selector cs;
4340
try {
44-
device d = cs.select_device();
41+
device d(cpu_selector_v);
4542
std::cerr << "CPU Device is found in error: " << std::boolalpha
4643
<< d.is_cpu() << std::endl;
4744
return -1;
4845
} catch (...) {
4946
}
5047
}
5148
{
52-
accelerator_selector as;
53-
device d = as.select_device();
49+
device d(accelerator_selector_v);
5450
string name = d.get_platform().get_info<info::platform::name>();
5551
assert(name.find("OpenCL") != string::npos &&
5652
"accelerator_selector failed to find acc device");

sycl/test-e2e/FilterSelector/select_device_cpu.cpp

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,24 @@ int main() {
2222
forcedPIs = envVal;
2323
}
2424
{
25-
default_selector ds;
26-
device d = ds.select_device();
25+
device d(default_selector_v);
2726
string name = d.get_platform().get_info<info::platform::name>();
2827
assert(name.find("OpenCL") != string::npos &&
2928
"default_selector failed to find cpu device");
3029
}
3130
{
32-
gpu_selector gs;
3331
try {
34-
device d = gs.select_device();
32+
device d(gpu_selector_v);
3533
std::cerr << "GPU Device is found: " << std::boolalpha << d.is_gpu()
3634
<< std::endl;
3735
return -1;
3836
} catch (...) {
3937
}
4038
}
39+
{ device d(cpu_selector_v); }
4140
{
42-
cpu_selector cs;
43-
device d = cs.select_device();
44-
}
45-
{
46-
accelerator_selector as;
4741
try {
48-
device d = as.select_device();
42+
device d(accelerator_selector_v);
4943
std::cerr << "ACC device is found in error: " << d.is_accelerator()
5044
<< std::endl;
5145
return -1;

sycl/test-e2e/FilterSelector/select_device_cuda.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,26 @@ 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("CUDA") != string::npos);
3029
}
3130
{
32-
gpu_selector gs;
33-
device d = gs.select_device();
31+
device d(gpu_selector_v);
3432
string name = d.get_platform().get_info<info::platform::name>();
3533
assert(name.find("CUDA") != string::npos);
3634
}
3735
{
38-
cpu_selector cs;
3936
try {
40-
device d = cs.select_device();
37+
device d(cpu_selector_v);
4138
cerr << "CPU device is found in error: " << d.is_cpu() << std::endl;
4239
return -1;
4340
} catch (...) {
4441
}
4542
}
4643
{
47-
accelerator_selector as;
4844
try {
49-
device d = as.select_device();
45+
device d(accelerator_selector_v);
5046
cerr << "ACC device is found in error: " << d.is_accelerator()
5147
<< std::endl;
5248
} catch (...) {

0 commit comments

Comments
 (0)