From 171ed2cf13862eaaf58d2071cdd791caf2c86800 Mon Sep 17 00:00:00 2001
From: arlesniak <artur.lesniak@intel.com>
Date: Wed, 14 Jul 2021 07:16:41 +0200
Subject: [PATCH] Added OpTestTool for BF16 (#33977)

* Added OpTestTool for BF16 convenience

* fixes after review, names changed to snake case.

* fixes after review, naming reflects cpu.
---
 .../unittests/mkldnn/test_matmul_v2_mkldnn_op.py  | 15 +++++----------
 .../mkldnn/test_reduce_bf16_mkldnn_op.py          |  8 +++-----
 python/paddle/fluid/tests/unittests/op_test.py    | 15 ++++++++++++++-
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_matmul_v2_mkldnn_op.py b/python/paddle/fluid/tests/unittests/mkldnn/test_matmul_v2_mkldnn_op.py
index 11b111310d3..ea06e2c4472 100644
--- a/python/paddle/fluid/tests/unittests/mkldnn/test_matmul_v2_mkldnn_op.py
+++ b/python/paddle/fluid/tests/unittests/mkldnn/test_matmul_v2_mkldnn_op.py
@@ -17,12 +17,14 @@ from __future__ import print_function
 import unittest
 import numpy as np
 
-from paddle.fluid.tests.unittests.op_test import OpTest, convert_float_to_uint16
+from paddle.fluid.tests.unittests.op_test import OpTest, OpTestTool, convert_float_to_uint16
 import paddle.fluid.core as core
 import paddle
 import paddle.fluid as fluid
 import paddle.fluid.framework as framework
 
+paddle.enable_static()
+
 
 def reference_matmul(X, Y, transpose_X=False, transpose_Y=False):
     """Reference forward implementation using np.matmul."""
@@ -236,6 +238,7 @@ class TestMatMulV2MatrixXMatrix5DTranposeYOneDNNOp(
 
 #   BF16 TESTS
 def create_bf16_test_class(parent):
+    @OpTestTool.skip_if_not_cpu_bf16()
     class TestMatMulV2Bf16OneDNNOp(parent):
         def set_inputs(self, x, y):
             self.inputs = {
@@ -247,15 +250,7 @@ def create_bf16_test_class(parent):
             self.attrs['mkldnn_data_type'] = "bfloat16"
 
         def test_check_output(self):
-            if core.is_compiled_with_cuda():
-                self.skipTest(
-                    "OneDNN doesn't support bf16 with CUDA, skipping UT" +
-                    self.__class__.__name__)
-            elif not core.supports_bfloat16():
-                self.skipTest("Core doesn't support bf16, skipping UT" +
-                              self.__class__.__name__)
-            else:
-                self.check_output_with_place(core.CPUPlace())
+            self.check_output_with_place(core.CPUPlace())
 
         def test_check_grad(self):
             pass
diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_reduce_bf16_mkldnn_op.py b/python/paddle/fluid/tests/unittests/mkldnn/test_reduce_bf16_mkldnn_op.py
index 1d7ab4f6b33..d1a65767903 100644
--- a/python/paddle/fluid/tests/unittests/mkldnn/test_reduce_bf16_mkldnn_op.py
+++ b/python/paddle/fluid/tests/unittests/mkldnn/test_reduce_bf16_mkldnn_op.py
@@ -16,16 +16,14 @@ from __future__ import print_function
 
 import unittest
 import numpy as np
-from paddle.fluid.tests.unittests.op_test import OpTest, skip_check_grad_ci, convert_float_to_uint16
+from paddle.fluid.tests.unittests.op_test import OpTestTool, OpTest, skip_check_grad_ci, convert_float_to_uint16
 import paddle.fluid.core as core
 import paddle.fluid as fluid
 import paddle
+paddle.enable_static()
 
 
-@unittest.skipIf(not core.supports_bfloat16(),
-                 "place does not support BF16 evaluation")
-@unittest.skipIf(core.is_compiled_with_cuda(),
-                 "core is compiled with CUDA which has no BF implementation")
+@OpTestTool.skip_if_not_cpu_bf16()
 class TestReduceSumDefaultBF16OneDNNOp(OpTest):
     def setUp(self):
         self.op_type = "reduce_sum"
diff --git a/python/paddle/fluid/tests/unittests/op_test.py b/python/paddle/fluid/tests/unittests/op_test.py
index 02f1dfbb9f2..2161f367007 100644
--- a/python/paddle/fluid/tests/unittests/op_test.py
+++ b/python/paddle/fluid/tests/unittests/op_test.py
@@ -32,7 +32,7 @@ import paddle.fluid.core as core
 from paddle.fluid.backward import append_backward
 from paddle.fluid.op import Operator
 from paddle.fluid.executor import Executor
-from paddle.fluid.framework import Program, OpProtoHolder, Variable
+from paddle.fluid.framework import Program, OpProtoHolder, Variable, _current_expected_place
 from paddle.fluid.tests.unittests.testsuite import (
     create_op,
     set_input,
@@ -1783,3 +1783,16 @@ class OpTest(unittest.TestCase):
                              fetch_list,
                              scope=scope,
                              return_numpy=False)))
+
+
+class OpTestTool:
+    @classmethod
+    def skip_if(cls, condition: object, reason: str):
+        return unittest.skipIf(condition, reason)
+
+    @classmethod
+    def skip_if_not_cpu_bf16(cls):
+        return OpTestTool.skip_if(
+            not (isinstance(_current_expected_place(), core.CPUPlace) and
+                 core.supports_bfloat16()),
+            "Place does not support BF16 evaluation")
-- 
GitLab