From 42189be67be65cfc8db3ba17cc1ffa8df90bf205 Mon Sep 17 00:00:00 2001
From: cc <52520497+juncaipeng@users.noreply.github.com>
Date: Wed, 29 Jul 2020 19:58:33 +0800
Subject: [PATCH] [Quant] Remove the output for moving_average_abs_max_scale op
 (#25697)

* Remove the output for moving_average_abs_max_scale op, test=develop
---
 paddle/fluid/operators/fake_quantize_op.cc                  | 6 ------
 paddle/fluid/operators/fake_quantize_op.h                   | 3 ---
 .../fluid/contrib/slim/quantization/quantization_pass.py    | 4 +---
 .../paddle/fluid/tests/unittests/test_fake_quantize_op.py   | 1 -
 4 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/paddle/fluid/operators/fake_quantize_op.cc b/paddle/fluid/operators/fake_quantize_op.cc
index 16a32a3f6c..358f122c83 100644
--- a/paddle/fluid/operators/fake_quantize_op.cc
+++ b/paddle/fluid/operators/fake_quantize_op.cc
@@ -447,8 +447,6 @@ class MovingAverageAbsMaxScaleOp : public framework::OperatorWithKernel {
   void InferShape(framework::InferShapeContext* ctx) const override {
     OP_INOUT_CHECK(ctx->HasInput("X"), "Input", "X",
                    "MovingAverageAbsMaxScale");
-    OP_INOUT_CHECK(ctx->HasOutput("Out"), "Output", "Out",
-                   "MovingAverageAbsMaxScale");
     OP_INOUT_CHECK(ctx->HasOutput("OutScale"), "Output", "OutScale",
                    "MovingAverageAbsMaxScale");
     if (ctx->HasOutput("OutState")) {
@@ -457,9 +455,7 @@ class MovingAverageAbsMaxScaleOp : public framework::OperatorWithKernel {
     if (ctx->HasOutput("OutAccum")) {
       ctx->SetOutputDim("OutAccum", {1});
     }
-    ctx->SetOutputDim("Out", ctx->GetInputDim("X"));
     ctx->SetOutputDim("OutScale", {1});
-    ctx->ShareLoD("X", /*->*/ "Out");
   }
 
  protected:
@@ -477,8 +473,6 @@ class MovingAverageAbsMaxScaleOpMaker
     AddInput("X", "(Tensor) Input is float data type.");
     AddInput("InAccum", "Last accum.").AsDispensable();
     AddInput("InState", "Last state.").AsDispensable();
-    AddOutput("Out",
-              "(Tensor) Output tensor is just equivalent to the input tensor.");
     AddOutput("OutScale", " Current scale");
     AddOutput("OutState", "(Tensor) state buffer.").AsDispensable();
     AddOutput("OutAccum", "(Tensor) accum buffer.").AsDispensable();
diff --git a/paddle/fluid/operators/fake_quantize_op.h b/paddle/fluid/operators/fake_quantize_op.h
index fa5048852e..4136217fb0 100644
--- a/paddle/fluid/operators/fake_quantize_op.h
+++ b/paddle/fluid/operators/fake_quantize_op.h
@@ -277,10 +277,7 @@ class MovingAverageAbsMaxScaleKernel : public framework::OpKernel<T> {
  public:
   void Compute(const framework::ExecutionContext& context) const override {
     auto* in = context.Input<framework::Tensor>("X");
-    auto* out = context.Output<framework::Tensor>("Out");
-    out->mutable_data<T>(context.GetPlace());
     auto& dev_ctx = context.template device_context<DeviceContext>();
-    framework::TensorCopy(*in, context.GetPlace(), dev_ctx, out);
 
     bool is_test = context.Attr<bool>("is_test");
     // testing
diff --git a/python/paddle/fluid/contrib/slim/quantization/quantization_pass.py b/python/paddle/fluid/contrib/slim/quantization/quantization_pass.py
index c36cd1f74e..51add2449f 100644
--- a/python/paddle/fluid/contrib/slim/quantization/quantization_pass.py
+++ b/python/paddle/fluid/contrib/slim/quantization/quantization_pass.py
@@ -1449,7 +1449,6 @@ class OutScaleForTrainingPass(object):
         for op in target_ops:
             for output_var_name in _get_op_output_var_names(op):
                 in_node = graph._find_node_by_name(op.outputs, output_var_name)
-                out_node = graph.create_var_node_from_desc(in_node.var())
                 scale_node = graph.create_persistable_node(
                     name=self._scale_name(in_node.name()),
                     var_type=core.VarDesc.VarType.LOD_TENSOR,
@@ -1464,7 +1463,7 @@ class OutScaleForTrainingPass(object):
                     self._scope,
                     self._place)
                 ins = {'X': in_node}
-                outs = {'Out': out_node, 'OutScale': scale_node}
+                outs = {'OutScale': scale_node}
                 if not self._is_test:
                     state_in_node = graph.create_persistable_node(
                         name=unique_name.generate('scale_state@'),
@@ -1509,7 +1508,6 @@ class OutScaleForTrainingPass(object):
                     inputs=ins,
                     outputs=outs)
                 graph.link_to(in_node, scale_op_node)
-                graph.link_to(scale_op_node, out_node)
                 graph.link_to(scale_op_node, scale_node)
                 if not self._is_test:
                     graph.link_to(state_in_node, scale_op_node)
diff --git a/python/paddle/fluid/tests/unittests/test_fake_quantize_op.py b/python/paddle/fluid/tests/unittests/test_fake_quantize_op.py
index 4314faaf39..1c8335e3bc 100644
--- a/python/paddle/fluid/tests/unittests/test_fake_quantize_op.py
+++ b/python/paddle/fluid/tests/unittests/test_fake_quantize_op.py
@@ -146,7 +146,6 @@ class TestMovingAverageAbsMaxScaleOp(OpTest):
         out_state[0] = self.attrs['moving_rate'] * state[0] + 1
         out_scale = out_accum / out_state
         self.outputs = {
-            'Out': self.inputs['X'],
             'OutAccum': out_accum,
             'OutState': out_state,
             'OutScale': out_scale,
-- 
GitLab