diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-06-16 19:52:20 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-06-16 19:52:20 -0700 |
| commit | ab5db86fe9dbf3f94c46e3ca4b6694d6741bb1d3 (patch) | |
| tree | 3c6cf787223fba43bb008e86f59dffb7c5437f6f /unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h | |
| parent | ea160a898cdea65387827c8f24aa6c872f831625 (diff) | |
Fixed merge conflict
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h b/unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h index 313144846..478696c65 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h @@ -142,25 +142,15 @@ struct TensorEvaluator<const TensorImagePatchOp<Rows, Cols, ArgType>, Device> switch (op.padding_type()) { 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_outputCols = numext::ceil((m_inputCols - op.patch_cols() + 1.f) / static_cast<float>(m_col_strides)); ->>>>>>> other // Calculate the padding 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; break; 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_outputCols = numext::ceil(m_inputCols / static_cast<float>(m_col_strides)); ->>>>>>> other // Calculate the padding 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; |