link cpp test to libpaddle.so/dll

PaddlePaddle · Sep 27, 2023 · 1a59e26 · 1a59e26
1 parent 34210af
commit 1a59e26
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 19 deletions.
diff --git a/paddle/fluid/imperative/var_helper.h b/paddle/fluid/imperative/var_helper.h
@@ -17,6 +17,7 @@
 #include <vector>
 
 #include "paddle/fluid/framework/variable.h"
+#include "paddle/utils/test_macros.h"
 
 namespace egr {
 class EagerVariable;
@@ -66,7 +67,8 @@ template <typename VarType>
 phi::DataLayout GetDataLayout(std::shared_ptr<VarType> var);
 
 template <typename VarType>
-void SetDataLayout(std::shared_ptr<VarType> var, const phi::DataLayout layout);
+void TEST_API SetDataLayout(std::shared_ptr<VarType> var,
+                            const phi::DataLayout layout);
 
 template <typename VarType>
 const std::shared_ptr<VariableWrapper>& GetVariableWrapper(

diff --git a/paddle/phi/core/allocator.h b/paddle/phi/core/allocator.h
@@ -19,14 +19,15 @@ limitations under the License. */
 #include <memory>
 
 #include "paddle/phi/common/place.h"
+#include "paddle/utils/test_macros.h"
 
 namespace phi {
 
 /// \brief Fancy pointer with deleter. The use of this data type
 /// is to be compatible with allocators from different frameworks
 /// without significant performance loss. This class does not
 /// support being inherited.
-class Allocation {
+class TEST_API Allocation {
  public:
   using Place = phi::Place;
   using DeleterFnPtr = void (*)(Allocation*);

diff --git a/paddle/phi/core/extended_tensor.h b/paddle/phi/core/extended_tensor.h
@@ -18,12 +18,13 @@ limitations under the License. */
 #include "paddle/phi/core/allocator.h"
 #include "paddle/phi/core/tensor_base.h"
 #include "paddle/phi/core/tensor_meta.h"
+#include "paddle/utils/test_macros.h"
 namespace phi {
 
 /// \brief The ExtendedTensor is a interface for custom designed class.
 /// If you want to pass some self-designed data as input/output to kernels,
 /// you can inherit from this class to store your self-designed data.
-class ExtendedTensor : public TensorBase {
+class TEST_API ExtendedTensor : public TensorBase {
  public:
   ExtendedTensor() = default;
   virtual ~ExtendedTensor() = default;

diff --git a/paddle/phi/core/selected_rows.h b/paddle/phi/core/selected_rows.h
@@ -22,10 +22,11 @@ limitations under the License. */
 #include <vector>
 
 #include "paddle/phi/core/selected_rows_impl.h"
+#include "paddle/utils/test_macros.h"
 
 namespace phi {
-class SelectedRows : public TensorBase,
-                     public TypeInfoTraits<TensorBase, SelectedRows> {
+class TEST_API SelectedRows : public TensorBase,
+                              public TypeInfoTraits<TensorBase, SelectedRows> {
   /*
    * @brief We can use the SelectedRows structure to reproduce a sparse table.
    *  A sparse table is a key-value structure that the key is an `int64_t`,

diff --git a/paddle/phi/core/selected_rows_impl.h b/paddle/phi/core/selected_rows_impl.h
@@ -26,9 +26,9 @@ limitations under the License. */
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/enforce.h"
 #include "paddle/phi/core/utils/rw_lock.h"
-
+#include "paddle/utils/test_macros.h"
 namespace phi {
-class SelectedRowsImpl {
+class TEST_API SelectedRowsImpl {
   /*
    * @brief We can use the SelectedRowsImpl structure to reproduce a sparse
    * table.

diff --git a/paddle/phi/core/utils/type_info.h b/paddle/phi/core/utils/type_info.h
@@ -15,7 +15,7 @@ limitations under the License. */
 #pragma once
 
 #include <string>
-
+#include "paddle/utils/test_macros.h"
 namespace phi {
 
 template <typename BaseT>
@@ -40,7 +40,7 @@ class TypeInfo {
 };
 
 template <typename BaseT, typename DerivedT>
-class TypeInfoTraits {
+class TEST_API TypeInfoTraits {
  public:
   static const TypeInfo<BaseT> kType;
   TypeInfoTraits();

diff --git a/paddle/testing/CMakeLists.txt b/paddle/testing/CMakeLists.txt
@@ -1,6 +1,6 @@
 # for paddle test case
-
 if(WITH_TESTING)
+  get_property(paddle_lib GLOBAL PROPERTY PADDLE_LIB_NAME)
   set(paddle_gtest_main_deps
       device_context
       gtest
@@ -22,7 +22,7 @@ if(WITH_TESTING)
   cc_library(
     paddle_gtest_main_new
     SRCS paddle_gtest_main.cc
-    DEPS gtest xxhash framework_proto eigen3 dlpack)
+    DEPS ${paddle_lib})
   if(WITH_MKLDNN)
     add_dependencies(paddle_gtest_main_new mkldnn)
   endif()

diff --git a/test/cpp/eager/data_structure_tests/CMakeLists.txt b/test/cpp/eager/data_structure_tests/CMakeLists.txt
@@ -1,14 +1,7 @@
 if(WITH_CINN)
   set(eager_deps ${eager_deps} cinn_compiler python)
 endif()
-cc_test_old(
-  test_egr_ds_eager_tensor
-  SRCS
-  eager_tensor_test.cc
-  DEPS
-  fleet_executor
-  final_dygraph_function
-  ${eager_deps})
+paddle_test(test_egr_ds_eager_tensor SRCS eager_tensor_test.cc)
 cc_test_old(
   test_egr_ds_auotgrad_meta
   SRCS