@@ -2996,14 +2996,14 @@ cc_library(
     srcs = if_not_windows([
         "common_runtime/sycl/sycl_allocator.cc",
         "common_runtime/sycl/sycl_device.cc",
-        "common_runtime/sycl/sycl_device_context.cc",
         "common_runtime/sycl/sycl_device_factory.cc",
+        "common_runtime/sycl/sycl_util.cc",
     ]),
     hdrs = if_not_windows([
         "common_runtime/sycl/sycl_allocator.h",
         "common_runtime/sycl/sycl_device.h",
-        "common_runtime/sycl/sycl_util.h",
         "common_runtime/sycl/sycl_device_context.h",
+        "common_runtime/sycl/sycl_util.h",
     ]),
     copts = tf_copts(),
     linkstatic = 0,
 
@@ -158,8 +158,13 @@ Status SYCLDevice::MakeTensorFromProto(const TensorProto& tensor_proto,
             " and type ", DataTypeString(parsed.dtype()));
       }
 
+      Notification n;
       device_context_->CopyCPUTensorToDevice(
-          &parsed, this, &copy, [&status](const Status& s) { status = s; });
+          &parsed, this, &copy, [&status, &n](const Status& s) {
+            status = s;
+            n.Notify();
+          });
+      n.WaitForNotification();
       *tensor = copy;
     }
     return status;
 
@@ -21,6 +21,7 @@ limitations under the License.
 #define TENSORFLOW_COMMON_RUNTIME_SYCL_SYCL_DEVICE_CONTEXT_H_
 
 #include "tensorflow/core/common_runtime/device.h"
+#include "tensorflow/core/common_runtime/sycl/sycl_util.h"
 #include "tensorflow/core/framework/device_base.h"
 
 namespace tensorflow {
@@ -31,13 +32,18 @@ class SYCLDeviceContext : public DeviceContext {
 
   ~SYCLDeviceContext() override {}
 
-  void CopyCPUTensorToDevice(const Tensor *cpu_tensor, Device *device,
-                             Tensor *device_tensor,
-                             StatusCallback done) const override;
-
-  void CopyDeviceTensorToCPU(const Tensor *device_tensor, StringPiece edge_name,
-                             Device *device, Tensor *cpu_tensor,
-                             StatusCallback done) override;
+  inline void CopyCPUTensorToDevice(const Tensor *cpu_tensor, Device *device,
+                                    Tensor *device_tensor,
+                                    StatusCallback done) const override {
+    SYCLUtil::copyCPUTensorToDevice(device, *cpu_tensor, *device_tensor, done);
+  }
+
+  inline void CopyDeviceTensorToCPU(const Tensor *device_tensor,
+                                    StringPiece,
+                                    Device *device, Tensor *cpu_tensor,
+                                    StatusCallback done) override {
+    SYCLUtil::copyDeviceTensorToCPU(device, *device_tensor, *cpu_tensor, done);
+  }
 };
 
 }  // namespace tensorflow
 
@@ -0,0 +1,64 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifdef TENSORFLOW_USE_SYCL
+
+#include "tensorflow/core/common_runtime/sycl/sycl_util.h"
+#include "tensorflow/core/framework/tensor_reference.h"
+#include "tensorflow/core/lib/core/refcount.h"
+
+namespace tensorflow {
+
+void SYCLUtil::copyCPUTensorToDevice(const Eigen::SyclDevice& sycl_device,
+                                     const Tensor& cpu_tensor,
+                                     Tensor& device_tensor,
+                                     StatusCallback done) {
+  const int64 total_bytes = cpu_tensor.TotalBytes();
+  const void *src_ptr = GetBase(&cpu_tensor);
+  void *dst_ptr = GetBase(&device_tensor);
+  TensorReference input_ref(cpu_tensor);
+  sycl_device.memcpyHostToDevice(dst_ptr, src_ptr, total_bytes,
+                                 [done, input_ref]() {
+    input_ref.Unref();
+    done(Status::OK());
+  });
+}
+
+void SYCLUtil::copyDeviceTensorToCPU(const Eigen::SyclDevice& sycl_device,
+                                     const Tensor& device_tensor,
+                                     Tensor& cpu_tensor,
+                                     StatusCallback done) {
+  const int64 total_bytes = device_tensor.TotalBytes();
+  const void *src_ptr = GetBase(&device_tensor);
+  void *dst_ptr = GetBase(&cpu_tensor);
+  TensorReference input_ref(device_tensor);
+  sycl_device.memcpyDeviceToHost(dst_ptr, src_ptr, total_bytes,
+                                 [done, input_ref]() {
+    input_ref.Unref();
+    done(Status::OK());
+  });
+}
+
+void SYCLUtil::copyDeviceTensorToDevice(const Eigen::SyclDevice& sycl_device,
+                                        const Tensor& src_tensor,
+                                        Tensor& dst_tensor) {
+  const int64 total_bytes = src_tensor.TotalBytes();
+  const void* src_ptr = GetBase(&src_tensor);
+  void* dst_ptr = GetBase(&dst_tensor);
+  sycl_device.memcpy(dst_ptr, src_ptr, total_bytes);
+}
+
+}  // namespace tensorflow
+#endif  // TENSORFLOW_USE_SYCL
Original file line number	Diff line number	Diff line change
@@ -158,8 +158,13 @@ Status SYCLDevice::MakeTensorFromProto(const TensorProto& tensor_proto,
158	158	" and type ", DataTypeString(parsed.dtype()));
159	159	}
160	160
	161	+ Notification n;
161	162	device_context_->CopyCPUTensorToDevice(
162		- &parsed, this, &copy, [&status](const Status& s) { status = s; });
	163	+ &parsed, this, &copy, [&status, &n](const Status& s) {
	164	+ status = s;
	165	+ n.Notify();
	166	+ });
	167	+ n.WaitForNotification();
163	168	*tensor = copy;
164	169	}
165	170	return status;