From 81151bd47489f39dedc3e9faa32679740c98bf01 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <benoit.steiner.goog@gmail.com>
Date: Sat, 19 Nov 2016 19:12:59 -0800
Subject: [PATCH] Fixed merge conflicts

---
 Eigen/Core                                            | 4 ----
 unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Eigen/Core b/Eigen/Core
index a9a082782..444c1c8d7 100644
--- a/Eigen/Core
+++ b/Eigen/Core
@@ -47,10 +47,6 @@
   #define EIGEN_DEVICE_FUNC
 #endif
 
-#if defined(EIGEN_USE_SYCL)
-  #define EIGEN_DONT_VECTORIZE
-#endif
-
 // When compiling CUDA device code with NVCC, pull in math functions from the
 // global namespace.  In host mode, and when device doee with clang, use the
 // std versions.
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h
index 3fe0219ac..5d5ddfcb7 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h
@@ -94,6 +94,10 @@ struct QueueInterface {
     }
   }
 
+  EIGEN_STRONG_INLINE void deallocate_all() const {
+    buffer_map.clear;
+  }
+
   EIGEN_STRONG_INLINE std::map<const uint8_t *, cl::sycl::buffer<uint8_t,1>>::iterator find_buffer(const void* ptr) const {
     auto it1 = buffer_map.find(static_cast<const uint8_t*>(ptr));
     if (it1 != buffer_map.end()){