test/ directory modify MKLDNN [fluid_ops] (PaddlePaddle#74678)

* Fix

* fix

Author: co63oc

test/cpp/fluid/mkldnn/CMakeLists.txt

@@ -4,7 +4,7 @@ paddle_test(test_onednn_cpu_quantize_pass SRCS test_onednn_cpu_quantize_pass.cc)
 
 paddle_test(test_conv_onednn_nhwc SRCS test_conv_onednn_nhwc.cc)
 
-set(TEST_MKLDNN_CACHING_DEPS
+set(TEST_ONEDNN_CACHING_DEPS
     op_registry
     elementwise_mul_op
     elementwise_add_op
@@ -16,7 +16,7 @@ set(TEST_MKLDNN_CACHING_DEPS
     generated_static_op)
 
 if(WITH_GPU OR WITH_ROCM)
-  set(TEST_MKLDNN_CACHING_DEPS ${TEST_MKLDNN_CACHING_DEPS} depthwise_conv)
+  set(TEST_ONEDNN_CACHING_DEPS ${TEST_ONEDNN_CACHING_DEPS} depthwise_conv)
 endif()
 paddle_test(test_onednn_caching SRCS test_onednn_caching.cc)
 

test/ir/inference/inference_pass_test.py

@@ -188,7 +188,7 @@ def _get_analysis_config(
     def check_output(self, atol=1e-5):
         '''
         Check whether calculating on CPU and GPU, enable TensorRT
-        or disable TensorRT, enable MKLDNN or disable MKLDNN
+        or disable TensorRT, enable ONEDNN or disable ONEDNN
         are all the same.
         '''
         self.assertFalse(
@@ -203,7 +203,7 @@ def check_output_with_option(
     ):
         '''
         Check whether calculating on CPU and GPU, enable TensorRT
-        or disable TensorRT, enable MKLDNN or disable MKLDNN
+        or disable TensorRT, enable ONEDNN or disable ONEDNN
         are all the same.
         '''
         place = base.CUDAPlace(0) if use_gpu else base.CPUPlace()
@@ -295,7 +295,7 @@ def check_output_with_option(
 
             self.assertTrue(
                 len(paddle_outs) == len(onednn_outputs),
-                "The number of outputs is different between CPU and MKLDNN. ",
+                "The number of outputs is different between CPU and ONEDNN. ",
             )
 
             if self.enable_onednn_bfloat16:
@@ -306,7 +306,7 @@ def check_output_with_option(
                     onednn_output,
                     rtol=1e-05,
                     atol=atol,
-                    err_msg='Output has diff between CPU and MKLDNN. ',
+                    err_msg='Output has diff between CPU and ONEDNN. ',
                 )
 
     class TensorRTParam:

test/ir/inference/quant_dequant_test.py

@@ -242,7 +242,7 @@ def check_output_with_option(
     ):
         '''
         Check whether calculating on CPU and GPU, enable TensorRT
-        or disable TensorRT, enable MKLDNN or disable MKLDNN
+        or disable TensorRT, enable ONEDNN or disable ONEDNN
         are all the same.
         '''
         place = paddle.CUDAPlace(0) if use_gpu else paddle.CPUPlace()
@@ -397,7 +397,7 @@ def check_output_with_option(
 
             self.assertTrue(
                 len(paddle_outs) == len(onednn_outputs),
-                "The number of outputs is different between CPU and MKLDNN. ",
+                "The number of outputs is different between CPU and ONEDNN. ",
             )
 
             if self.enable_onednn_bfloat16:
@@ -408,7 +408,7 @@ def check_output_with_option(
                     onednn_output,
                     rtol=1e-05,
                     atol=atol,
-                    err_msg='Output has diff between CPU and MKLDNN. ',
+                    err_msg='Output has diff between CPU and ONEDNN. ',
                 )
 
     class TensorRTParam:

test/ir/inference/test_conv_eltwiseadd_bn_fuse_pass.py

@@ -45,7 +45,7 @@ def sample_predictor_configs(self, program_config):
         config = self.create_inference_config(use_gpu=False)
         yield config, ["conv2d", "elementwise_add"], (1e-4, 1e-5)
 
-        # MKLDNN
+        # ONEDNN
         config = self.create_inference_config(use_gpu=False)
         config.enable_onednn()
         yield config, ["conv2d", "elementwise_add"], (1e-4, 1e-5)

test/ir/inference/test_mkldnn_depthwise_conv_pass.py

@@ -20,7 +20,7 @@
 from program_config import OpConfig, ProgramConfig, TensorConfig
 
 
-class DepthwiseConvMKLDNNPass(PassAutoScanTest):
+class DepthwiseConvONEDNNPass(PassAutoScanTest):
     r'''
     conv_input   conv_weight_var(persistable)
       \       /

test/ir/inference/test_mkldnn_log_softmax_op.py

@@ -22,7 +22,7 @@
 from program_config import OpConfig, ProgramConfig, TensorConfig
 
 
-class TestMKLDNNLogSoftmaxOp(OnednnAutoScanTest):
+class TestONEDNNLogSoftmaxOp(OnednnAutoScanTest):
     def is_program_valid(self, program_config: ProgramConfig) -> bool:
         return True
 

test/legacy_test/op_test.py

@@ -516,7 +516,10 @@ def is_empty_grad_op(op_type):
                 if is_onednn_op_test():
                     grad_op_kernels = all_op_kernels[grad_op]
                     for grad_op_kernel in grad_op_kernels:
-                        if 'MKLDNN' in grad_op_kernel:
+                        if (
+                            'MKLDNN' in grad_op_kernel
+                            or 'ONEDNN' in grad_op_kernel
+                        ):
                             return False
                 else:
                     return False

test/quantization/test_post_training_quantization_mobilenetv1.py

@@ -821,10 +821,10 @@ def test_post_training_onnx_format_mobilenetv1_tensorrt(self):
         )
 
 
-class TestPostTrainingKLONNXFormatForMobilenetv1MKLDNN(
+class TestPostTrainingKLONNXFormatForMobilenetv1ONEDNN(
     TestPostTrainingQuantization
 ):
-    def test_post_training_onnx_format_mobilenetv1_mkldnn(self):
+    def test_post_training_onnx_format_mobilenetv1_onednn(self):
         model = "MobileNet-V1"
         algo = "ptf"
         round_type = "round"
@@ -843,7 +843,7 @@ def test_post_training_onnx_format_mobilenetv1_mkldnn(self):
         onnx_format = True
         diff_threshold = 0.05
         batch_nums = 12
-        deploy_backend = "mkldnn"
+        deploy_backend = "onednn"
         self.run_test(
             model,
             'inference.pdmodel',