【paddle_test No.16】replace parts of cc_test with paddle_test

paddle/fluid/framework/ir/pass.h

@@ -37,7 +37,7 @@ constexpr char kStartupProgramDescs[] = "startup_program_descs";
 }  // namespace details
 
 namespace ir {
-class Graph;
+class TEST_API Graph;
 
 template <typename PassType>
 struct PassRegistrar;
@@ -81,7 +81,7 @@ class Pass {
 
   std::string Type() const { return type_; }
 
-  Graph *Apply(Graph *graph) const;
+  TEST_API Graph *Apply(Graph *graph) const;
 
   // Get a reference to the attributed previously set.
   template <typename AttrType>
@@ -238,7 +238,7 @@ class Registrar {
 
 class PassRegistry {
  public:
-  static PassRegistry &Instance();
+  TEST_API static PassRegistry &Instance();
 
   bool Has(const std::string &pass_type) const {
     return map_.find(pass_type) != map_.end();

test/cpp/fluid/mkldnn/CMakeLists.txt

@@ -1,30 +1,6 @@
 get_property(paddle_lib GLOBAL PROPERTY PADDLE_LIB_NAME)
-cc_test(
-  test_mkldnn_op_inplace
-  SRCS test_mkldnn_op_inplace.cc
-  DEPS executor
-       op_registry
-       elementwise_add_op
-       activation_op
-       phi
-       common
-       scope
-       device_context
-       enforce
-       generated_static_op)
-cc_test(
-  test_mkldnn_cpu_quantize_pass
-  SRCS test_mkldnn_cpu_quantize_pass.cc
-  DEPS executor
-       op_registry
-       activation_op
-       conv_activation_mkldnn_fuse_pass
-       cpu_quantize_placement_pass
-       cpu_quantize_pass
-       phi
-       common
-       scope
-       device_context)
+paddle_test(test_mkldnn_op_inplace SRCS test_mkldnn_op_inplace.cc)
+paddle_test(test_mkldnn_cpu_quantize_pass SRCS test_mkldnn_cpu_quantize_pass.cc)
 
 cc_test(
   test_conv_mkldnn_nhwc

test/cpp/fluid/mkldnn/test_mkldnn_cpu_quantize_pass.cc

@@ -110,7 +110,3 @@ TEST(cpuQuantizePass, ConvReLU6) {
 
 }  // namespace pass
 }  // namespace paddle
-
-USE_PASS(conv_activation_mkldnn_fuse_pass);
-USE_PASS(cpu_quantize_placement_pass);
-USE_PASS(cpu_quantize_pass);

test/cpp/fluid/mkldnn/test_mkldnn_op_inplace.cc

@@ -26,13 +26,7 @@
 #include "paddle/phi/core/enforce.h"
 #include "paddle/phi/core/kernel_registry.h"
 
-USE_OP_ITSELF(elementwise_add);
 PD_DECLARE_KERNEL(add_raw, OneDNN, ONEDNN);
-USE_OP_ITSELF(relu);
-PD_DECLARE_KERNEL(relu, OneDNN, ONEDNN);
-USE_OP_ITSELF(softmax);
-PD_DECLARE_KERNEL(softmax, OneDNN, ONEDNN);
-PD_DECLARE_KERNEL(softmax, CPU, ALL_LAYOUT);
 
 namespace paddle {
 namespace operators {