diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-05-03 13:15:00 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-05-03 13:15:00 -0700 |
| commit | 4c05fb03a3c9728b2db9da1ca986ef5103fcdec8 (patch) | |
| tree | 75c73864384cdbf6e26cdacd7ffcf71b395be263 /unsupported/Eigen/CXX11/src/Tensor/TensorContractionMapper.h | |
| parent | 577a07a86e521e8d1a3d63a98621649f73c44c42 (diff) | |
| parent | 2c5568a757e75b1e8dd6b8754ea3d13a95be96ce (diff) | |
Merged eigen/eigen into default
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorContractionMapper.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorContractionMapper.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorContractionMapper.h b/unsupported/Eigen/CXX11/src/Tensor/TensorContractionMapper.h index 392cb6e3d..b27e1a1b4 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorContractionMapper.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorContractionMapper.h @@ -16,7 +16,7 @@ namespace internal { enum { Rhs = 0, - Lhs = 1, + Lhs = 1 }; /* @@ -233,7 +233,7 @@ class BaseTensorContractionMapper : public SimpleTensorContractionMapper<Scalar, typedef typename Tensor::PacketReturnType Packet; typedef typename unpacket_traits<Packet>::half HalfPacket; - template <int AlignmentType = Alignment> + template <int AlignmentType> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Packet loadPacket(Index i, Index j) const { // whole method makes column major assumption @@ -276,7 +276,7 @@ class BaseTensorContractionMapper : public SimpleTensorContractionMapper<Scalar, return pload<Packet>(data); } - template <int AlignmentType = Alignment> + template <int AlignmentType> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE HalfPacket loadHalfPacket(Index i, Index j) const { // whole method makes column major assumption |