[Test Mv] move mkldnn unittests to test dir (#51911)

* move mkldnn unittests to test dir

* add py_test_modules funcs

* move py_test_modules to test/mkldnn

* fix import error

* Revert "move py_test_modules to test/mkldnn"

This reverts commit 0277e0c29c22e5c29b7a3b843103f3d0b711c442.

* fix import error by conflicts

* fix errors

* fix mistake on solving conflicts

python/paddle/fluid/tests/unittests/CMakeLists.txt

@@ -850,10 +850,6 @@ if(WIN32)
     DEPS python)
 endif()
 
-if(WITH_MKLDNN)
-  add_subdirectory(mkldnn)
-endif()
-
 add_subdirectory(ir)
 
 add_subdirectory(standalone_executor)

test/CMakeLists.txt

@@ -138,7 +138,9 @@ if(WITH_TESTING)
   endif()
   # add_subdirectory(ir)
   add_subdirectory(legacy_test)
-  # add_subdirectory(mkldnn)
+  if(WITH_MKLDNN)
+    add_subdirectory(mkldnn)
+  endif()
   add_subdirectory(prim)
   # add_subdirectory(ps)
   add_subdirectory(quantization)

python/paddle/fluid/tests/unittests/mkldnn/test_layer_norm_bf16_mkldnn_op.py → test/mkldnn/test_layer_norm_bf16_mkldnn_op.py

@@ -18,6 +18,10 @@ from functools import reduce
 from operator import mul
 
 import numpy as np
+from test_layer_norm_mkldnn_op import (
+    TestLayerNormMKLDNNOp,
+    _reference_layer_norm_naive,
+)
 
 from paddle import enable_static, fluid
 from paddle.fluid import core
@@ -25,10 +29,6 @@ from paddle.fluid.tests.unittests.eager_op_test import (
     _set_use_system_allocator,
     convert_float_to_uint16,
 )
-from paddle.fluid.tests.unittests.mkldnn.test_layer_norm_mkldnn_op import (
-    TestLayerNormMKLDNNOp,
-    _reference_layer_norm_naive,
-)
 
 np.random.random(123)
 

python/paddle/fluid/tests/unittests/mkldnn/test_matmul_v2_mkldnn_op.py → test/mkldnn/test_matmul_v2_mkldnn_op.py

@@ -15,15 +15,7 @@
 import unittest
 
 import numpy as np
-
-import paddle
-from paddle.fluid import core
-from paddle.fluid.tests.unittests.eager_op_test import (
-    OpTest,
-    OpTestTool,
-    convert_float_to_uint16,
-)
-from paddle.fluid.tests.unittests.mkldnn.test_matmul_mkldnn_op import (
+from test_matmul_mkldnn_op import (
     TestMatMulOpTransposeReshapeBasicFloat,
     TestMatMulOpTransposeReshapeEmptyFloat,
     TestMatMulOpTransposeReshapeOtherDimFloat,
@@ -37,6 +29,14 @@ from paddle.fluid.tests.unittests.mkldnn.test_matmul_mkldnn_op import (
     TestReshapeTransposeMatMulOp4DYFloat,
 )
 
+import paddle
+from paddle.fluid import core
+from paddle.fluid.tests.unittests.eager_op_test import (
+    OpTest,
+    OpTestTool,
+    convert_float_to_uint16,
+)
+
 
 def reference_matmul(X, Y, transpose_x=False, transpose_y=False):
     """Reference forward implementation using np.matmul."""

python/paddle/fluid/tests/unittests/mkldnn/test_pool2d_bf16_mkldnn_op.py → test/mkldnn/test_pool2d_bf16_mkldnn_op.py

@@ -21,8 +21,12 @@ from paddle import enable_static
 from paddle.fluid import core
 
 sys.path.append("..")
-from eager_op_test import OpTest, OpTestTool, convert_float_to_uint16
-from test_pool2d_op import (
+from paddle.fluid.tests.unittests.eager_op_test import (
+    OpTest,
+    OpTestTool,
+    convert_float_to_uint16,
+)
+from paddle.fluid.tests.unittests.test_pool2d_op import (
     TestPool2D_Op_Mixin,
     adaptive_end_index,
     adaptive_start_index,