From 63865c745e406ca810efbb10e818eb2ea9ee4295 Mon Sep 17 00:00:00 2001 From: iLeGend <824040212@qq.com> Date: Fri, 31 Mar 2023 17:19:54 +0800 Subject: [PATCH] [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 --- .../fluid/tests/unittests/CMakeLists.txt | 4 ---- test/CMakeLists.txt | 4 +++- .../unittests => test}/mkldnn/CMakeLists.txt | 0 .../unittests => test}/mkldnn/__init__.py | 0 .../mkldnn/check_flags_mkldnn_ops_on_off.py | 0 .../mkldnn/check_flags_use_mkldnn.py | 0 .../mkldnn/mkldnn_op_test.py | 0 .../mkldnn/test_activation_bf16_mkldnn_op.py | 0 .../mkldnn/test_activation_mkldnn_op.py | 0 .../mkldnn/test_batch_norm_mkldnn_op.py | 0 .../mkldnn/test_bilinear_interp_mkldnn_op.py | 0 .../test_bilinear_interp_v2_mkldnn_op.py | 0 .../mkldnn/test_cast_mkldnn_op.py | 0 .../mkldnn/test_clip_mkldnn_op.py | 0 .../mkldnn/test_concat_bf16_mkldnn_op.py | 0 .../mkldnn/test_concat_int8_mkldnn_op.py | 0 .../mkldnn/test_concat_mkldnn_op.py | 0 .../mkldnn/test_conv2d_bf16_mkldnn_op.py | 0 .../mkldnn/test_conv2d_int8_mkldnn_op.py | 0 .../mkldnn/test_conv2d_mkldnn_op.py | 0 .../test_conv2d_transpose_bf16_mkldnn_op.py | 0 .../mkldnn/test_conv2d_transpose_mkldnn_op.py | 0 .../mkldnn/test_conv3d_mkldnn_op.py | 0 .../mkldnn/test_dequantize_mkldnn_op.py | 0 .../test_elementwise_add_bf16_mkldnn_op.py | 0 .../mkldnn/test_elementwise_add_mkldnn_op.py | 0 .../mkldnn/test_elementwise_div_mkldnn_op.py | 0 .../test_elementwise_mul_bf16_mkldnn_op.py | 0 .../mkldnn/test_elementwise_mul_mkldnn_op.py | 0 .../mkldnn/test_elementwise_sub_mkldnn_op.py | 0 .../mkldnn/test_expand_v2_mkldnn_op.py | 0 .../mkldnn/test_fc_bf16_mkldnn_op.py | 0 .../mkldnn/test_fc_int8_mkldnn_op.py | 0 .../mkldnn/test_fc_mkldnn_op.py | 0 .../mkldnn/test_fill_constant_mkldnn_op.py | 0 .../mkldnn/test_flags_mkldnn_ops_on_off.py | 0 .../mkldnn/test_flags_use_mkldnn.py | 0 .../mkldnn/test_flatten_mkldnn_op.py | 0 .../mkldnn/test_fusion_gru_bf16_mkldnn_op.py | 0 .../mkldnn/test_fusion_gru_int8_mkldnn_op.py | 0 .../mkldnn/test_fusion_gru_mkldnn_op.py | 0 .../mkldnn/test_fusion_lstm_bf16_mkldnn_op.py | 0 .../mkldnn/test_fusion_lstm_int8_mkldnn_op.py | 0 .../mkldnn/test_fusion_lstm_mkldnn_op.py | 0 .../mkldnn/test_gaussian_random_mkldnn_op.py | 0 .../mkldnn/test_layer_norm_bf16_mkldnn_op.py | 8 ++++---- .../mkldnn/test_layer_norm_mkldnn_op.py | 0 .../mkldnn/test_log_softmax_mkldnn_op.py | 0 .../mkldnn/test_lrn_mkldnn_op.py | 0 .../mkldnn/test_matmul_bf16_mkldnn_op.py | 0 .../mkldnn/test_matmul_mkldnn_op.py | 0 .../mkldnn/test_matmul_v2_mkldnn_op.py | 18 +++++++++--------- .../mkldnn/test_mul_int8_mkldnn_op.py | 0 .../mkldnn/test_mul_mkldnn_op.py | 0 .../mkldnn/test_multi_gru_mkldnn_op.py | 0 .../mkldnn/test_nearest_interp_mkldnn_op.py | 0 .../mkldnn/test_nearest_interp_v2_mkldnn_op.py | 0 ...est_onnx_format_quantization_mobilenetv1.py | 0 .../mkldnn/test_pool2d_bf16_mkldnn_op.py | 8 ++++++-- .../mkldnn/test_pool2d_int8_mkldnn_op.py | 0 .../mkldnn/test_pool2d_mkldnn_op.py | 0 .../mkldnn/test_prelu_mkldnn_op.py | 0 .../mkldnn/test_quantize_mkldnn_op.py | 0 .../mkldnn/test_reduce_bf16_mkldnn_op.py | 0 .../mkldnn/test_reduce_mkldnn_op.py | 0 .../mkldnn/test_requantize_mkldnn_op.py | 0 .../mkldnn/test_reshape_bf16_op.py | 0 .../mkldnn/test_reshape_mkldnn_op.py | 0 .../mkldnn/test_scale_bf16_mkldnn_op.py | 0 .../mkldnn/test_scale_mkldnn_op.py | 0 .../mkldnn/test_shape_mkldnn_op.py | 0 .../mkldnn/test_shuffle_channel_mkldnn_op.py | 0 .../mkldnn/test_slice_mkldnn_op.py | 0 .../mkldnn/test_softmax_bf16_mkldnn_op.py | 0 .../mkldnn/test_softmax_mkldnn_op.py | 0 .../mkldnn/test_softplus_mkldnn_op.py | 0 .../mkldnn/test_split_bf16_mkldnn_op.py | 0 .../mkldnn/test_split_mkldnn_op.py | 0 .../mkldnn/test_squeeze2_mkldnn_op.py | 0 .../mkldnn/test_stack_mkldnn_op.py | 0 .../mkldnn/test_sum_bf16_mkldnn_op.py | 0 .../mkldnn/test_sum_mkldnn_op.py | 0 .../mkldnn/test_transpose_bf16_mkldnn_op.py | 0 .../mkldnn/test_transpose_int8_mkldnn_op.py | 0 .../mkldnn/test_transpose_mkldnn_op.py | 0 85 files changed, 22 insertions(+), 20 deletions(-) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/CMakeLists.txt (100%) mode change 100755 => 100644 rename {python/paddle/fluid/tests/unittests => test}/mkldnn/__init__.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/check_flags_mkldnn_ops_on_off.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/check_flags_use_mkldnn.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/mkldnn_op_test.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_activation_bf16_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_activation_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_batch_norm_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_bilinear_interp_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_bilinear_interp_v2_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_cast_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_clip_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_concat_bf16_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_concat_int8_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_concat_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_conv2d_bf16_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_conv2d_int8_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_conv2d_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_conv2d_transpose_bf16_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_conv2d_transpose_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_conv3d_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_dequantize_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_elementwise_add_bf16_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_elementwise_add_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_elementwise_div_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_elementwise_mul_bf16_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_elementwise_mul_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_elementwise_sub_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_expand_v2_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_fc_bf16_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_fc_int8_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_fc_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_fill_constant_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_flags_mkldnn_ops_on_off.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_flags_use_mkldnn.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_flatten_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_fusion_gru_bf16_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_fusion_gru_int8_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_fusion_gru_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_fusion_lstm_bf16_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_fusion_lstm_int8_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_fusion_lstm_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_gaussian_random_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_layer_norm_bf16_mkldnn_op.py (98%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_layer_norm_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_log_softmax_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_lrn_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_matmul_bf16_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_matmul_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_matmul_v2_mkldnn_op.py (99%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_mul_int8_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_mul_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_multi_gru_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_nearest_interp_mkldnn_op.py (100%) mode change 100755 => 100644 rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_nearest_interp_v2_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_onnx_format_quantization_mobilenetv1.py (100%) mode change 100755 => 100644 rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_pool2d_bf16_mkldnn_op.py (98%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_pool2d_int8_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_pool2d_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_prelu_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_quantize_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_reduce_bf16_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_reduce_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_requantize_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_reshape_bf16_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_reshape_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_scale_bf16_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_scale_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_shape_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_shuffle_channel_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_slice_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_softmax_bf16_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_softmax_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_softplus_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_split_bf16_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_split_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_squeeze2_mkldnn_op.py (100%) mode change 100755 => 100644 rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_stack_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_sum_bf16_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_sum_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_transpose_bf16_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_transpose_int8_mkldnn_op.py (100%) rename {python/paddle/fluid/tests/unittests => test}/mkldnn/test_transpose_mkldnn_op.py (100%) diff --git a/python/paddle/fluid/tests/unittests/CMakeLists.txt b/python/paddle/fluid/tests/unittests/CMakeLists.txt index 7cadb70252b..1b881051b04 100755 --- a/python/paddle/fluid/tests/unittests/CMakeLists.txt +++ b/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) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 825d19b61b7..580aef0ef59 100644 --- a/test/CMakeLists.txt +++ b/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) diff --git a/python/paddle/fluid/tests/unittests/mkldnn/CMakeLists.txt b/test/mkldnn/CMakeLists.txt old mode 100755 new mode 100644 similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/CMakeLists.txt rename to test/mkldnn/CMakeLists.txt diff --git a/python/paddle/fluid/tests/unittests/mkldnn/__init__.py b/test/mkldnn/__init__.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/__init__.py rename to test/mkldnn/__init__.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/check_flags_mkldnn_ops_on_off.py b/test/mkldnn/check_flags_mkldnn_ops_on_off.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/check_flags_mkldnn_ops_on_off.py rename to test/mkldnn/check_flags_mkldnn_ops_on_off.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/check_flags_use_mkldnn.py b/test/mkldnn/check_flags_use_mkldnn.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/check_flags_use_mkldnn.py rename to test/mkldnn/check_flags_use_mkldnn.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/mkldnn_op_test.py b/test/mkldnn/mkldnn_op_test.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/mkldnn_op_test.py rename to test/mkldnn/mkldnn_op_test.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_activation_bf16_mkldnn_op.py b/test/mkldnn/test_activation_bf16_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_activation_bf16_mkldnn_op.py rename to test/mkldnn/test_activation_bf16_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_activation_mkldnn_op.py b/test/mkldnn/test_activation_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_activation_mkldnn_op.py rename to test/mkldnn/test_activation_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_batch_norm_mkldnn_op.py b/test/mkldnn/test_batch_norm_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_batch_norm_mkldnn_op.py rename to test/mkldnn/test_batch_norm_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_bilinear_interp_mkldnn_op.py b/test/mkldnn/test_bilinear_interp_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_bilinear_interp_mkldnn_op.py rename to test/mkldnn/test_bilinear_interp_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_bilinear_interp_v2_mkldnn_op.py b/test/mkldnn/test_bilinear_interp_v2_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_bilinear_interp_v2_mkldnn_op.py rename to test/mkldnn/test_bilinear_interp_v2_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_cast_mkldnn_op.py b/test/mkldnn/test_cast_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_cast_mkldnn_op.py rename to test/mkldnn/test_cast_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_clip_mkldnn_op.py b/test/mkldnn/test_clip_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_clip_mkldnn_op.py rename to test/mkldnn/test_clip_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_concat_bf16_mkldnn_op.py b/test/mkldnn/test_concat_bf16_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_concat_bf16_mkldnn_op.py rename to test/mkldnn/test_concat_bf16_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_concat_int8_mkldnn_op.py b/test/mkldnn/test_concat_int8_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_concat_int8_mkldnn_op.py rename to test/mkldnn/test_concat_int8_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_concat_mkldnn_op.py b/test/mkldnn/test_concat_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_concat_mkldnn_op.py rename to test/mkldnn/test_concat_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_conv2d_bf16_mkldnn_op.py b/test/mkldnn/test_conv2d_bf16_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_conv2d_bf16_mkldnn_op.py rename to test/mkldnn/test_conv2d_bf16_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_conv2d_int8_mkldnn_op.py b/test/mkldnn/test_conv2d_int8_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_conv2d_int8_mkldnn_op.py rename to test/mkldnn/test_conv2d_int8_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_conv2d_mkldnn_op.py b/test/mkldnn/test_conv2d_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_conv2d_mkldnn_op.py rename to test/mkldnn/test_conv2d_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_conv2d_transpose_bf16_mkldnn_op.py b/test/mkldnn/test_conv2d_transpose_bf16_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_conv2d_transpose_bf16_mkldnn_op.py rename to test/mkldnn/test_conv2d_transpose_bf16_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_conv2d_transpose_mkldnn_op.py b/test/mkldnn/test_conv2d_transpose_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_conv2d_transpose_mkldnn_op.py rename to test/mkldnn/test_conv2d_transpose_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_conv3d_mkldnn_op.py b/test/mkldnn/test_conv3d_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_conv3d_mkldnn_op.py rename to test/mkldnn/test_conv3d_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_dequantize_mkldnn_op.py b/test/mkldnn/test_dequantize_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_dequantize_mkldnn_op.py rename to test/mkldnn/test_dequantize_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_elementwise_add_bf16_mkldnn_op.py b/test/mkldnn/test_elementwise_add_bf16_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_elementwise_add_bf16_mkldnn_op.py rename to test/mkldnn/test_elementwise_add_bf16_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_elementwise_add_mkldnn_op.py b/test/mkldnn/test_elementwise_add_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_elementwise_add_mkldnn_op.py rename to test/mkldnn/test_elementwise_add_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_elementwise_div_mkldnn_op.py b/test/mkldnn/test_elementwise_div_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_elementwise_div_mkldnn_op.py rename to test/mkldnn/test_elementwise_div_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_elementwise_mul_bf16_mkldnn_op.py b/test/mkldnn/test_elementwise_mul_bf16_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_elementwise_mul_bf16_mkldnn_op.py rename to test/mkldnn/test_elementwise_mul_bf16_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_elementwise_mul_mkldnn_op.py b/test/mkldnn/test_elementwise_mul_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_elementwise_mul_mkldnn_op.py rename to test/mkldnn/test_elementwise_mul_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_elementwise_sub_mkldnn_op.py b/test/mkldnn/test_elementwise_sub_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_elementwise_sub_mkldnn_op.py rename to test/mkldnn/test_elementwise_sub_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_expand_v2_mkldnn_op.py b/test/mkldnn/test_expand_v2_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_expand_v2_mkldnn_op.py rename to test/mkldnn/test_expand_v2_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_fc_bf16_mkldnn_op.py b/test/mkldnn/test_fc_bf16_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_fc_bf16_mkldnn_op.py rename to test/mkldnn/test_fc_bf16_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_fc_int8_mkldnn_op.py b/test/mkldnn/test_fc_int8_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_fc_int8_mkldnn_op.py rename to test/mkldnn/test_fc_int8_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_fc_mkldnn_op.py b/test/mkldnn/test_fc_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_fc_mkldnn_op.py rename to test/mkldnn/test_fc_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_fill_constant_mkldnn_op.py b/test/mkldnn/test_fill_constant_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_fill_constant_mkldnn_op.py rename to test/mkldnn/test_fill_constant_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_flags_mkldnn_ops_on_off.py b/test/mkldnn/test_flags_mkldnn_ops_on_off.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_flags_mkldnn_ops_on_off.py rename to test/mkldnn/test_flags_mkldnn_ops_on_off.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_flags_use_mkldnn.py b/test/mkldnn/test_flags_use_mkldnn.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_flags_use_mkldnn.py rename to test/mkldnn/test_flags_use_mkldnn.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_flatten_mkldnn_op.py b/test/mkldnn/test_flatten_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_flatten_mkldnn_op.py rename to test/mkldnn/test_flatten_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_fusion_gru_bf16_mkldnn_op.py b/test/mkldnn/test_fusion_gru_bf16_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_fusion_gru_bf16_mkldnn_op.py rename to test/mkldnn/test_fusion_gru_bf16_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_fusion_gru_int8_mkldnn_op.py b/test/mkldnn/test_fusion_gru_int8_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_fusion_gru_int8_mkldnn_op.py rename to test/mkldnn/test_fusion_gru_int8_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_fusion_gru_mkldnn_op.py b/test/mkldnn/test_fusion_gru_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_fusion_gru_mkldnn_op.py rename to test/mkldnn/test_fusion_gru_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_fusion_lstm_bf16_mkldnn_op.py b/test/mkldnn/test_fusion_lstm_bf16_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_fusion_lstm_bf16_mkldnn_op.py rename to test/mkldnn/test_fusion_lstm_bf16_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_fusion_lstm_int8_mkldnn_op.py b/test/mkldnn/test_fusion_lstm_int8_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_fusion_lstm_int8_mkldnn_op.py rename to test/mkldnn/test_fusion_lstm_int8_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_fusion_lstm_mkldnn_op.py b/test/mkldnn/test_fusion_lstm_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_fusion_lstm_mkldnn_op.py rename to test/mkldnn/test_fusion_lstm_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_gaussian_random_mkldnn_op.py b/test/mkldnn/test_gaussian_random_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_gaussian_random_mkldnn_op.py rename to test/mkldnn/test_gaussian_random_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_layer_norm_bf16_mkldnn_op.py b/test/mkldnn/test_layer_norm_bf16_mkldnn_op.py similarity index 98% rename from python/paddle/fluid/tests/unittests/mkldnn/test_layer_norm_bf16_mkldnn_op.py rename to test/mkldnn/test_layer_norm_bf16_mkldnn_op.py index addf05d9497..6d3fb83fc6a 100644 --- a/python/paddle/fluid/tests/unittests/mkldnn/test_layer_norm_bf16_mkldnn_op.py +++ b/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) diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_layer_norm_mkldnn_op.py b/test/mkldnn/test_layer_norm_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_layer_norm_mkldnn_op.py rename to test/mkldnn/test_layer_norm_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_log_softmax_mkldnn_op.py b/test/mkldnn/test_log_softmax_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_log_softmax_mkldnn_op.py rename to test/mkldnn/test_log_softmax_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_lrn_mkldnn_op.py b/test/mkldnn/test_lrn_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_lrn_mkldnn_op.py rename to test/mkldnn/test_lrn_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_matmul_bf16_mkldnn_op.py b/test/mkldnn/test_matmul_bf16_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_matmul_bf16_mkldnn_op.py rename to test/mkldnn/test_matmul_bf16_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_matmul_mkldnn_op.py b/test/mkldnn/test_matmul_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_matmul_mkldnn_op.py rename to test/mkldnn/test_matmul_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_matmul_v2_mkldnn_op.py b/test/mkldnn/test_matmul_v2_mkldnn_op.py similarity index 99% rename from python/paddle/fluid/tests/unittests/mkldnn/test_matmul_v2_mkldnn_op.py rename to test/mkldnn/test_matmul_v2_mkldnn_op.py index 1e6a276f2fe..97910f596dd 100644 --- a/python/paddle/fluid/tests/unittests/mkldnn/test_matmul_v2_mkldnn_op.py +++ b/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.""" diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_mul_int8_mkldnn_op.py b/test/mkldnn/test_mul_int8_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_mul_int8_mkldnn_op.py rename to test/mkldnn/test_mul_int8_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_mul_mkldnn_op.py b/test/mkldnn/test_mul_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_mul_mkldnn_op.py rename to test/mkldnn/test_mul_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_multi_gru_mkldnn_op.py b/test/mkldnn/test_multi_gru_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_multi_gru_mkldnn_op.py rename to test/mkldnn/test_multi_gru_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_nearest_interp_mkldnn_op.py b/test/mkldnn/test_nearest_interp_mkldnn_op.py old mode 100755 new mode 100644 similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_nearest_interp_mkldnn_op.py rename to test/mkldnn/test_nearest_interp_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_nearest_interp_v2_mkldnn_op.py b/test/mkldnn/test_nearest_interp_v2_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_nearest_interp_v2_mkldnn_op.py rename to test/mkldnn/test_nearest_interp_v2_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_onnx_format_quantization_mobilenetv1.py b/test/mkldnn/test_onnx_format_quantization_mobilenetv1.py old mode 100755 new mode 100644 similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_onnx_format_quantization_mobilenetv1.py rename to test/mkldnn/test_onnx_format_quantization_mobilenetv1.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_pool2d_bf16_mkldnn_op.py b/test/mkldnn/test_pool2d_bf16_mkldnn_op.py similarity index 98% rename from python/paddle/fluid/tests/unittests/mkldnn/test_pool2d_bf16_mkldnn_op.py rename to test/mkldnn/test_pool2d_bf16_mkldnn_op.py index fb98c867d6e..57384a75bda 100644 --- a/python/paddle/fluid/tests/unittests/mkldnn/test_pool2d_bf16_mkldnn_op.py +++ b/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, diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_pool2d_int8_mkldnn_op.py b/test/mkldnn/test_pool2d_int8_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_pool2d_int8_mkldnn_op.py rename to test/mkldnn/test_pool2d_int8_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_pool2d_mkldnn_op.py b/test/mkldnn/test_pool2d_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_pool2d_mkldnn_op.py rename to test/mkldnn/test_pool2d_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_prelu_mkldnn_op.py b/test/mkldnn/test_prelu_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_prelu_mkldnn_op.py rename to test/mkldnn/test_prelu_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_quantize_mkldnn_op.py b/test/mkldnn/test_quantize_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_quantize_mkldnn_op.py rename to test/mkldnn/test_quantize_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_reduce_bf16_mkldnn_op.py b/test/mkldnn/test_reduce_bf16_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_reduce_bf16_mkldnn_op.py rename to test/mkldnn/test_reduce_bf16_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_reduce_mkldnn_op.py b/test/mkldnn/test_reduce_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_reduce_mkldnn_op.py rename to test/mkldnn/test_reduce_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_requantize_mkldnn_op.py b/test/mkldnn/test_requantize_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_requantize_mkldnn_op.py rename to test/mkldnn/test_requantize_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_reshape_bf16_op.py b/test/mkldnn/test_reshape_bf16_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_reshape_bf16_op.py rename to test/mkldnn/test_reshape_bf16_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_reshape_mkldnn_op.py b/test/mkldnn/test_reshape_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_reshape_mkldnn_op.py rename to test/mkldnn/test_reshape_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_scale_bf16_mkldnn_op.py b/test/mkldnn/test_scale_bf16_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_scale_bf16_mkldnn_op.py rename to test/mkldnn/test_scale_bf16_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_scale_mkldnn_op.py b/test/mkldnn/test_scale_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_scale_mkldnn_op.py rename to test/mkldnn/test_scale_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_shape_mkldnn_op.py b/test/mkldnn/test_shape_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_shape_mkldnn_op.py rename to test/mkldnn/test_shape_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_shuffle_channel_mkldnn_op.py b/test/mkldnn/test_shuffle_channel_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_shuffle_channel_mkldnn_op.py rename to test/mkldnn/test_shuffle_channel_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_slice_mkldnn_op.py b/test/mkldnn/test_slice_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_slice_mkldnn_op.py rename to test/mkldnn/test_slice_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_softmax_bf16_mkldnn_op.py b/test/mkldnn/test_softmax_bf16_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_softmax_bf16_mkldnn_op.py rename to test/mkldnn/test_softmax_bf16_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_softmax_mkldnn_op.py b/test/mkldnn/test_softmax_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_softmax_mkldnn_op.py rename to test/mkldnn/test_softmax_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_softplus_mkldnn_op.py b/test/mkldnn/test_softplus_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_softplus_mkldnn_op.py rename to test/mkldnn/test_softplus_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_split_bf16_mkldnn_op.py b/test/mkldnn/test_split_bf16_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_split_bf16_mkldnn_op.py rename to test/mkldnn/test_split_bf16_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_split_mkldnn_op.py b/test/mkldnn/test_split_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_split_mkldnn_op.py rename to test/mkldnn/test_split_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_squeeze2_mkldnn_op.py b/test/mkldnn/test_squeeze2_mkldnn_op.py old mode 100755 new mode 100644 similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_squeeze2_mkldnn_op.py rename to test/mkldnn/test_squeeze2_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_stack_mkldnn_op.py b/test/mkldnn/test_stack_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_stack_mkldnn_op.py rename to test/mkldnn/test_stack_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_sum_bf16_mkldnn_op.py b/test/mkldnn/test_sum_bf16_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_sum_bf16_mkldnn_op.py rename to test/mkldnn/test_sum_bf16_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_sum_mkldnn_op.py b/test/mkldnn/test_sum_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_sum_mkldnn_op.py rename to test/mkldnn/test_sum_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_transpose_bf16_mkldnn_op.py b/test/mkldnn/test_transpose_bf16_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_transpose_bf16_mkldnn_op.py rename to test/mkldnn/test_transpose_bf16_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_transpose_int8_mkldnn_op.py b/test/mkldnn/test_transpose_int8_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_transpose_int8_mkldnn_op.py rename to test/mkldnn/test_transpose_int8_mkldnn_op.py diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_transpose_mkldnn_op.py b/test/mkldnn/test_transpose_mkldnn_op.py similarity index 100% rename from python/paddle/fluid/tests/unittests/mkldnn/test_transpose_mkldnn_op.py rename to test/mkldnn/test_transpose_mkldnn_op.py -- GitLab