From 76b55da15a86ddcfa00f4783c66f9c3156d36549 Mon Sep 17 00:00:00 2001 From: Adam <38704900+grygielski@users.noreply.github.com> Date: Mon, 2 Dec 2019 03:23:55 +0100 Subject: [PATCH] Fix bug in UpdatePadding for int64_t type (#21465) test=develop --- paddle/fluid/operators/conv_op.h | 3 ++- paddle/fluid/operators/pool_op.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/paddle/fluid/operators/conv_op.h b/paddle/fluid/operators/conv_op.h index ad025c4683..30cc31c7dd 100644 --- a/paddle/fluid/operators/conv_op.h +++ b/paddle/fluid/operators/conv_op.h @@ -90,7 +90,8 @@ inline void UpdatePaddingAndDilation(std::vector* paddings, for (int i = 0; i < data_dims.size(); ++i) { T out_size = (data_dims[i] + strides[i] - 1) / strides[i]; T pad_sum = - std::max((out_size - 1) * strides[i] + ksize[i] - data_shape[i], 0); + std::max((out_size - 1) * strides[i] + ksize[i] - data_shape[i], + static_cast(0)); T pad_0 = pad_sum / 2; T pad_1 = pad_sum - pad_0; *(paddings->begin() + i * 2) = pad_0; diff --git a/paddle/fluid/operators/pool_op.h b/paddle/fluid/operators/pool_op.h index c37325459b..2171cb6f8b 100644 --- a/paddle/fluid/operators/pool_op.h +++ b/paddle/fluid/operators/pool_op.h @@ -87,7 +87,8 @@ inline void UpdatePadding(std::vector* paddings, const bool global_pooling, for (int i = 0; i < data_dims.size(); ++i) { T out_size = (data_dims[i] + strides[i] - 1) / strides[i]; T pad_sum = - std::max((out_size - 1) * strides[i] + ksize[i] - data_shape[i], 0); + std::max((out_size - 1) * strides[i] + ksize[i] - data_shape[i], + static_cast(0)); T pad_0 = pad_sum / 2; T pad_1 = pad_sum - pad_0; *(paddings->begin() + i * 2) = pad_0; -- GitLab