Revert "fix ptq fc attr name fuse_activation->activation_type"

This reverts commit ffd0233.
PaddlePaddle · Feb 16, 2022 · a92a4d4 · a92a4d4 · paddle-bot-old · Feb 17, 2022
1 parent 7827f38
commit a92a4d4
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/paddle/fluid/inference/api/mkldnn_quantizer.cc b/paddle/fluid/inference/api/mkldnn_quantizer.cc
@@ -116,15 +116,11 @@ void AnalysisPredictor::MkldnnQuantizer::CalculateScalesForOpOutputs(
       // force unsigned type if already know it
       bool is_unsigned = false;
       bool compute_scale = true;
-      if (op->Type() == "conv2d") {
+      if (op->Type() == "conv2d" || op->Type() == "fc") {
         // output of conv2d with relu must be unsigned
         std::string fuse_activation =
             op->GetAttrIfExists<std::string>("fuse_activation");
         is_unsigned = (fuse_activation == "relu" || fuse_activation == "relu6");
-      } else if (op->Type() == "fc") {
-        std::string activation_type =
-            op->GetAttrIfExists<std::string>("activation_type");
-        is_unsigned = (activation_type == "relu" || activation_type == "relu6");
       } else if (op->Type() == "relu") {
         is_unsigned = true;
       } else if (op->Type() == "transpose2" || op->Type() == "reshape2" ||