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 | |
| parent | 81b38a155adf5d527bce5c84cf90cd83c28da445 (diff) | |
| parent | 4827bec7768e5b58fb2e001d6c1360373d6dd0c2 (diff) | |
Merge with upstream eigen/default
Diffstat (limited to 'unsupported/Eigen/CXX11/src')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h | 2 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h | 4 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/src/util/EmulateCXX11Meta.h | 2 |
3 files changed, 4 insertions, 4 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()) { diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h b/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h index ce91bc2a6..7c26b1682 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h @@ -194,7 +194,7 @@ template <std::ptrdiff_t V1=0, std::ptrdiff_t V2=0, std::ptrdiff_t V3=0, std::pt } #endif - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE DenseIndex operator[] (const int index) const { + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Index operator[] (const Index index) const { switch (index) { case 0: return internal::get<0, Base>::value; @@ -208,7 +208,7 @@ template <std::ptrdiff_t V1=0, std::ptrdiff_t V2=0, std::ptrdiff_t V3=0, std::pt return internal::get<4, Base>::value; default: eigen_assert(false && "index overflow"); - return static_cast<DenseIndex>(-1); + return static_cast<Index>(-1); } } diff --git a/unsupported/Eigen/CXX11/src/util/EmulateCXX11Meta.h b/unsupported/Eigen/CXX11/src/util/EmulateCXX11Meta.h index f3aa1b144..8a536faf6 100644 --- a/unsupported/Eigen/CXX11/src/util/EmulateCXX11Meta.h +++ b/unsupported/Eigen/CXX11/src/util/EmulateCXX11Meta.h @@ -188,7 +188,7 @@ EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE t array_prod(const array<t, n>& a) { } template<typename t> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE t array_prod(const array<t, 0>& /*a*/) { - return 0; + return 1; } template<typename t> |