[test]mv fluid op mkldnn to test

paddle/fluid/operators/CMakeLists.txt

@@ -175,12 +175,6 @@ endif()
 
 set(GLOB_OP_LIB ${OP_LIBRARY} CACHE INTERNAL "Global OP library")
 
-if(WITH_MKLDNN)
-include(mkldnn/inplace_op_tests.cmake)
-include(mkldnn/caching_tests.cmake)
-include(mkldnn/nhwc_op_tests.cmake)
-endif()
-
 if(WITH_UNITY_BUILD)
     # Using Unity Build to compile operators, `register_operator` will cause
     # the unity library to lose some symbols.

test/cpp/fluid/CMakeLists.txt

@@ -11,9 +11,9 @@ if(WITH_LITE)
   add_subdirectory(lite)
 endif()
 add_subdirectory(math)
-# if(WITH_MKLDNN)
-#   add_subdirectory(mkldnn)
-# endif()
+if(WITH_MKLDNN)
+  add_subdirectory(mkldnn)
+endif()
 add_subdirectory(nccl)
 if(WITH_PSCORE)
   add_subdirectory(pscore)

test/cpp/fluid/mkldnn/CMakeLists.txt

@@ -0,0 +1,52 @@
+cc_test(
+  test_mkldnn_op_inplace
+  SRCS test_mkldnn_op_inplace.cc
+  DEPS op_registry
+       elementwise_add_op
+       activation_op
+       softmax_op
+       softmax
+       scope
+       device_context
+       enforce
+       executor)
+
+set(TEST_MKLDNN_CACHING_DEPS
+    op_registry
+    elementwise_mul_op
+    elementwise_add_op
+    activation_op
+    softmax_op
+    conv_op
+    im2col
+    vol2col
+    softmax
+    scope
+    device_context
+    enforce)
+if(WITH_GPU OR WITH_ROCM)
+  set(TEST_MKLDNN_CACHING_DEPS ${TEST_MKLDNN_CACHING_DEPS} depthwise_conv)
+endif()
+cc_test(
+  test_mkldnn_caching
+  SRCS test_mkldnn_caching.cc
+  DEPS ${TEST_MKLDNN_CACHING_DEPS})
+
+cc_test_old(
+  test_mkldnn_op_nhwc
+  SRCS
+  test_mkldnn_op_nhwc.cc
+  DEPS
+  op_registry
+  pool_op
+  shape_op
+  crop_op
+  activation_op
+  generated_op
+  pooling
+  transpose_op
+  fused_transpose_op
+  scope
+  device_context
+  enforce
+  executor)