experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Align the signature of the contraction mappers with that of the implementation

Browse Source 
in upstream Eigen.
Change: 123459390
This commit is contained in:
Benoit Steiner 2016-05-27 13:44:19 -08:00 committed by TensorFlower Gardener
parent 07d92dabed
commit f532fd3cc3
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tensorflow/core/kernels/eigen_spatial_convolutions.h
View File

@ -26,9 +26,8 @@ namespace internal {
// since they are both very similar.
template <typename NewDimension, DenseIndex Rows, DenseIndex Cols,
typename ArgType, typename Device, typename Scalar_, typename Index,
typename nocontract_t, typename contract_t, int Side,
size_t packet_size, bool inner_dim_contiguous,
bool inner_dim_reordered, int Alignment>
typename nocontract_t, typename contract_t, int Side, int packet_size,
bool inner_dim_contiguous, bool inner_dim_reordered, int Alignment>
class TensorContractionInputMapper<
Scalar_, Index, Side,
TensorEvaluator<
@ -456,9 +455,8 @@ class TensorContractionInputMapper<
template <typename NewDimension, DenseIndex Rows, DenseIndex Cols,
typename ArgType, typename Device, typename Scalar, typename Index,
typename nocontract_t, typename contract_t, int Side,
size_t packet_size, bool inner_dim_contiguous,
bool inner_dim_reordered, int Alignment>
typename nocontract_t, typename contract_t, int Side, int packet_size,
bool inner_dim_contiguous, bool inner_dim_reordered, int Alignment>
class TensorContractionSubMapper<
Scalar, Index, Side,
TensorEvaluator<
@ -627,7 +625,7 @@ class TensorContractionSubMapper<
template <typename NewDimension, DenseIndex Rows, DenseIndex Cols,
typename ArgType, typename Device, typename Scalar, typename Index,
typename nocontract_t, typename contract_t, size_t packet_size,
typename nocontract_t, typename contract_t, int packet_size,
bool inner_dim_contiguous, bool inner_dim_reordered, int Alignment,
int nr>
struct gemm_pack_rhs<