Skip to content

Commit

Permalink
[OpenCL] device:SYCL:0 -> sycl:0
Browse files Browse the repository at this point in the history
  • Loading branch information
Luke Iwanski committed Apr 19, 2017
1 parent 09c0ebc commit cf16e60
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/core/common_runtime/memory_types_test.cc
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions tensorflow/core/debug/debug_gateway_test.cc
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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({}));
Expand Down

0 comments on commit cf16e60

Please sign in to comment.