diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2018-08-01 16:13:15 +0000 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2018-08-01 16:13:15 +0000 |
| commit | 0360c36170622c2802af638ef7b946742baf1eda (patch) | |
| tree | 22affab4fa869a1a39c1127cf8d9c262d190f09d /unsupported/Eigen/CXX11/src/Tensor/TensorForcedEval.h | |
| parent | 9ca1c091311db45e0c27e6e7701e58c85f508347 (diff) | |
| parent | c6a5c70712851cd696d7410579506fc299c04a05 (diff) | |
Merged in codeplaysoftware/eigen-upstream-pure/separating_internal_memory_allocation (pull request PR-446)
Distinguishing between internal memory allocation/deallocation from explicit user memory allocation/deallocation.
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorForcedEval.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorForcedEval.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorForcedEval.h b/unsupported/Eigen/CXX11/src/Tensor/TensorForcedEval.h index 5a6555cde..a456f308b 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorForcedEval.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorForcedEval.h @@ -115,7 +115,7 @@ struct TensorEvaluator<const TensorForcedEvalOp<ArgType>, Device> #endif EIGEN_STRONG_INLINE bool evalSubExprsIfNeeded(CoeffReturnType*) { const Index numValues = internal::array_prod(m_impl.dimensions()); - m_buffer = (CoeffReturnType*)m_device.allocate(numValues * sizeof(CoeffReturnType)); + m_buffer = (CoeffReturnType*)m_device.allocate_temp(numValues * sizeof(CoeffReturnType)); // Should initialize the memory in case we're dealing with non POD types. if (NumTraits<CoeffReturnType>::RequireInitialization) { for (Index i = 0; i < numValues; ++i) { @@ -129,7 +129,7 @@ struct TensorEvaluator<const TensorForcedEvalOp<ArgType>, Device> return true; } EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void cleanup() { - m_device.deallocate(m_buffer); + m_device.deallocate_temp(m_buffer); m_buffer = NULL; } |