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

Fix #1874: workaround MSVC 2017 compilation issue.

Browse Source
This commit is contained in:
Gael Guennebaud 2020-05-15 20:47:32 +02:00
parent 9b411757ab
commit 8ce9630ddb
1 changed files with 83 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
Eigen/src/Core/products/GeneralBlockPanelKernel.h
View File

@ -2682,13 +2682,8 @@ struct gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMo
QuarterPacketSize = unpacket_traits<QuarterPacket>::size, QuarterPacketSize = unpacket_traits<QuarterPacket>::size,
HasHalf = (int)HalfPacketSize < (int)PacketSize, HasHalf = (int)HalfPacketSize < (int)PacketSize,
HasQuarter = (int)QuarterPacketSize < (int)HalfPacketSize }; HasQuarter = (int)QuarterPacketSize < (int)HalfPacketSize };
EIGEN_DONT_INLINE void operator()(Scalar* blockB, const DataMapper& rhs, Index depth, Index cols, Index stride=0, Index offset=0); EIGEN_DONT_INLINE void operator()(Scalar* blockB, const DataMapper& rhs, Index depth, Index cols, Index stride=0, Index offset=0)
}; {
template<typename Scalar, typename Index, typename DataMapper, int nr, bool Conjugate, bool PanelMode>
EIGEN_DONT_INLINE void gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Conjugate, PanelMode>
::operator()(Scalar* blockB, const DataMapper& rhs, Index depth, Index cols, Index stride, Index offset)
{
EIGEN_ASM_COMMENT("EIGEN PRODUCT PACK RHS ROWMAJOR"); EIGEN_ASM_COMMENT("EIGEN PRODUCT PACK RHS ROWMAJOR");
EIGEN_UNUSED_VARIABLE(stride); EIGEN_UNUSED_VARIABLE(stride);
EIGEN_UNUSED_VARIABLE(offset); EIGEN_UNUSED_VARIABLE(offset);
@ -2698,39 +2693,39 @@ EIGEN_DONT_INLINE void gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Co
Index packet_cols4 = nr>=4 ? (cols/4) * 4 : 0; Index packet_cols4 = nr>=4 ? (cols/4) * 4 : 0;
Index count = 0; Index count = 0;
// if(nr>=8) // if(nr>=8)
// { // {
// for(Index j2=0; j2<packet_cols8; j2+=8) // for(Index j2=0; j2<packet_cols8; j2+=8)
// { // {
// // skip what we have before // // skip what we have before
// if(PanelMode) count += 8 * offset; // if(PanelMode) count += 8 * offset;
// for(Index k=0; k<depth; k++) // for(Index k=0; k<depth; k++)
// { // {
// if (PacketSize==8) { // if (PacketSize==8) {
// Packet A = ploadu<Packet>(&rhs[k*rhsStride + j2]); // Packet A = ploadu<Packet>(&rhs[k*rhsStride + j2]);
// pstoreu(blockB+count, cj.pconj(A)); // pstoreu(blockB+count, cj.pconj(A));
// } else if (PacketSize==4) { // } else if (PacketSize==4) {
// Packet A = ploadu<Packet>(&rhs[k*rhsStride + j2]); // Packet A = ploadu<Packet>(&rhs[k*rhsStride + j2]);
// Packet B = ploadu<Packet>(&rhs[k*rhsStride + j2 + PacketSize]); // Packet B = ploadu<Packet>(&rhs[k*rhsStride + j2 + PacketSize]);
// pstoreu(blockB+count, cj.pconj(A)); // pstoreu(blockB+count, cj.pconj(A));
// pstoreu(blockB+count+PacketSize, cj.pconj(B)); // pstoreu(blockB+count+PacketSize, cj.pconj(B));
// } else { // } else {
// const Scalar* b0 = &rhs[k*rhsStride + j2]; // const Scalar* b0 = &rhs[k*rhsStride + j2];
// blockB[count+0] = cj(b0[0]); // blockB[count+0] = cj(b0[0]);
// blockB[count+1] = cj(b0[1]); // blockB[count+1] = cj(b0[1]);
// blockB[count+2] = cj(b0[2]); // blockB[count+2] = cj(b0[2]);
// blockB[count+3] = cj(b0[3]); // blockB[count+3] = cj(b0[3]);
// blockB[count+4] = cj(b0[4]); // blockB[count+4] = cj(b0[4]);
// blockB[count+5] = cj(b0[5]); // blockB[count+5] = cj(b0[5]);
// blockB[count+6] = cj(b0[6]); // blockB[count+6] = cj(b0[6]);
// blockB[count+7] = cj(b0[7]); // blockB[count+7] = cj(b0[7]);
// } // }
// count += 8; // count += 8;
// } // }
// // skip what we have after // // skip what we have after
// if(PanelMode) count += 8 * (stride-offset-depth); // if(PanelMode) count += 8 * (stride-offset-depth);
// } // }
// } // }
if(nr>=4) if(nr>=4)
{ {
for(Index j2=packet_cols8; j2<packet_cols4; j2+=4) for(Index j2=packet_cols8; j2<packet_cols4; j2+=4)
@ -2775,7 +2770,8 @@ EIGEN_DONT_INLINE void gemm_pack_rhs<Scalar, Index, DataMapper, nr, RowMajor, Co
} }
if(PanelMode) count += stride-offset-depth; if(PanelMode) count += stride-offset-depth;
} }
} }
};
} // end namespace internal } // end namespace internal