【paddle_test No.5】replace cc_test with paddle_test (#60834)

Liyulingyue · web-flow · commit d26851ed07f5 · 2024-02-01T11:30:15.000+08:00
diff --git a/paddle/cinn/frontend/interpreter.h b/paddle/cinn/frontend/interpreter.h
@@ -32,8 +32,9 @@ namespace frontend {
  */
 class Interpreter final {
  public:
-  Interpreter(const std::vector<std::string>& input_names,
-              const std::vector<hlir::framework::shape_t>& input_shapes);
+  TEST_API Interpreter(
+      const std::vector<std::string>& input_names,
+      const std::vector<hlir::framework::shape_t>& input_shapes);
 
   /**
    * Load a Paddle model.
@@ -49,15 +50,15 @@ class Interpreter final {
   /**
    * Run the executor.
    */
-  void Run();
+  TEST_API void Run();
 
   frontend::Program GetProgram();
 
   hlir::framework::Tensor GetTensor(const std::string& name);
 
   std::shared_ptr<hlir::framework::Scope> GetScope();
 
-  ~Interpreter();
+  TEST_API ~Interpreter();
 
  private:
   class Impl;
diff --git a/paddle/fluid/framework/new_executor/interpretercore.h b/paddle/fluid/framework/new_executor/interpretercore.h
@@ -36,27 +36,29 @@ class InterpreterCore {
                   Scope* scope,
                   const ExecutionConfig& execution_config = ExecutionConfig());
   // This constructor is for New IR.
-  InterpreterCore(const platform::Place& place,
-                  const std::vector<std::string>& fetch_var_names,
-                  const ::pir::Block* ir_prog,
-                  Scope* scope,
-                  const ExecutionConfig& execution_config = ExecutionConfig());
-  ~InterpreterCore();
+  TEST_API InterpreterCore(
+      const platform::Place& place,
+      const std::vector<std::string>& fetch_var_names,
+      const ::pir::Block* ir_prog,
+      Scope* scope,
+      const ExecutionConfig& execution_config = ExecutionConfig());
+  TEST_API ~InterpreterCore();
 
   const InterpreterBaseImpl* Impl() const { return impl_.get(); }
 
-  paddle::framework::FetchList Run(
+  TEST_API paddle::framework::FetchList Run(
       const std::vector<std::string>& feed_names,
       const std::vector<phi::DenseTensor>& feed_tensors,
       bool need_fetch = true,
       bool enable_job_schedule_profiler = false,
       bool switch_stream = false);
 
-  paddle::framework::FetchList Run(const std::vector<std::string>& feed_names,
-                                   bool need_fetch = true,
-                                   bool enable_job_schedule_profiler = false,
-                                   bool enable_op_profiling = false,
-                                   bool switch_stream = false);
+  TEST_API paddle::framework::FetchList Run(
+      const std::vector<std::string>& feed_names,
+      bool need_fetch = true,
+      bool enable_job_schedule_profiler = false,
+      bool enable_op_profiling = false,
+      bool switch_stream = false);
 
   void RunProfile(const std::vector<std::string>& feed_names);
 
@@ -68,7 +70,7 @@ class InterpreterCore {
 
   void SetCopyProgram(std::shared_ptr<ProgramDesc> prog);
 
-  void SetSkipGcVars(const std::set<std::string>& skip_gc_vars);
+  TEST_API void SetSkipGcVars(const std::set<std::string>& skip_gc_vars);
 
   const std::set<std::string>& JitInputVars() const;
 
@@ -94,7 +96,7 @@ class InterpreterCore {
   std::tuple<double, double> InterpreterRunTime();
 
   // Only for debug
-  Variable* DebugVar(const std::string& name) const;
+  TEST_API Variable* DebugVar(const std::string& name) const;
 
  private:
   DISABLE_COPY_AND_ASSIGN(InterpreterCore);
diff --git a/paddle/fluid/pir/dialect/op_generator/op_gen.py b/paddle/fluid/pir/dialect/op_generator/op_gen.py
@@ -50,10 +50,18 @@
     'AbsOp',
     'FullOp',
     'UniformOp',
+    'ScaleOp',
+    'AddOp',
     'Conv2dOp',
     'BatchNormOp',
     'FetchOp',
+    'MatmulOp',
+    'SoftmaxOp',
+    'ReshapeOp',
     'TransposeOp',
+    'LessThanOp',
+    'AddGradOp',
+    'MatmulGradOp',
 ]
 
 # =====================================
diff --git a/paddle/fluid/pir/dialect/operator/ir/control_flow_op.h b/paddle/fluid/pir/dialect/operator/ir/control_flow_op.h
@@ -34,11 +34,11 @@ class IfOp : public pir::Op<IfOp, VjpInterface> {
                              pir::Value cond,
                              std::vector<pir::Type> &&output_types);
 
-  static void Build(pir::Builder &builder,             // NOLINT
-                    pir::OperationArgument &argument,  // NOLINT
-                    pir::Value cond,
-                    std::unique_ptr<pir::Block> &&true_block,
-                    std::unique_ptr<pir::Block> &&false_block);
+  TEST_API static void Build(pir::Builder &builder,             // NOLINT
+                             pir::OperationArgument &argument,  // NOLINT
+                             pir::Value cond,
+                             std::unique_ptr<pir::Block> &&true_block,
+                             std::unique_ptr<pir::Block> &&false_block);
 
   pir::Value cond() { return operand_source(0); }
   TEST_API pir::Block &true_block();
@@ -74,13 +74,13 @@ class WhileOp : public pir::Op<WhileOp, VjpInterface> {
   static constexpr uint32_t attributes_num = 0;
   static constexpr const char **attributes_name = nullptr;
 
-  static void Build(pir::Builder &builder,             // NOLINT
-                    pir::OperationArgument &argument,  // NOLINT
-                    pir::Value cond,
-                    const std::vector<pir::Value> &inputs,
-                    bool construct_body = true);
+  TEST_API static void Build(pir::Builder &builder,             // NOLINT
+                             pir::OperationArgument &argument,  // NOLINT
+                             pir::Value cond,
+                             const std::vector<pir::Value> &inputs,
+                             bool construct_body = true);
   TEST_API pir::Block &body();
-  pir::Value cond();
+  TEST_API pir::Value cond();
   const pir::Block::ArgsType &block_args() { return body().args(); }
   void Print(pir::IrPrinter &printer);  // NOLINT
   void VerifySig();
@@ -122,9 +122,9 @@ class HasElementsOp : public pir::Op<HasElementsOp> {
   static constexpr uint32_t attributes_num = 0;
   static constexpr const char **attributes_name = nullptr;
 
-  static void Build(pir::Builder &builder,             // NOLINT
-                    pir::OperationArgument &argument,  // NOLINT
-                    pir::Value container);
+  TEST_API static void Build(pir::Builder &builder,             // NOLINT
+                             pir::OperationArgument &argument,  // NOLINT
+                             pir::Value container);
   void VerifySig();
   pir::Value input() { return operand_source(0); }
   pir::Value out() { return result(0); }
diff --git a/paddle/fluid/pir/dialect/operator/ir/manual_op.h b/paddle/fluid/pir/dialect/operator/ir/manual_op.h
@@ -45,9 +45,9 @@ class AddNOp : public pir::Op<AddNOp,
   static constexpr const char **attributes_name = nullptr;
   static constexpr uint32_t attributes_num = 0;
   static OpInfoTuple GetOpInfo();
-  static void Build(pir::Builder &builder,             // NOLINT
-                    pir::OperationArgument &argument,  // NOLINT
-                    pir::Value inputs);
+  TEST_API static void Build(pir::Builder &builder,             // NOLINT
+                             pir::OperationArgument &argument,  // NOLINT
+                             pir::Value inputs);
 
   void VerifySig();
   pir::Value inputs() { return operand_source(0); }
diff --git a/test/cpp/pir/control_flow_dialect/CMakeLists.txt b/test/cpp/pir/control_flow_dialect/CMakeLists.txt
@@ -1,11 +1,10 @@
 if(NOT WITH_ROCM)
-  cc_test(
-    if_op_test
-    SRCS if_op_test.cc
-    DEPS pir op_dialect_vjp pir_transforms op_dialect gtest)
+  paddle_test(if_op_test SRCS if_op_test.cc)
+  if(WITH_ONNXRUNTIME AND WIN32)
+    # Copy onnxruntime for some c++ test in Windows, since the test will
+    # be build only in CI, so suppose the generator in Windows is Ninja.
+    copy_onnx(if_op_test)
+  endif()
 
-  cc_test(
-    while_op_test
-    SRCS while_op_test.cc
-    DEPS pir op_dialect_vjp pir_transforms op_dialect gtest device_event_base)
+  paddle_test(while_op_test SRCS while_op_test.cc)
 endif()
