Skip to content

Commit d90a9af

Browse files
committed
Remove use of old device selectors
1 parent 13a7b3a commit d90a9af

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

sycl/test-e2e/Regression/commandlist/Inputs/main.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ int main(int argc, char *argv[]) {
7676
std::vector<sycl::device> dlist;
7777
if (gpu_dev == 999) {
7878
try {
79-
auto sel = sycl::gpu_selector();
80-
sel_dev = sel.select_device();
79+
sel_dev = sycl::device(sycl::gpu_selector_v);
8180
} catch (...) {
8281
cout << "no gpu device found\n";
8382
}

sycl/test-e2e/Regression/device_num.cpp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -175,37 +175,33 @@ int main() {
175175
targetDevIndex = GetPreferredDeviceIndex(devices, info::device_type::all);
176176
assert(targetDevIndex >= 0 &&
177177
"Failed to find target device for default selector.");
178-
default_selector ds;
179-
device d = ds.select_device();
180-
std::cout << "default_selector selected ";
178+
device d(default_selector_v);
179+
std::cout << "default_selector_v selected ";
181180
printDeviceType(d);
182181
assert(devices[targetDevIndex] == d &&
183182
"The selected device is not the target device specified.");
184183
}
185184
targetDevIndex = GetPreferredDeviceIndex(devices, info::device_type::gpu);
186185
if (targetDevIndex >= 0) {
187-
gpu_selector gs;
188-
device d = gs.select_device();
189-
std::cout << "gpu_selector selected ";
186+
device d(gpu_selector_v);
187+
std::cout << "gpu_selector_v selected ";
190188
printDeviceType(d);
191189
assert(devices[targetDevIndex] == d &&
192190
"The selected device is not the target device specified.");
193191
}
194192
targetDevIndex = GetPreferredDeviceIndex(devices, info::device_type::cpu);
195193
if (targetDevIndex >= 0) {
196-
cpu_selector cs;
197-
device d = cs.select_device();
198-
std::cout << "cpu_selector selected ";
194+
device d(cpu_selector_v);
195+
std::cout << "cpu_selector_v selected ";
199196
printDeviceType(d);
200197
assert(devices[targetDevIndex] == d &&
201198
"The selected device is not the target device specified.");
202199
}
203200
targetDevIndex =
204201
GetPreferredDeviceIndex(devices, info::device_type::accelerator);
205202
if (targetDevIndex >= 0) {
206-
accelerator_selector as;
207-
device d = as.select_device();
208-
std::cout << "accelerator_selector selected ";
203+
device d(accelerator_selector_v);
204+
std::cout << "accelerator_selector_v selected ";
209205
printDeviceType(d);
210206
assert(devices[targetDevIndex] == d &&
211207
"The selected device is not the target device specified.");

0 commit comments

Comments
 (0)