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

Made the code compile with gcc 5.4.

Browse Source
This commit is contained in:
Benoit Steiner 2018-08-10 11:32:58 -07:00
parent bfc5091dd5
commit 4be4286224
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h
View File

@ -60,7 +60,7 @@ struct cond<RowMajor> {
* - kSkewedInnerDims: 100 blocks of size 100x1 (or 1x100 depending on a column * - kSkewedInnerDims: 100 blocks of size 100x1 (or 1x100 depending on a column
* or row major layout) * or row major layout)
*/ */
enum class TensorBlockShapeType { enum TensorBlockShapeType {
kUniformAllDims, kUniformAllDims,
kSkewedInnerDims, kSkewedInnerDims,
}; };
@ -152,11 +152,11 @@ struct TensorBlockCopyOp {
const Scalar* src_base = &src_data[src_index]; const Scalar* src_base = &src_data[src_index];
Scalar* dst_base = &dst_data[dst_index]; Scalar* dst_base = &dst_data[dst_index];
using Src = const Eigen::Array<Scalar, Dynamic, 1>; typedef const Eigen::Array<Scalar, Dynamic, 1> Src;
using Dst = Eigen::Array<Scalar, Dynamic, 1>; typedef Eigen::Array<Scalar, Dynamic, 1> Dst;
using SrcMap = Eigen::Map<Src, 0, InnerStride<>>; typedef Eigen::Map<Src, 0, InnerStride<>> SrcMap;
using DstMap = Eigen::Map<Dst, 0, InnerStride<>>; typedef Eigen::Map<Dst, 0, InnerStride<>> DstMap;
const SrcMap src(src_base, num_coeff_to_copy, InnerStride<>(src_stride)); const SrcMap src(src_base, num_coeff_to_copy, InnerStride<>(src_stride));
DstMap dst(dst_base, num_coeff_to_copy, InnerStride<>(dst_stride)); DstMap dst(dst_base, num_coeff_to_copy, InnerStride<>(dst_stride));
@ -401,13 +401,13 @@ struct TensorBlockCwiseBinaryOp {
const StorageIndex left_stride, const LeftScalar* left_data, const StorageIndex left_stride, const LeftScalar* left_data,
const StorageIndex right_index, const StorageIndex right_stride, const StorageIndex right_index, const StorageIndex right_stride,
const RightScalar* right_data) { const RightScalar* right_data) {
using Lhs = const Eigen::Array<LeftScalar, Dynamic, 1>; typedef const Eigen::Array<LeftScalar, Dynamic, 1> Lhs;
using Rhs = const Eigen::Array<RightScalar, Dynamic, 1>; typedef const Eigen::Array<RightScalar, Dynamic, 1> Rhs;
using Out = Eigen::Array<OutputScalar, Dynamic, 1>; typedef Eigen::Array<OutputScalar, Dynamic, 1> Out;
using LhsMap = Eigen::Map<Lhs, 0, InnerStride<>>; typedef Eigen::Map<Lhs, 0, InnerStride<>> LhsMap;
using RhsMap = Eigen::Map<Rhs, 0, InnerStride<>>; typedef Eigen::Map<Rhs, 0, InnerStride<>> RhsMap;
using OutMap = Eigen::Map<Out, 0, InnerStride<>>; typedef Eigen::Map<Out, 0, InnerStride<>> OutMap;
const LeftScalar* lhs_base = &left_data[left_index]; const LeftScalar* lhs_base = &left_data[left_index];
const RightScalar* rhs_base = &right_data[right_index]; const RightScalar* rhs_base = &right_data[right_index];