mirror of
https://gitlab.com/libeigen/eigen.git
synced 2024-12-27 07:29:52 +08:00
Fixed merge conflict
This commit is contained in:
parent
ea160a898c
commit
ab5db86fe9
@ -142,25 +142,15 @@ struct TensorEvaluator<const TensorImagePatchOp<Rows, Cols, ArgType>, Device>
|
|||||||
|
|
||||||
switch (op.padding_type()) {
|
switch (op.padding_type()) {
|
||||||
case PADDING_VALID:
|
case PADDING_VALID:
|
||||||
<<<<<<< local
|
|
||||||
m_outputRows = std::ceil((m_inputRows - op.patch_rows() + 1.f) / static_cast<float>(m_row_strides));
|
|
||||||
m_outputCols = std::ceil((m_inputCols - op.patch_cols() + 1.f) / static_cast<float>(m_col_strides));
|
|
||||||
=======
|
|
||||||
m_outputRows = numext::ceil((m_inputRows - op.patch_rows() + 1.f) / static_cast<float>(m_row_strides));
|
m_outputRows = numext::ceil((m_inputRows - op.patch_rows() + 1.f) / static_cast<float>(m_row_strides));
|
||||||
m_outputCols = numext::ceil((m_inputCols - op.patch_cols() + 1.f) / static_cast<float>(m_col_strides));
|
m_outputCols = numext::ceil((m_inputCols - op.patch_cols() + 1.f) / static_cast<float>(m_col_strides));
|
||||||
>>>>>>> other
|
|
||||||
// Calculate the padding
|
// Calculate the padding
|
||||||
m_rowPaddingTop = ((m_outputRows - 1) * m_row_strides + op.patch_rows() - m_inputRows) / 2;
|
m_rowPaddingTop = ((m_outputRows - 1) * m_row_strides + op.patch_rows() - m_inputRows) / 2;
|
||||||
m_colPaddingLeft = ((m_outputCols - 1) * m_col_strides + op.patch_cols() - m_inputCols) / 2;
|
m_colPaddingLeft = ((m_outputCols - 1) * m_col_strides + op.patch_cols() - m_inputCols) / 2;
|
||||||
break;
|
break;
|
||||||
case PADDING_SAME:
|
case PADDING_SAME:
|
||||||
<<<<<<< local
|
|
||||||
m_outputRows = std::ceil(m_inputRows / static_cast<float>(m_row_strides));
|
|
||||||
m_outputCols = std::ceil(m_inputCols / static_cast<float>(m_col_strides));
|
|
||||||
=======
|
|
||||||
m_outputRows = numext::ceil(m_inputRows / static_cast<float>(m_row_strides));
|
m_outputRows = numext::ceil(m_inputRows / static_cast<float>(m_row_strides));
|
||||||
m_outputCols = numext::ceil(m_inputCols / static_cast<float>(m_col_strides));
|
m_outputCols = numext::ceil(m_inputCols / static_cast<float>(m_col_strides));
|
||||||
>>>>>>> other
|
|
||||||
// Calculate the padding
|
// Calculate the padding
|
||||||
m_rowPaddingTop = ((m_outputRows - 1) * m_row_strides + op.patch_rows() - m_inputRows) / 2;
|
m_rowPaddingTop = ((m_outputRows - 1) * m_row_strides + op.patch_rows() - m_inputRows) / 2;
|
||||||
m_colPaddingLeft = ((m_outputCols - 1) * m_col_strides + op.patch_cols() - m_inputCols) / 2;
|
m_colPaddingLeft = ((m_outputCols - 1) * m_col_strides + op.patch_cols() - m_inputCols) / 2;
|
||||||
|
Loading…
Reference in New Issue
Block a user