From 1c6eafb46b8b3a0fb5dd583ed546588c8869a6be Mon Sep 17 00:00:00 2001
From: Benoit Steiner <benoit.steiner.goog@gmail.com>
Date: Fri, 18 Nov 2016 16:43:27 -0800
Subject: Updated cxx11_tensor_device_sycl to run only on the OpenCL devices
 available on the host

---
 unsupported/test/cxx11_tensor_device_sycl.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'unsupported/test/cxx11_tensor_device_sycl.cpp')

diff --git a/unsupported/test/cxx11_tensor_device_sycl.cpp b/unsupported/test/cxx11_tensor_device_sycl.cpp
index 95da83c6f..a41fd37c2 100644
--- a/unsupported/test/cxx11_tensor_device_sycl.cpp
+++ b/unsupported/test/cxx11_tensor_device_sycl.cpp
@@ -55,8 +55,9 @@ void test_device_exceptions(const Eigen::SyclDevice &sycl_device) {
   sycl_device.deallocate(gpu_data);
 }
 
-template<typename DataType, typename dev_Selector> void sycl_device_test_per_device(dev_Selector s){
-  QueueInterface queueInterface(s);
+template<typename DataType> void sycl_device_test_per_device(const cl::sycl::device& d){
+  std::cout << "Running on " << d.template get_info<cl::sycl::info::device::name>() << std::endl;
+  QueueInterface queueInterface(d);
   auto sycl_device = Eigen::SyclDevice(&queueInterface);
   test_device_memory<DataType, RowMajor>(sycl_device);
   test_device_memory<DataType, ColMajor>(sycl_device);
@@ -67,11 +68,7 @@ template<typename DataType, typename dev_Selector> void sycl_device_test_per_dev
 }
 
 void test_cxx11_tensor_device_sycl() {
-  printf("Test on GPU: OpenCL\n");
-  CALL_SUBTEST(sycl_device_test_per_device<int>((cl::sycl::gpu_selector())));
-  //  printf("repeating the test on CPU: OpenCL\n");
-  //  CALL_SUBTEST(sycl_device_test_per_device<int>((cl::sycl::cpu_selector())));
-  printf("repeating the test on CPU: HOST\n");
-  CALL_SUBTEST(sycl_device_test_per_device<int>((cl::sycl::host_selector())));
-  printf("Test Passed******************\n" );
+  for (const auto& device : cl::sycl::device::get_devices()) {
+    CALL_SUBTEST(sycl_device_test_per_device<float>(device));
+  }
 }
-- 
cgit v1.2.3