GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-15 13:15:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Benoit Steiner 2016-11-19 19:12:59 -08:00
parent 2d1aec15a7
commit 81151bd474
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Eigen/Core
View File

@ -47,10 +47,6 @@
#define EIGEN_DEVICE_FUNC #define EIGEN_DEVICE_FUNC
#endif #endif
#if defined(EIGEN_USE_SYCL)
#define EIGEN_DONT_VECTORIZE
#endif
// When compiling CUDA device code with NVCC, pull in math functions from the // 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 // global namespace. In host mode, and when device doee with clang, use the
// std versions. // std versions.

4
unsupported/Eigen/CXX11/src/Tensor/TensorDeviceSycl.h
View File

@ -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 { 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)); auto it1 = buffer_map.find(static_cast<const uint8_t*>(ptr));
if (it1 != buffer_map.end()){ if (it1 != buffer_map.end()){