【paddle_test No.27】replace parts of cc_test with paddle_test (#61675)

Liyulingyue · web-flow · commit 6b3f074c0e96 · 2024-03-01T11:20:47.000+08:00
* Update CMakeLists.txt

* add TEST_API and rm use_it_self_op

* fix code-style

* Update CMakeLists.txt

* Apply suggestions from code review

* Update CMakeLists.txt

* Update test_common_infer_shape_functions.cc

* replace cc with paddle_test

* Update selected_rows.h

* delete use_op_itself

* Update CMakeLists.txt

* add TEST_API

* Update copy_cross_scope_test.cc

* try to add TEST_API

* try to add TEST_API

* Update CMakeLists.txt
diff --git a/paddle/fluid/framework/shape_inference.h b/paddle/fluid/framework/shape_inference.h
@@ -78,13 +78,14 @@ class InferShapeContext {
 
   virtual DDim GetInputDim(const std::string &name) const = 0;
   virtual std::vector<DDim> GetInputsDim(const std::string &name) const = 0;
-  virtual std::vector<DDim> GetReaderDims(const std::string &name) const;
+  TEST_API virtual std::vector<DDim> GetReaderDims(
+      const std::string &name) const;
 
   virtual void SetOutputDim(const std::string &name, const DDim &dim) = 0;
   virtual void SetOutputsDim(const std::string &name,
                              const std::vector<DDim> &dims) = 0;
-  virtual void SetReaderDims(const std::string &name,
-                             const std::vector<DDim> &dims);
+  TEST_API virtual void SetReaderDims(const std::string &name,
+                                      const std::vector<DDim> &dims);
   virtual std::string GetInputNameByIdx(size_t idx) const = 0;
   virtual std::string GetOutputNameByIdx(size_t idx) const = 0;
   virtual AttrReader Attrs() const = 0;
diff --git a/paddle/fluid/imperative/var_helper.h b/paddle/fluid/imperative/var_helper.h
@@ -40,7 +40,7 @@ void InitializeVariable(paddle::framework::Variable* var,
 template <typename VarType>
 const paddle::platform::Place& GetPlace(const std::shared_ptr<VarType>& var);
 template <typename VarType>
-const std::string& GetNameFromVar(std::shared_ptr<VarType> var);
+TEST_API const std::string& GetNameFromVar(std::shared_ptr<VarType> var);
 
 template <typename VarType>
 bool CheckCachedKey(std::shared_ptr<VarType> tensor, const phi::KernelKey& key);
diff --git a/paddle/fluid/memory/allocation/allocator_facade.h b/paddle/fluid/memory/allocation/allocator_facade.h
@@ -49,11 +49,12 @@ class AllocatorFacade {
   const AllocatorFacade& operator=(const AllocatorFacade& o) = delete;
   ~AllocatorFacade();
 
-  static AllocatorFacade& Instance();
+  TEST_API static AllocatorFacade& Instance();
 
   AllocatorFacadePrivate* GetPrivate() const;
 
-  const std::shared_ptr<Allocator>& GetAllocator(const platform::Place& place);
+  TEST_API const std::shared_ptr<Allocator>& GetAllocator(
+      const platform::Place& place);
 
   void* GetBasePtr(const std::shared_ptr<Allocation>& allocation);
 
@@ -88,8 +89,8 @@ class AllocatorFacade {
   void RecordStream(std::shared_ptr<Allocation> allocation, gpuStream_t stream);
   void EraseStream(std::shared_ptr<Allocation> allocation, gpuStream_t stream);
 
-  const std::shared_ptr<Allocator>& GetAllocator(const platform::Place& place,
-                                                 gpuStream_t stream);
+  TEST_API const std::shared_ptr<Allocator>& GetAllocator(
+      const platform::Place& place, gpuStream_t stream);
   gpuStream_t GetStream(const std::shared_ptr<Allocation>& allocation) const;
   void SetDefaultStream(const platform::CUDAPlace& place, gpuStream_t stream);
 #endif
@@ -104,8 +105,8 @@ class AllocatorFacade {
                    phi::stream::stream_t stream);
   void RecordStream(std::shared_ptr<Allocation> allocation,
                     phi::stream::stream_t stream);
-  const std::shared_ptr<Allocator>& GetAllocator(const platform::Place& place,
-                                                 phi::stream::stream_t stream);
+  TEST_API const std::shared_ptr<Allocator>& GetAllocator(
+      const platform::Place& place, phi::stream::stream_t stream);
   phi::stream::stream_t GetStream(
       const std::shared_ptr<Allocation>& allocation) const;
   void SetDefaultStream(const platform::CustomPlace& place,
diff --git a/paddle/fluid/memory/memcpy.cc b/paddle/fluid/memory/memcpy.cc
@@ -638,12 +638,12 @@ void Copy<phi::Place, phi::Place>(phi::Place dst_place,
 
 // NOTE: only for (CPUPlace, CUDAPlace and CUDAPinnedPlace) -> (CPUPlace).
 template <>
-void Copy<phi::CPUPlace, phi::Place>(phi::CPUPlace dst_place,
-                                     void* dst,
-                                     phi::Place src_place,
-                                     const void* src,
-                                     size_t num,
-                                     void* stream) {
+TEST_API void Copy<phi::CPUPlace, phi::Place>(phi::CPUPlace dst_place,
+                                              void* dst,
+                                              phi::Place src_place,
+                                              const void* src,
+                                              size_t num,
+                                              void* stream) {
   Copy(phi::Place(dst_place.GetType()), dst, src_place, src, num, stream);
 }
 
@@ -835,11 +835,11 @@ TEST_API void Copy<phi::Place, phi::CPUPlace>(phi::Place dst_place,
 
 // NOTE: Only for (CPUPlace and PinnedPlace) -> (CPUPlace).
 template <>
-void Copy<phi::CPUPlace, phi::Place>(phi::CPUPlace dst_place,
-                                     void* dst,
-                                     phi::Place src_place,
-                                     const void* src,
-                                     size_t num) {
+TEST_API void Copy<phi::CPUPlace, phi::Place>(phi::CPUPlace dst_place,
+                                              void* dst,
+                                              phi::Place src_place,
+                                              const void* src,
+                                              size_t num) {
   Copy(phi::Place(dst_place.GetType()), dst, src_place, src, num);
 }
 
@@ -872,12 +872,12 @@ void Copy<phi::Place, phi::Place>(phi::Place dst_place,
 }
 
 template <>
-void Copy<phi::CPUPlace, phi::Place>(phi::CPUPlace dst_place,
-                                     void* dst,
-                                     phi::Place src_place,
-                                     const void* src,
-                                     size_t num,
-                                     void* stream) {
+TEST_API void Copy<phi::CPUPlace, phi::Place>(phi::CPUPlace dst_place,
+                                              void* dst,
+                                              phi::Place src_place,
+                                              const void* src,
+                                              size_t num,
+                                              void* stream) {
   Copy(phi::Place(dst_place.GetType()), dst, src_place, src, num, stream);
 }
 
diff --git a/paddle/fluid/memory/memcpy.h b/paddle/fluid/memory/memcpy.h
@@ -31,7 +31,7 @@ namespace memory {
  *
  */
 template <typename DstPlace, typename SrcPlace>
-void Copy(DstPlace, void* dst, SrcPlace, const void* src, size_t num);
+TEST_API void Copy(DstPlace, void* dst, SrcPlace, const void* src, size_t num);
 
 /**
  * \brief   Copy memory from one place to another place.
@@ -51,7 +51,7 @@ void Copy(DstPlace, void* dst, SrcPlace, const void* src, size_t num);
  *
  */
 template <typename DstPlace, typename SrcPlace>
-void Copy(
+TEST_API void Copy(
     DstPlace, void* dst, SrcPlace, const void* src, size_t num, void* stream);
 }  // namespace memory
 }  // namespace paddle
diff --git a/paddle/fluid/operators/common_infer_shape_functions.h b/paddle/fluid/operators/common_infer_shape_functions.h
@@ -34,12 +34,13 @@ framework::DDim BroadcastTwoDims(const framework::DDim& x_dims,
                                  int axis = -1);
 }
 // shape input(0) -> output(0) without change.
-void UnaryOpUnchangedInferShape(framework::InferShapeContext* ctx);
+TEST_API void UnaryOpUnchangedInferShape(framework::InferShapeContext* ctx);
 // shape input(0) -> output(0) without change, check if axis in range [-Rank(x),
 // Rank(x)-1]
-void UnaryOpUnchangedInferShapeCheckAxis(framework::InferShapeContext* ctx);
+TEST_API void UnaryOpUnchangedInferShapeCheckAxis(
+    framework::InferShapeContext* ctx);
 // broadcast input(0) and input(1) -> output(0)
-void BinaryOpBroadcastInferShape(framework::InferShapeContext* ctx);
+TEST_API void BinaryOpBroadcastInferShape(framework::InferShapeContext* ctx);
 
 }  // namespace operators
 }  // namespace paddle
diff --git a/paddle/phi/core/selected_rows.h b/paddle/phi/core/selected_rows.h
@@ -42,7 +42,8 @@ class SelectedRows : public TensorBase,
    *
    */
  public:
-  SelectedRows(const std::vector<int64_t>& rows, const int64_t& height);
+  TEST_API SelectedRows(const std::vector<int64_t>& rows,
+                        const int64_t& height);
 
   TEST_API SelectedRows();
 
diff --git a/test/cpp/fluid/CMakeLists.txt b/test/cpp/fluid/CMakeLists.txt
@@ -33,14 +33,12 @@ endif()
 set(COMMON_OP_DEPS ${COMMON_OP_DEPS} executor)
 
 if(WITH_XPU)
-  cc_test(
-    beam_search_decode_op_xpu_test
-    SRCS beam_search_decode_op_xpu_test.cc
-    DEPS lod_tensor)
+  paddle_test(beam_search_decode_op_xpu_test SRCS
+              beam_search_decode_op_xpu_test.cc)
   set(COMMON_OP_DEPS ${COMMON_OP_DEPS} xpulib)
 endif()
 
-cc_test(
+nv_test(
   test_common_infer_shape_functions
   SRCS test_common_infer_shape_functions.cc
   DEPS common_infer_shape_functions
@@ -51,30 +49,12 @@ cc_test(
        phi
        common
        generated_static_op)
-cc_test(
-  gather_test
-  SRCS gather_test.cc
-  DEPS tensor)
-cc_test(
-  assign_op_test
-  SRCS assign_op_test.cc
-  DEPS generated_static_op)
-cc_test(
-  scatter_test
-  SRCS scatter_test.cc
-  DEPS tensor phi common)
-cc_test(
-  beam_search_decode_op_test
-  SRCS beam_search_decode_op_test.cc
-  DEPS lod_tensor)
-cc_test(
-  save_load_op_test
-  SRCS save_load_op_test.cc
-  DEPS save_op load_op)
-cc_test(
-  save_load_combine_op_test
-  SRCS save_load_combine_op_test.cc
-  DEPS save_combine_op load_combine_op)
+paddle_test(gather_test SRCS gather_test.cc)
+paddle_test(assign_op_test SRCS assign_op_test.cc)
+paddle_test(scatter_test SRCS scatter_test.cc DEPS common)
+paddle_test(beam_search_decode_op_test SRCS beam_search_decode_op_test.cc)
+paddle_test(save_load_op_test SRCS save_load_op_test.cc)
+paddle_test(save_load_combine_op_test SRCS save_load_combine_op_test.cc)
 if(WITH_CINN)
   set(CINN_DEPS python)
 endif()
@@ -109,15 +89,10 @@ elseif(WITH_ROCM)
          test_leaky_relu_grad_grad_functor.cu
     DEPS tensor device_context eigen3)
 else()
-  cc_test(
-    test_leaky_relu_grad_grad_functor
-    SRCS test_leaky_relu_grad_grad_functor.cc
-    DEPS tensor device_context eigen3)
+  paddle_test(test_leaky_relu_grad_grad_functor SRCS
+              test_leaky_relu_grad_grad_functor.cc)
 endif()
-cc_test(
-  share_buffer_op_cpp_test
-  SRCS share_buffer_op_test.cc
-  DEPS lod_tensor device_context generated_static_op)
+paddle_test(share_buffer_op_cpp_test SRCS share_buffer_op_test.cc)
 
 if(WITH_CINN)
   paddle_test(op_debug_string_test SRCS op_debug_string_test.cc)
@@ -126,16 +101,7 @@ else()
 endif()
 
 if(WITH_GPU)
-  cc_test(
-    copy_cross_scope_test
-    SRCS copy_cross_scope_test.cc
-    DEPS op_registry
-         copy_cross_scope_op
-         scope
-         device_context
-         enforce
-         executor
-         common)
+  paddle_test(copy_cross_scope_test SRCS copy_cross_scope_test.cc)
 endif()
 
 if(WITH_ONNXRUNTIME AND WIN32)
diff --git a/test/cpp/fluid/copy_cross_scope_test.cc b/test/cpp/fluid/copy_cross_scope_test.cc
@@ -33,8 +33,6 @@ limitations under the License. */
 namespace f = paddle::framework;
 namespace p = paddle::platform;
 
-USE_NO_KERNEL_OP(copy_cross_scope);
-
 template <typename T>
 void Compare1(f::Scope* scope,
               const p::DeviceContext& ctx,
diff --git a/test/cpp/fluid/save_load_combine_op_test.cc b/test/cpp/fluid/save_load_combine_op_test.cc
@@ -22,11 +22,6 @@ limitations under the License. */
 #include "paddle/fluid/platform/float16.h"
 #include "paddle/phi/core/kernel_registry.h"
 
-USE_OP_ITSELF(save_combine);
-USE_OP_ITSELF(load_combine);
-PD_DECLARE_KERNEL(save_combine_tensor, CPU, ALL_LAYOUT);
-PD_DECLARE_KERNEL(load_combine, CPU, ALL_LAYOUT);
-
 template <typename T, typename U>
 T* CreateForSaveCombineOp(int x,
                           int y,
diff --git a/test/cpp/fluid/save_load_op_test.cc b/test/cpp/fluid/save_load_op_test.cc
@@ -17,12 +17,8 @@ limitations under the License. */
 #include "paddle/fluid/platform/float16.h"
 #include "paddle/phi/core/kernel_registry.h"
 
-USE_OP_ITSELF(save);
-PD_DECLARE_KERNEL(save, CPU, ALL_LAYOUT);
 PD_DECLARE_KERNEL(save_sr, CPU, ALL_LAYOUT);
 PD_DECLARE_KERNEL(cast, CPU, ALL_LAYOUT);
-USE_OP_ITSELF(load);
-PD_DECLARE_KERNEL(load, CPU, ALL_LAYOUT);
 PD_DECLARE_KERNEL(load_sr, CPU, ALL_LAYOUT);
 
 TEST(SaveLoadOp, CPU) {
diff --git a/test/cpp/fluid/share_buffer_op_test.cc b/test/cpp/fluid/share_buffer_op_test.cc
@@ -20,14 +20,6 @@
 #include "paddle/fluid/platform/place.h"
 #include "paddle/phi/core/kernel_registry.h"
 
-USE_OP_ITSELF(share_buffer);
-
-PD_DECLARE_KERNEL(share_buffer, CPU, ALL_LAYOUT);
-
-#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
-PD_DECLARE_KERNEL(share_buffer, GPU, ALL_LAYOUT);
-#endif
-
 namespace paddle {
 namespace framework {
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,8 @@ class SelectedRows : public TensorBase,`
`42`	`42`	`*`
`43`	`43`	`*/`
`44`	`44`	`public:`
`45`		`- SelectedRows(const std::vector<int64_t>& rows, const int64_t& height);`
	`45`	`+ TEST_API SelectedRows(const std::vector<int64_t>& rows,`
	`46`	`+ const int64_t& height);`
`46`	`47`
`47`	`48`	`TEST_API SelectedRows();`
`48`	`49`