diff options
| author |  Yifei Feng <yifeif@google.com> | 2017-11-22 00:39:22 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-11-22 00:42:30 -0800 |
| commit | e70c00950d295c519fd9c7f8b12e13a3c5aaf710 (patch) | |
| tree | ee1210f8810e0b0fec9346f762e854b371899919 /tensorflow/core/common_runtime | |
| parent | ad7eeec1cc06d7fdba6ee404f03a35fab9cd3e6a (diff) | |
Automated g4 rollback of changelist 176615107
PiperOrigin-RevId: 176622438
Diffstat (limited to 'tensorflow/core/common_runtime')
| -rw-r--r-- | tensorflow/core/common_runtime/mkl_cpu_allocator.h | 2 | ||||
| -rw-r--r-- | tensorflow/core/common_runtime/sycl/sycl_device.h | 22 |
2 files changed, 5 insertions, 19 deletions
diff --git a/tensorflow/core/common_runtime/mkl_cpu_allocator.h b/tensorflow/core/common_runtime/mkl_cpu_allocator.h index 63b74e8dbf..53e80b1ee3 100644 --- a/tensorflow/core/common_runtime/mkl_cpu_allocator.h +++ b/tensorflow/core/common_runtime/mkl_cpu_allocator.h @@ -81,7 +81,7 @@ class MklCPUAllocator : public Allocator { } #if defined(_SC_PHYS_PAGES) && defined(_SC_PAGESIZE) if (user_val > max_mem_bytes) { - LOG(WARNING) << "The user specified a memory limit " << kMaxLimitStr + LOG(WARNING) << "The user specifed a memory limit " << kMaxLimitStr << "=" << user_val << " greater than available physical memory: " << max_mem_bytes diff --git a/tensorflow/core/common_runtime/sycl/sycl_device.h b/tensorflow/core/common_runtime/sycl/sycl_device.h index cc272d156e..9caa076c72 100644 --- a/tensorflow/core/common_runtime/sycl/sycl_device.h +++ b/tensorflow/core/common_runtime/sycl/sycl_device.h @@ -46,8 +46,8 @@ class GSYCLInterface { if (!found_device) { // Currently Intel GPU is not supported - LOG(WARNING) << "No OpenCL GPU found that is supported by " - << "ComputeCpp/triSYCL, trying OpenCL CPU"; + LOG(WARNING) << "No OpenCL GPU found that is supported by ComputeCpp, " + "trying OpenCL CPU"; } for (const auto& device : device_list) { @@ -59,23 +59,9 @@ class GSYCLInterface { } if (!found_device) { - LOG(WARNING) << "No OpenCL CPU found that is supported by " - << "ComputeCpp/triSYCL, checking for host sycl device"; - } - - for (const auto& device : device_list) { - // triSYCL only supports the host device for now - if (device.is_host()) { - LOG(WARNING) << "Found SYCL host device"; - AddDevice(device); - found_device = true; - } - } - - if (!found_device) { // Currently Intel GPU is not supported - LOG(FATAL) << "No SYCL host and no OpenCL GPU nor CPU" - << " supported by ComputeCPP/triSYCL was found"; + LOG(FATAL) + << "No OpenCL GPU nor CPU found that is supported by ComputeCpp"; } else { LOG(INFO) << "Found following OpenCL devices:"; for (int i = 0; i < device_list.size(); i++) { |