fix code format error

PaddlePaddle · Dec 30, 2021 · 8a6c259 · 8a6c259
1 parent 3f4e54d
commit 8a6c259
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/paddle/fluid/framework/ir/mkldnn/fc_act_mkldnn_fuse_pass.cc b/paddle/fluid/framework/ir/mkldnn/fc_act_mkldnn_fuse_pass.cc
@@ -25,8 +25,8 @@ namespace ir {
 using string::PrettyLogDetail;
 
 void FuseFCActOneDNNPass::ApplyImpl(Graph *graph) const {
-  std::vector<std::string> act_types = {"gelu", "tanh", "sigmoid",
-                                        "mish", "hard_swish"};
+  std::vector<std::string> act_types = {"gelu", "tanh", "sigmoid", "mish",
+                                        "hard_swish"};
 
   for (std::string act_type : act_types) FuseFCAct(graph, act_type);
 }

diff --git a/paddle/fluid/framework/ir/mkldnn/fc_act_mkldnn_fuse_pass.h b/paddle/fluid/framework/ir/mkldnn/fc_act_mkldnn_fuse_pass.h
@@ -27,8 +27,8 @@ namespace ir {
  * \brief   Fuse the FC and activation operators into single OneDNN's
  *          FC with post-op.
  *
- * \note    Currently only GeLU, hardswish, sigmoid, mish and tanh are supported as an
- * activation function.
+ * \note    Currently only GeLU, hardswish, sigmoid, mish and tanh are supported
+ * as an activation function.
  */
 class FuseFCActOneDNNPass : public FusePassBase {
  public:
@@ -42,4 +42,4 @@ class FuseFCActOneDNNPass : public FusePassBase {
 
 }  // namespace ir
 }  // namespace framework
-}  // namespace paddlea
+}  // namespace paddle
diff --git a/paddle/fluid/framework/ir/mkldnn/fc_act_mkldnn_fuse_pass_tester.cc b/paddle/fluid/framework/ir/mkldnn/fc_act_mkldnn_fuse_pass_tester.cc
@@ -209,8 +209,7 @@ TEST(FuseFCActOneDNNPass, FuseWithMish) {
                      {"Input", "x"}, {"Weights", "weights"}, {"Bias", "bias"},
                  },
                  {{"Out", "fc_y"}});
-  test::CreateOp(&prog, "mish", {{"Input", "fc_y"}}, {{"Out", "act_y"}},
-                 false);
+  test::CreateOp(&prog, "mish", {{"Input", "fc_y"}}, {{"Out", "act_y"}}, false);
 
   Graph graph(prog);
   constexpr int removed_nodes_count = 2;

diff --git a/paddle/fluid/operators/mkldnn/activation_mkldnn_op.cc b/paddle/fluid/operators/mkldnn/activation_mkldnn_op.cc
@@ -201,7 +201,7 @@ using HardSwishMKLDNNFunctor =
 
 template <typename T>
 using MishMKLDNNFunctor =
-    MKLDNNActivationFunc<T, dnnl::algorithm::eltwise_mish>;    
+    MKLDNNActivationFunc<T, dnnl::algorithm::eltwise_mish>;
 
 template <typename T>
 using SigmoidMKLDNNFunctor =

diff --git a/paddle/fluid/operators/mkldnn/conv_mkldnn_op.cc b/paddle/fluid/operators/mkldnn/conv_mkldnn_op.cc
@@ -507,7 +507,7 @@ class ConvMKLDNNHandlerT
                                      fuse_alpha, fuse_beta);
     } else if (fuse_activation == "mish") {
       post_operations.append_eltwise(scale, dnnl::algorithm::eltwise_mish,
-                                     fuse_alpha, fuse_beta);                                 
+                                     fuse_alpha, fuse_beta);
     } else if (fuse_activation == "hard_sigmoid") {
       post_operations.append_eltwise(scale, dnnl::algorithm::eltwise_linear,
                                      fuse_alpha, fuse_beta);

diff --git a/python/paddle/fluid/tests/unittests/ir/inference/test_mkldnn_fc_act_fuse_pass.py b/python/paddle/fluid/tests/unittests/ir/inference/test_mkldnn_fc_act_fuse_pass.py
@@ -155,5 +155,6 @@ def test_check_output(self):
         self.check_output()
         self.assertTrue(PassVersionChecker.IsCompatible(self.pass_name))
 
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_activation_bf16_mkldnn_op.py b/python/paddle/fluid/tests/unittests/mkldnn/test_activation_bf16_mkldnn_op.py
@@ -142,9 +142,10 @@ def op_forward(self, x):
         return x * np.tanh(np.log(1 + np.exp(x)))
 
     def op_grad(self, dout, x):
-        omega = np.exp(3 * x) + 4 * np.exp(2 * x) + np.exp(x) * (4 * x + 6) + 4 * (x + 1)
+        omega = np.exp(3 * x) + 4 * np.exp(2 * x) + np.exp(x) * (4 * x + 6
+                                                                 ) + 4 * (x + 1)
         delta = np.exp(2 * x) + 2 * np.exp(x) + 2
-        return dout * ((np.exp(x) * omega) / delta ** 2)
+        return dout * ((np.exp(x) * omega) / delta**2)
 
 
 if __name__ == '__main__':

diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_activation_mkldnn_op.py b/python/paddle/fluid/tests/unittests/mkldnn/test_activation_mkldnn_op.py
@@ -23,6 +23,7 @@
 from paddle.fluid.tests.unittests.test_gelu_op import gelu
 from mkldnn_op_test import check_if_mkldnn_primitives_exist_in_bwd
 
+
 class TestMKLDNNReluDim2(TestRelu):
     def setUp(self):
         super(TestMKLDNNReluDim2, self).setUp()
@@ -313,11 +314,12 @@ def setUp(self):
     def init_dtype(self):
         self.dtype = np.float32
 
+
 class TestMKLDNNMish(TestActivation):
     def setUp(self):
         self.op_type = "mish"
         self.dtype = np.float32
-    
+
         x = np.random.uniform(0.1, 1, [2, 4, 3, 5]).astype(self.dtype)
         out = x * np.tanh(np.log(1 + np.exp(x)))