From 2e659be28cc2f466b6209fd33087bacb7a086b3c Mon Sep 17 00:00:00 2001
From: yghstill <742925032@qq.com>
Date: Tue, 21 Dec 2021 11:44:43 +0000
Subject: [PATCH 1/2] fix clip_extra when QAT export model

---
 python/paddle/fluid/contrib/slim/quantization/imperative/qat.py | 2 +-
 .../fluid/contrib/slim/tests/test_quantization_scale_pass.py    | 2 +-
 .../fluid/contrib/slim/tests/test_quantize_transpiler_v2.py     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/python/paddle/fluid/contrib/slim/quantization/imperative/qat.py b/python/paddle/fluid/contrib/slim/quantization/imperative/qat.py
index 24caf1479543e..a3fdca5e40669 100644
--- a/python/paddle/fluid/contrib/slim/quantization/imperative/qat.py
+++ b/python/paddle/fluid/contrib/slim/quantization/imperative/qat.py
@@ -506,7 +506,7 @@ def save_quantized_model(self, model, path, input_spec=None, **config):
             main_program=infer_program.clone(),
             model_filename=model_filename,
             params_filename=params_filename,
-            clip_extra=True)
+            clip_extra=False)
 
         if is_dynamic_mode:
             paddle.disable_static()
diff --git a/python/paddle/fluid/contrib/slim/tests/test_quantization_scale_pass.py b/python/paddle/fluid/contrib/slim/tests/test_quantization_scale_pass.py
index ec2c7a91f96ab..a4f1449f9ea72 100644
--- a/python/paddle/fluid/contrib/slim/tests/test_quantization_scale_pass.py
+++ b/python/paddle/fluid/contrib/slim/tests/test_quantization_scale_pass.py
@@ -173,7 +173,7 @@ def build_program(main, startup, is_test):
                 'quant_scale_model' + dev_name, ['image', 'label'], [loss],
                 exe,
                 server_program,
-                clip_extra=True)
+                clip_extra=False)
 
     def test_quant_scale_cuda(self):
         if fluid.core.is_compiled_with_cuda():
diff --git a/python/paddle/fluid/contrib/slim/tests/test_quantize_transpiler_v2.py b/python/paddle/fluid/contrib/slim/tests/test_quantize_transpiler_v2.py
index f5eb7d347ca09..e417aca73028e 100644
--- a/python/paddle/fluid/contrib/slim/tests/test_quantize_transpiler_v2.py
+++ b/python/paddle/fluid/contrib/slim/tests/test_quantize_transpiler_v2.py
@@ -145,7 +145,7 @@ def build_program(main, startup, is_test):
                     './infer_model', ['image', 'label'], [loss],
                     exe,
                     test_program,
-                    clip_extra=True)
+                    clip_extra=False)
 
     def test_gpu_1(self):
         if fluid.core.is_compiled_with_cuda():

From 6cebc010fad8b08430ce75f9264ab79b83f4275a Mon Sep 17 00:00:00 2001
From: yghstill <742925032@qq.com>
Date: Wed, 22 Dec 2021 02:11:12 +0000
Subject: [PATCH 2/2] clear up unittes modify

---
 .../fluid/contrib/slim/tests/test_quantization_scale_pass.py    | 2 +-
 .../fluid/contrib/slim/tests/test_quantize_transpiler_v2.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/paddle/fluid/contrib/slim/tests/test_quantization_scale_pass.py b/python/paddle/fluid/contrib/slim/tests/test_quantization_scale_pass.py
index a4f1449f9ea72..ec2c7a91f96ab 100644
--- a/python/paddle/fluid/contrib/slim/tests/test_quantization_scale_pass.py
+++ b/python/paddle/fluid/contrib/slim/tests/test_quantization_scale_pass.py
@@ -173,7 +173,7 @@ def build_program(main, startup, is_test):
                 'quant_scale_model' + dev_name, ['image', 'label'], [loss],
                 exe,
                 server_program,
-                clip_extra=False)
+                clip_extra=True)
 
     def test_quant_scale_cuda(self):
         if fluid.core.is_compiled_with_cuda():
diff --git a/python/paddle/fluid/contrib/slim/tests/test_quantize_transpiler_v2.py b/python/paddle/fluid/contrib/slim/tests/test_quantize_transpiler_v2.py
index e417aca73028e..f5eb7d347ca09 100644
--- a/python/paddle/fluid/contrib/slim/tests/test_quantize_transpiler_v2.py
+++ b/python/paddle/fluid/contrib/slim/tests/test_quantize_transpiler_v2.py
@@ -145,7 +145,7 @@ def build_program(main, startup, is_test):
                     './infer_model', ['image', 'label'], [loss],
                     exe,
                     test_program,
-                    clip_extra=False)
+                    clip_extra=True)
 
     def test_gpu_1(self):
         if fluid.core.is_compiled_with_cuda():