From cf16e60340b62d16c3764d71b716fe03d35f87a9 Mon Sep 17 00:00:00 2001 From: Luke Iwanski Date: Wed, 19 Apr 2017 11:46:53 +0100 Subject: [PATCH] [OpenCL] device:SYCL:0 -> sycl:0 --- .../direct_session_with_tracking_alloc_test.cc | 4 ++-- tensorflow/core/common_runtime/memory_types_test.cc | 2 +- tensorflow/core/debug/debug_gateway_test.cc | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tensorflow/core/common_runtime/direct_session_with_tracking_alloc_test.cc b/tensorflow/core/common_runtime/direct_session_with_tracking_alloc_test.cc index 0e2e3644217cd6..7544804d8cf7d0 100644 --- a/tensorflow/core/common_runtime/direct_session_with_tracking_alloc_test.cc +++ b/tensorflow/core/common_runtime/direct_session_with_tracking_alloc_test.cc @@ -157,14 +157,14 @@ static void TestHWAccelerator(bool enableHWTrace) { Node* x = test::graph::Constant(&graph, x_tensor); x->set_assigned_device_name("/job:localhost/replica:0/task:0/gpu:0"); #ifdef TENSORFLOW_USE_SYCL - x->set_assigned_device_name("/job:localhost/replica:0/task:0/device:SYCL:0"); + x->set_assigned_device_name("/job:localhost/replica:0/task:0/sycl:0"); #endif // TENSORFLOW_USE_SYCL // y = A * x Node* y = test::graph::Matmul(&graph, a, x, false, false); y->set_assigned_device_name("/job:localhost/replica:0/task:0/gpu:0"); #ifdef TENSORFLOW_USE_SYCL -y->set_assigned_device_name("/job:localhost/replica:0/task:0/device:SYCL:0"); +y->set_assigned_device_name("/job:localhost/replica:0/task:0/sycl:0"); #endif // TENSORFLOW_USE_SYCL Node* y_neg = test::graph::Unary(&graph, "Neg", y); diff --git a/tensorflow/core/common_runtime/memory_types_test.cc b/tensorflow/core/common_runtime/memory_types_test.cc index 55eade0566cc92..8462162e96dbff 100644 --- a/tensorflow/core/common_runtime/memory_types_test.cc +++ b/tensorflow/core/common_runtime/memory_types_test.cc @@ -62,7 +62,7 @@ TEST(MemoryTypeChecker, Int32NotOk) { EXPECT_TRUE(errors::IsInternal(ValidateMemoryTypes(DEVICE_SYCL, g))); // But we can insert _HostSend/_HostRecv to ensure the invariant. - TF_EXPECT_OK(EnsureMemoryTypes(DEVICE_SYCL, "/device:SYCL:0", g)); + TF_EXPECT_OK(EnsureMemoryTypes(DEVICE_SYCL, "/sycl:0", g)); TF_EXPECT_OK(ValidateMemoryTypes(DEVICE_SYCL, g)); #endif // TENSORFLOW_USE_SYCL delete g; diff --git a/tensorflow/core/debug/debug_gateway_test.cc b/tensorflow/core/debug/debug_gateway_test.cc index b50f6465be0f47..a3a85ce9cbe678 100644 --- a/tensorflow/core/debug/debug_gateway_test.cc +++ b/tensorflow/core/debug/debug_gateway_test.cc @@ -46,7 +46,7 @@ class SessionDebugMinusAXTest : public ::testing::Test { #if GOOGLE_CUDA const string kDeviceName = "/job:localhost/replica:0/task:0/gpu:0"; #elif defined(TENSORFLOW_USE_SYCL) - const string kDeviceName = "/job:localhost/replica:0/task:0/device:SYCL:0"; + const string kDeviceName = "/job:localhost/replica:0/task:0/sycl:0"; #else const string kDeviceName = "/job:localhost/replica:0/task:0/cpu:0"; #endif @@ -504,7 +504,7 @@ class SessionDebugOutputSlotWithoutOngoingEdgeTest : public ::testing::Test { #if GOOGLE_CUDA const string kDeviceName = "/job:localhost/replica:0/task:0/gpu:0"; #elif defined(TENSORFLOW_USE_SYCL) - const string kDeviceName = "/job:localhost/replica:0/task:0/device:SYCL:0"; + const string kDeviceName = "/job:localhost/replica:0/task:0/sycl:0"; #else const string kDeviceName = "/job:localhost/replica:0/task:0/cpu:0"; #endif @@ -606,7 +606,7 @@ class SessionDebugVariableTest : public ::testing::Test { #if GOOGLE_CUDA const string kDeviceName = "/job:localhost/replica:0/task:0/gpu:0"; #elif defined(TENSORFLOW_USE_SYCL) - const string kDeviceName = "/job:localhost/replica:0/task:0/device:SYCL:0"; + const string kDeviceName = "/job:localhost/replica:0/task:0/sycl:0"; #else const string kDeviceName = "/job:localhost/replica:0/task:0/cpu:0"; #endif @@ -874,7 +874,7 @@ class SessionDebugGPUSwitchTest : public ::testing::Test { #ifdef GOOGLE_CUDA const string kDeviceName = "/job:localhost/replica:0/task:0/gpu:0"; #elif TENSORFLOW_USE_SYCL - const string kDeviceName = "/job:localhost/replica:0/task:0/device:SYCL:0"; + const string kDeviceName = "/job:localhost/replica:0/task:0/sycl:0"; #endif Tensor vb(DT_BOOL, TensorShape({}));