From 85fc5f880b0b7abbcd2e6ad3fa140b0b372ef0ee Mon Sep 17 00:00:00 2001 From: David Garcia Date: Wed, 5 Jun 2024 16:16:28 -0600 Subject: [PATCH 1/3] Remove use of old device selectors --- sycl/test-e2e/FilterSelector/select_device_acc.cpp | 12 ++++-------- sycl/test-e2e/FilterSelector/select_device_cpu.cpp | 12 ++++-------- sycl/test-e2e/FilterSelector/select_device_cuda.cpp | 13 +++++-------- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/sycl/test-e2e/FilterSelector/select_device_acc.cpp b/sycl/test-e2e/FilterSelector/select_device_acc.cpp index 0b2250a2cf3bb..cb082860eafd3 100644 --- a/sycl/test-e2e/FilterSelector/select_device_acc.cpp +++ b/sycl/test-e2e/FilterSelector/select_device_acc.cpp @@ -22,16 +22,14 @@ int main() { forcedPIs = envVal; } { - default_selector ds; - device d = ds.select_device(); + device d(default_selector_v); string name = d.get_platform().get_info(); assert(name.find("OpenCL") != string::npos && "default selector failed to find acc device"); } { - gpu_selector gs; try { - device d = gs.select_device(); + device d(gpu_selector_v); std::cerr << "GPU Device is found in error: " << std::boolalpha << d.is_gpu() << std::endl; return -1; @@ -39,9 +37,8 @@ int main() { } } { - cpu_selector cs; try { - device d = cs.select_device(); + device d(cpu_selector_v); std::cerr << "CPU Device is found in error: " << std::boolalpha << d.is_cpu() << std::endl; return -1; @@ -49,8 +46,7 @@ int main() { } } { - accelerator_selector as; - device d = as.select_device(); + device d(accelerator_selector_v); string name = d.get_platform().get_info(); assert(name.find("OpenCL") != string::npos && "accelerator_selector failed to find acc device"); diff --git a/sycl/test-e2e/FilterSelector/select_device_cpu.cpp b/sycl/test-e2e/FilterSelector/select_device_cpu.cpp index d20002edb3090..dd54a7535e9d5 100644 --- a/sycl/test-e2e/FilterSelector/select_device_cpu.cpp +++ b/sycl/test-e2e/FilterSelector/select_device_cpu.cpp @@ -22,16 +22,14 @@ int main() { forcedPIs = envVal; } { - default_selector ds; - device d = ds.select_device(); + device d(default_selector_v); string name = d.get_platform().get_info(); assert(name.find("OpenCL") != string::npos && "default_selector failed to find cpu device"); } { - gpu_selector gs; try { - device d = gs.select_device(); + device d(gpu_selector_v); std::cerr << "GPU Device is found: " << std::boolalpha << d.is_gpu() << std::endl; return -1; @@ -39,13 +37,11 @@ int main() { } } { - cpu_selector cs; - device d = cs.select_device(); + device d(cpu_selector_v); } { - accelerator_selector as; try { - device d = as.select_device(); + device d(accelerator_selector_v); std::cerr << "ACC device is found in error: " << d.is_accelerator() << std::endl; return -1; diff --git a/sycl/test-e2e/FilterSelector/select_device_cuda.cpp b/sycl/test-e2e/FilterSelector/select_device_cuda.cpp index 8a5662c198096..e28a350fdd0d1 100644 --- a/sycl/test-e2e/FilterSelector/select_device_cuda.cpp +++ b/sycl/test-e2e/FilterSelector/select_device_cuda.cpp @@ -8,6 +8,7 @@ // // REQUIRES: cuda,gpu +#include "sycl/device_selector.hpp" #include #include @@ -23,30 +24,26 @@ int main() { } { - default_selector ds; - device d = ds.select_device(); + device d(default_selector_v); string name = d.get_platform().get_info(); assert(name.find("CUDA") != string::npos); } { - gpu_selector gs; - device d = gs.select_device(); + device d(gpu_selector_v); string name = d.get_platform().get_info(); assert(name.find("CUDA") != string::npos); } { - cpu_selector cs; try { - device d = cs.select_device(); + device d(cpu_selector_v); cerr << "CPU device is found in error: " << d.is_cpu() << std::endl; return -1; } catch (...) { } } { - accelerator_selector as; try { - device d = as.select_device(); + device d(accelerator_selector_v); cerr << "ACC device is found in error: " << d.is_accelerator() << std::endl; } catch (...) { From ed39cc849a2b87fd9426f92b27a65ddbf261c982 Mon Sep 17 00:00:00 2001 From: David Garcia Date: Thu, 13 Jun 2024 10:10:40 -0400 Subject: [PATCH 2/3] Remove unnecessary include in `select_device_cuda.cpp` --- sycl/test-e2e/FilterSelector/select_device_cuda.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/sycl/test-e2e/FilterSelector/select_device_cuda.cpp b/sycl/test-e2e/FilterSelector/select_device_cuda.cpp index e28a350fdd0d1..372c1771bcba8 100644 --- a/sycl/test-e2e/FilterSelector/select_device_cuda.cpp +++ b/sycl/test-e2e/FilterSelector/select_device_cuda.cpp @@ -8,7 +8,6 @@ // // REQUIRES: cuda,gpu -#include "sycl/device_selector.hpp" #include #include From 74c41afee2064c9adad7cb0b51c7e1a8a56111aa Mon Sep 17 00:00:00 2001 From: David Garcia Date: Thu, 13 Jun 2024 10:55:51 -0400 Subject: [PATCH 3/3] clang format --- sycl/test-e2e/FilterSelector/select_device_acc.cpp | 4 ++-- sycl/test-e2e/FilterSelector/select_device_cpu.cpp | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sycl/test-e2e/FilterSelector/select_device_acc.cpp b/sycl/test-e2e/FilterSelector/select_device_acc.cpp index cb082860eafd3..4b3db255b0853 100644 --- a/sycl/test-e2e/FilterSelector/select_device_acc.cpp +++ b/sycl/test-e2e/FilterSelector/select_device_acc.cpp @@ -29,7 +29,7 @@ int main() { } { try { - device d(gpu_selector_v); + device d(gpu_selector_v); std::cerr << "GPU Device is found in error: " << std::boolalpha << d.is_gpu() << std::endl; return -1; @@ -46,7 +46,7 @@ int main() { } } { - device d(accelerator_selector_v); + device d(accelerator_selector_v); string name = d.get_platform().get_info(); assert(name.find("OpenCL") != string::npos && "accelerator_selector failed to find acc device"); diff --git a/sycl/test-e2e/FilterSelector/select_device_cpu.cpp b/sycl/test-e2e/FilterSelector/select_device_cpu.cpp index dd54a7535e9d5..5d0294c55d547 100644 --- a/sycl/test-e2e/FilterSelector/select_device_cpu.cpp +++ b/sycl/test-e2e/FilterSelector/select_device_cpu.cpp @@ -36,9 +36,7 @@ int main() { } catch (...) { } } - { - device d(cpu_selector_v); - } + { device d(cpu_selector_v); } { try { device d(accelerator_selector_v);