From 8160a66193bbfa8f37c402a6abc57c118d5222b8 Mon Sep 17 00:00:00 2001 From: dengkaipeng Date: Thu, 28 Mar 2019 05:34:44 +0000 Subject: [PATCH] fix doc priority. test=develop --- paddle/fluid/operators/interpolate_op.cc | 1 - python/paddle/fluid/layers/nn.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/paddle/fluid/operators/interpolate_op.cc b/paddle/fluid/operators/interpolate_op.cc index fce63d00b0e..7ad3314e8b0 100644 --- a/paddle/fluid/operators/interpolate_op.cc +++ b/paddle/fluid/operators/interpolate_op.cc @@ -38,7 +38,6 @@ class InterpolateOp : public framework::OperatorWithKernel { auto dim_x = ctx->GetInputDim("X"); // NCHW format PADDLE_ENFORCE_EQ(dim_x.size(), 4, "X's dimension must be 4"); - // priority: OutSize > scale > out_h/out_w int out_h, out_w; float scale = ctx->Attrs().Get("scale"); if (scale > 0) { diff --git a/python/paddle/fluid/layers/nn.py b/python/paddle/fluid/layers/nn.py index 12917789691..f62ae2a3bc6 100644 --- a/python/paddle/fluid/layers/nn.py +++ b/python/paddle/fluid/layers/nn.py @@ -7058,7 +7058,7 @@ def image_resize(input, Default: None scale(float|None): The multiplier for the input height or width. At least one of :attr:`out_shape` or :attr:`scale`` must be set. - And :attr:`scale` has a higher priority than :attr:`out_shape`. + And :attr:`out_shape` has a higher priority than :attr:`scale`. Default: None. name(str|None): A name for this layer(optional). If set None, the layer will be named automatically. @@ -7239,7 +7239,7 @@ def resize_bilinear(input, scale(float|None): The multiplier for the input height or width. At least one of :attr:`out_shape` or :attr:`scale`` must be set. - And :attr:`scale` has a higher priority than :attr:`out_shape`. + And :attr:`out_shape` has a higher priority than :attr:`scale`. Default: None. name(str|None): The output variable name. @@ -7331,7 +7331,7 @@ def resize_nearest(input, scale(float|None): The multiplier for the input height or width. At least one of :attr:`out_shape` or :attr:`scale`` must be set. - And :attr:`scale` has a higher priority than :attr:`out_shape`. + And :attr:`out_shape` has a higher priority than :attr:`scale`. Default: None. name(str|None): The output variable name. -- GitLab