diff options
| author |  Eugene Zhulenev <ezhulenev@google.com> | 2018-09-11 13:33:06 -0700 |
|---|---|---|
| committer | Eugene Zhulenev <ezhulenev@google.com> | 2018-09-11 13:33:06 -0700 |
| commit | 55bb7e7935a1a1412fcc76bd8f7a16b836ee4021 (patch) | |
| tree | e1bffcb2a0055607c5678316fd4c940216c96de8 /unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h | |
| parent | 81b38a155adf5d527bce5c84cf90cd83c28da445 (diff) | |
| parent | 4827bec7768e5b58fb2e001d6c1360373d6dd0c2 (diff) | |
Merge with upstream eigen/default
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h b/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h index 13da36257..ee70d1d76 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h @@ -79,7 +79,7 @@ struct TensorOpResourceRequirements { }; // Tries to merge multiple resource requirements. -EIGEN_STRONG_INLINE void MergeResourceRequirements( +EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void MergeResourceRequirements( const std::vector<TensorOpResourceRequirements>& resources, TensorBlockShapeType* block_shape, Index* block_total_size) { if (resources.empty()) { |