diff --git a/paddle/fluid/operators/conv_shift_op.cc b/paddle/fluid/operators/conv_shift_op.cc index 5fc70f4017b81b03bf4e91847121fecb521b253e..e7af908eba2c5dac72392cde42f9ebae9f18fad8 100644 --- a/paddle/fluid/operators/conv_shift_op.cc +++ b/paddle/fluid/operators/conv_shift_op.cc @@ -38,24 +38,24 @@ class ConvShiftOp : public framework::OperatorWithKernel { PADDLE_ENFORCE_EQ( x_dims.size(), 2, platform::errors::InvalidArgument( - "Input(X)'s dimensions of ConvShiftOp should be 2." + "Input(X)'s dimensions of ConvShiftOp should be 2. " "But received X's shape = [%s] and the dimension is %d.", x_dims, x_dims.size())); PADDLE_ENFORCE_EQ( y_dims.size(), 2, platform::errors::InvalidArgument( - "Input(Y)'s dimensions of ConvShiftOp should be 2.", - "But received Y's shape = [%s] and the dimension is %d.", y_dims, - y_dims.size())); + "Input(Y)'s dimensions of ConvShiftOp should be 2. " + "But received Y's shape = [%s] and the dimension is %d.", + y_dims, y_dims.size())); if (ctx->IsRuntime() || (x_dims[0] > 0 && y_dims[0] > 0)) PADDLE_ENFORCE_EQ( x_dims[0], y_dims[0], platform::errors::InvalidArgument( - "The first dimension of Input(X) and Input(Y) of ConvShiftOp ", - "should be equal.", - "But received X's shape = [%s], Y's shape = [%s],", - "and the first dimensions are %d and %d respectively.", x_dims, - y_dims, x_dims[0], y_dims[0])); + "The first dimension of Input(X) and Input(Y) of ConvShiftOp " + "should be equal. " + "But received X's shape = [%s], Y's shape = [%s], " + "and the first dimensions are %d and %d respectively.", + x_dims, y_dims, x_dims[0], y_dims[0])); if (ctx->IsRuntime() || y_dims[1] > 0) PADDLE_ENFORCE_EQ( y_dims[1] % 2, 1, @@ -68,11 +68,10 @@ class ConvShiftOp : public framework::OperatorWithKernel { y_dims[1], x_dims[1], platform::errors::InvalidArgument( "The second dimension of Input(Y) of ConvShiftOp should be less " - "than or " - "equal to the 2nd dimension of Input(X)." - "But received X's shape = [%s], Y's shape = [%s],", - "and the second dimensions are %d and %d respectively.", x_dims, - y_dims, x_dims[1], y_dims[1])); + "than or equal to the 2nd dimension of Input(X)." + "But received X's shape = [%s], Y's shape = [%s], " + "and the second dimensions are %d and %d respectively.", + x_dims, y_dims, x_dims[1], y_dims[1])); ctx->ShareDim("X", /*->*/ "Out"); ctx->ShareLoD("X", /*->*/ "Out"); } diff --git a/paddle/fluid/operators/sample_logits_op.cc b/paddle/fluid/operators/sample_logits_op.cc index ecf09203e75de7cc675bc6906d0dc380a40ad5f8..8553af72f253721082ea7e5cd2b1bd57f7178574 100644 --- a/paddle/fluid/operators/sample_logits_op.cc +++ b/paddle/fluid/operators/sample_logits_op.cc @@ -135,12 +135,12 @@ class SampleLogitsOp : public framework::OperatorWithKernel { PADDLE_ENFORCE_EQ(logits_dims.size(), 2UL, platform::errors::InvalidArgument( - "Input(Logits) of SampleLogitsOp should be 2D.", + "Input(Logits) of SampleLogitsOp should be 2D. " "But received shape = [%s] and dimension is %d.", logits_dims, logits_dims.size())); PADDLE_ENFORCE_EQ(labels_dims.size(), 2UL, platform::errors::InvalidArgument( - "Input(Labels) of SampleLogitsOp should be 2D.", + "Input(Labels) of SampleLogitsOp should be 2D. " "But received shape = [%s] and dimension is %d.", labels_dims, labels_dims.size())); @@ -198,15 +198,15 @@ class SampleLogitsOpGrad : public framework::OperatorWithKernel { PADDLE_ENFORCE_EQ( logits_dims.size(), 2UL, platform::errors::InvalidArgument( - "Input(LogitsDim) of SampleLogitsOpGrad should be 2D.", - "But received shape = [%s] and dimension is %d.", logits_dims, - logits_dims.size())); + "Input(LogitsDim) of SampleLogitsOpGrad should be 2D. " + "But received shape = [%s] and dimension is %d.", + logits_dims, logits_dims.size())); PADDLE_ENFORCE_EQ( labels_dims.size(), 2UL, platform::errors::InvalidArgument( - "Input(LabelsDim) of SampleLogitsOpGrad should be 2D.", - "But received shape = [%s] and dimension is %d.", labels_dims, - labels_dims.size())); + "Input(LabelsDim) of SampleLogitsOpGrad should be 2D. " + "But received shape = [%s] and dimension is %d.", + labels_dims, labels_dims.size())); ctx->SetOutputDim(framework::GradVarName("Logits"), logits_dims); } diff --git a/paddle/fluid/operators/sample_logits_op.h b/paddle/fluid/operators/sample_logits_op.h index 200d066d5d76ec2b3521ac5713188f2760c0161c..872eb341d49d5bfbf3451dd96b05a1f1421fbdad 100644 --- a/paddle/fluid/operators/sample_logits_op.h +++ b/paddle/fluid/operators/sample_logits_op.h @@ -59,27 +59,27 @@ static void CPUTakeAlongD1(const platform::DeviceContext& ctx, const auto idx_dims = index.dims(); PADDLE_ENFORCE_EQ(idx_dims.size(), 2, platform::errors::InvalidArgument( - "index of CPUTakeAlongD1 should be 2D.", + "index of CPUTakeAlongD1 should be 2D. " "But received shape = [%s] and dimension is %d.", idx_dims, idx_dims.size())); PADDLE_ENFORCE_EQ(array_dims.size(), 2, platform::errors::InvalidArgument( - "array of CPUTakeAlongD1 should be 2D.", + "array of CPUTakeAlongD1 should be 2D. " "But received shape = [%s] and dimension is %d.", array_dims, array_dims.size())); PADDLE_ENFORCE_EQ(idx_dims[0], array_dims[0], platform::errors::InvalidArgument( - "The first dimension of index and array of ", - "CPUTakeAlongD1 should be equal.", - "But received index shape = [%s], array shape = [%s],", - "and the first dimensions are %d and %d.", idx_dims, - array_dims, idx_dims[0], array_dims[0])); + "The first dimension of index and array of " + "CPUTakeAlongD1 should be equal. " + "But received index shape = [%s], array shape = [%s], " + "and the first dimensions are %d and %d.", + idx_dims, array_dims, idx_dims[0], array_dims[0])); PADDLE_ENFORCE_EQ( idx_dims, value->dims(), platform::errors::InvalidArgument( - "index and array of CPUTakeAlongD1 should have ", "the same shape.", - "But received index shape = [%s], array shape = [%s].", idx_dims, - value->dims())); + "index and array of CPUTakeAlongD1 should have the same shape. " + "But received index shape = [%s], array shape = [%s].", + idx_dims, value->dims())); // UNDERSTAND: no allocations here const T* p_array = array.data(); @@ -119,27 +119,27 @@ static void CPUPutAlongD1(const platform::DeviceContext& ctx, auto idx_dims = index.dims(); PADDLE_ENFORCE_EQ(idx_dims.size(), 2, platform::errors::InvalidArgument( - "index of CPUPutAlongD1 should be 2D.", + "index of CPUPutAlongD1 should be 2D. " "But received shape = [%s] and dimension is %d.", idx_dims, idx_dims.size())); PADDLE_ENFORCE_EQ(array_dims.size(), 2, platform::errors::InvalidArgument( - "array of CPUPutAlongD1 should be 2D.", + "array of CPUPutAlongD1 should be 2D. " "But received shape = [%s] and dimension is %d.", array_dims, array_dims.size())); PADDLE_ENFORCE_EQ(idx_dims[0], array_dims[0], platform::errors::InvalidArgument( - "The first dimension of index and array of ", - "CPUPutAlongD1 should be equal.", - "But received index shape = [%s], array shape = [%s],", - "and the first dimensions are %d and %d.", idx_dims, - array_dims, idx_dims[0], array_dims[0])); + "The first dimension of index and array of " + "CPUPutAlongD1 should be equal. " + "But received index shape = [%s], array shape = [%s], " + "and the first dimensions are %d and %d.", + idx_dims, array_dims, idx_dims[0], array_dims[0])); PADDLE_ENFORCE_EQ( idx_dims, value.dims(), platform::errors::InvalidArgument( - "index and array of CPUPutAlongD1 should have ", "the same shape.", - "But received index shape = [%s], array shape = [%s].", idx_dims, - value.dims())); + "index and array of CPUPutAlongD1 should have the same shape. " + "But received index shape = [%s], array shape = [%s].", + idx_dims, value.dims())); // UNDERSTAND: no allocations here T* p_array = array->data(); diff --git a/paddle/fluid/operators/squared_l2_distance_op.cc b/paddle/fluid/operators/squared_l2_distance_op.cc index 5ee5ffc21789c885711c61796d02cb379a348cb7..61fd8d3b7cd888b49ec0046afbe49c63215a61ee 100644 --- a/paddle/fluid/operators/squared_l2_distance_op.cc +++ b/paddle/fluid/operators/squared_l2_distance_op.cc @@ -36,21 +36,22 @@ class SquaredL2DistanceOp : public framework::OperatorWithKernel { auto x_dims = ctx->GetInputDim("X"); auto y_dims = ctx->GetInputDim("Y"); - PADDLE_ENFORCE_EQ( - framework::arity(x_dims), framework::arity(y_dims), - platform::errors::InvalidArgument( - "Input(X) and Input(X) of SquaredL2DistanceOp should ", - "have same dimensions.", - "But received X's shape = [%s] and Y's shape = [%s],", - "the dimensions are %d and %d respectively", x_dims, y_dims, - framework::arity(x_dims), framework::arity(y_dims))); + PADDLE_ENFORCE_EQ(framework::arity(x_dims), framework::arity(y_dims), + platform::errors::InvalidArgument( + "Input(X) and Input(X) of SquaredL2DistanceOp should " + "have same dimensions. " + "But received X's shape = [%s] and Y's shape = [%s], " + "the dimensions are %d and %d respectively", + x_dims, y_dims, framework::arity(x_dims), + framework::arity(y_dims))); int rank = framework::arity(x_dims); PADDLE_ENFORCE_GE( rank, 2, platform::errors::InvalidArgument( - "Input dimensions of SquaredL2DistanceOp should be ", "at least 2.", - "But received shape = [%s] and dimension is %d.", x_dims, rank)); + "Input dimensions of SquaredL2DistanceOp should be at least 2." + "But received shape = [%s] and dimension is %d.", + x_dims, rank)); bool check = true; if ((!ctx->IsRuntime()) && (framework::product(x_dims) <= 0 || framework::product(y_dims) <= 0)) { @@ -60,11 +61,12 @@ class SquaredL2DistanceOp : public framework::OperatorWithKernel { PADDLE_ENFORCE_EQ( product(x_dims) / x_dims[0], product(y_dims) / y_dims[0], platform::errors::InvalidArgument( - "Input(X) and Input(Y) of SquaredL2DistanceOp should ", - "have same dimensions.", - "But received X's shape = [%s] and Y's shape = [%s]", - ", the products are %d and %d respectively", x_dims, y_dims, - product(x_dims) / x_dims[0], product(y_dims) / y_dims[0])); + "Input(X) and Input(Y) of SquaredL2DistanceOp should " + "have same dimensions." + "But received X's shape = [%s] and Y's shape = [%s]" + ", the products are %d and %d respectively", + x_dims, y_dims, product(x_dims) / x_dims[0], + product(y_dims) / y_dims[0])); } check = true; if ((!ctx->IsRuntime()) && (y_dims[0] <= 0 || x_dims[0] <= 0)) { @@ -74,11 +76,11 @@ class SquaredL2DistanceOp : public framework::OperatorWithKernel { PADDLE_ENFORCE_EQ( y_dims[0] == 1 || y_dims[0] == x_dims[0], true, platform::errors::InvalidArgument( - "First dimension of Input(Y) of SquaredL2DistanceOp ", - "must be equal to 1", "or to first dimension of Input(X).", - "But received X's shape = [%s] and Y's shape = [%s],", - "the first dimensions are %d and %d respectively", x_dims, y_dims, - x_dims[0], y_dims[0])); + "First dimension of Input(Y) of SquaredL2DistanceOp " + "must be equal to 1 or to first dimension of Input(X)." + "But received X's shape = [%s] and Y's shape = [%s]," + "the first dimensions are %d and %d respectively", + x_dims, y_dims, x_dims[0], y_dims[0])); } ctx->SetOutputDim("sub_result", {x_dims[0], product(x_dims) / x_dims[0]}); ctx->SetOutputDim("Out", {x_dims[0], 1}); @@ -152,17 +154,18 @@ class SquaredL2DistanceGradOp : public framework::OperatorWithKernel { PADDLE_ENFORCE_EQ( out_dims[0], x_dims[0], platform::errors::InvalidArgument( - "First dimension of output gradient and Input(X) ", - "of SquaredL2DistanceGradOp must be equal", - "But received X's shape = [%s] and grad's shape = [%s],", - "the first dimensions are %d and %d respectively", x_dims, - out_dims, x_dims[0], out_dims[0])); + "First dimension of output gradient and Input(X) " + "of SquaredL2DistanceGradOp must be equal " + "But received X's shape = [%s] and grad's shape = [%s], " + "the first dimensions are %d and %d respectively", + x_dims, out_dims, x_dims[0], out_dims[0])); PADDLE_ENFORCE_EQ(out_dims[1], 1, platform::errors::InvalidArgument( - "Second dimension of output gradient of ", - "SquaredL2DistanceGradOp must be 1." - "But received grad's shape = [%s],", - "with first dimensions %d", out_dims, out_dims[1])); + "Second dimension of output gradient of " + "SquaredL2DistanceGradOp must be 1. " + "But received grad's shape = [%s], " + "with second dimension %d", + out_dims, out_dims[1])); } auto x_grad_name = framework::GradVarName("X"); auto y_grad_name = framework::GradVarName("Y");