From ab5db86fe9dbf3f94c46e3ca4b6694d6741bb1d3 Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Tue, 16 Jun 2015 19:52:20 -0700 Subject: Fixed merge conflict --- unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h') 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, Device> switch (op.padding_type()) { case PADDING_VALID: -<<<<<<< local - m_outputRows = std::ceil((m_inputRows - op.patch_rows() + 1.f) / static_cast(m_row_strides)); - m_outputCols = std::ceil((m_inputCols - op.patch_cols() + 1.f) / static_cast(m_col_strides)); -======= m_outputRows = numext::ceil((m_inputRows - op.patch_rows() + 1.f) / static_cast(m_row_strides)); m_outputCols = numext::ceil((m_inputCols - op.patch_cols() + 1.f) / static_cast(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(m_row_strides)); - m_outputCols = std::ceil(m_inputCols / static_cast(m_col_strides)); -======= m_outputRows = numext::ceil(m_inputRows / static_cast(m_row_strides)); m_outputCols = numext::ceil(m_inputCols / static_cast(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; -- cgit v1.2.3