diff options
author | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-11-19 19:12:59 -0800 |
---|---|---|
committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-11-19 19:12:59 -0800 |
commit | 81151bd47489f39dedc3e9faa32679740c98bf01 (patch) | |
tree | 6267763cda50098b09da74c0d09d2e07c204d394 /unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h | |
parent | 2d1aec15a7b95a6369c73fdebcab59603fa6515a (diff) |
Fixed merge conflicts
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h')
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h | 4 |
1 files changed, 4 insertions, 0 deletions
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()){ |