[compiler opt]change_cc_test_old (#59477)

Galaxy1458 · web-flow · commit 866819acc86b · 2023-12-11T10:40:10.000+08:00
* chang_cc_test_old

* chang_cc_test_old

* chang_cc_test_old

* chang_cc_test_old

* chang_cc_test_old

* chang_cc_test_old

* update

* update

* update

* update

* chang_cc_test_old

* chang_cc_test_old

* chang_cc_test_old

* chang_cc_test_old

* chang_cc_test_old

* chang_cc_test_old

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* fix

* update

* update

* fix bug in windows

* fix windows bug

* Update CMakeLists.txt

* fix

* Update CMakeLists.txt

* fix

* fix

* Update CMakeLists.txt

* Update CMakeLists.txt

* fix win-infer

* Update CMakeLists.txt

* fix win infer
diff --git a/cmake/generic.cmake b/cmake/generic.cmake
@@ -595,8 +595,8 @@ function(paddle_test_build TARGET_NAME)
     add_executable(${TARGET_NAME} ${paddle_test_SRCS})
     get_property(paddle_lib GLOBAL PROPERTY PADDLE_LIB_NAME)
     target_link_libraries(${TARGET_NAME} $<TARGET_LINKER_FILE:${paddle_lib}>
-                          ${paddle_test_DEPS} paddle_gtest_main_new)
-    add_dependencies(${TARGET_NAME} ${paddle_lib} ${paddle_test_DEPS}
+                          ${paddle_test_DEPS} common paddle_gtest_main_new)
+    add_dependencies(${TARGET_NAME} ${paddle_lib} ${paddle_test_DEPS} common
                      paddle_gtest_main_new)
     if(WITH_SHARED_PHI)
       target_link_libraries(${TARGET_NAME} $<TARGET_LINKER_FILE:phi>)
diff --git a/paddle/fluid/inference/utils/CMakeLists.txt b/paddle/fluid/inference/utils/CMakeLists.txt
@@ -12,23 +12,14 @@ cc_library(
   SRCS model_utils.cc
   DEPS proto_desc enforce common)
 
-cc_test_old(
-  infer_io_utils_tester
-  SRCS
-  io_utils_tester.cc
-  DEPS
-  infer_io_utils
-  fleet_executor
-  parallel_executor
-  python)
+cc_library(table_printer SRCS table_printer.cc)
+paddle_test(test_table_printer SRCS table_printer_tester.cc)
+
+proto_library(shape_range_info_proto SRCS shape_range_info.proto)
 
 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(infer_io_utils_tester)
+  copy_onnx(test_benchmark)
+  copy_onnx(test_table_printer)
 endif()
-
-cc_library(table_printer SRCS table_printer.cc)
-paddle_test(test_table_printer SRCS table_printer_tester.cc)
-
-proto_library(shape_range_info_proto SRCS shape_range_info.proto)
diff --git a/paddle/fluid/inference/utils/io_utils.h b/paddle/fluid/inference/utils/io_utils.h
@@ -30,35 +30,37 @@ namespace inference {
 
 constexpr uint32_t kCurPDTensorVersion = 0;
 
-void SerializePDTensorToStream(std::ostream* os, const PaddleTensor& tensor);
-void DeserializePDTensorToStream(std::istream& is, PaddleTensor* tensor);
+TEST_API void SerializePDTensorToStream(std::ostream* os,
+                                        const PaddleTensor& tensor);
+TEST_API void DeserializePDTensorToStream(std::istream& is,
+                                          PaddleTensor* tensor);
 
-void SerializePDTensorsToStream(std::ostream* os,
-                                const std::vector<PaddleTensor>& tensors);
-void DeserializePDTensorsToStream(std::istream& is,
-                                  std::vector<PaddleTensor>* tensors);
+TEST_API void SerializePDTensorsToStream(
+    std::ostream* os, const std::vector<PaddleTensor>& tensors);
+TEST_API void DeserializePDTensorsToStream(std::istream& is,
+                                           std::vector<PaddleTensor>* tensors);
 
-void SerializePDTensorsToFile(const std::string& path,
-                              const std::vector<PaddleTensor>& tensors);
-void DeserializePDTensorsToFile(const std::string& path,
-                                std::vector<PaddleTensor>* tensors);
-void SerializeShapeRangeInfo(
+TEST_API void SerializePDTensorsToFile(
+    const std::string& path, const std::vector<PaddleTensor>& tensors);
+TEST_API void DeserializePDTensorsToFile(const std::string& path,
+                                         std::vector<PaddleTensor>* tensors);
+TEST_API void SerializeShapeRangeInfo(
     const std::string& path,
     const std::map<std::string, std::vector<int32_t>>& min_shape,
     const std::map<std::string, std::vector<int32_t>>& max_shape,
     const std::map<std::string, std::vector<int32_t>>& opt_shape,
     const std::map<std::string, std::vector<int32_t>>& min_value,
     const std::map<std::string, std::vector<int32_t>>& max_value,
     const std::map<std::string, std::vector<int32_t>>& opt_value);
-void DeserializeShapeRangeInfo(
+TEST_API void DeserializeShapeRangeInfo(
     const std::string& path,
     std::map<std::string, std::vector<int32_t>>* min_shape,
     std::map<std::string, std::vector<int32_t>>* max_shape,
     std::map<std::string, std::vector<int32_t>>* opt_shape,
     std::map<std::string, std::vector<int32_t>>* min_value,
     std::map<std::string, std::vector<int32_t>>* max_value,
     std::map<std::string, std::vector<int32_t>>* opt_value);
-void UpdateShapeRangeInfo(
+TEST_API void UpdateShapeRangeInfo(
     const std::string& path,
     const std::map<std::string, std::vector<int32_t>>& min_shape,
     const std::map<std::string, std::vector<int32_t>>& max_shape,
diff --git a/paddle/phi/common/place.h b/paddle/phi/common/place.h
@@ -55,7 +55,7 @@ class TEST_API CustomRegisteredDeviceMap {
 const char* AllocationTypeStr(AllocationType type);
 
 /// \brief The place is used to specify where the data is stored.
-class PADDLE_API Place {
+class TEST_API Place {
  public:
   Place()
       : device(0), alloc_type_(AllocationType::UNDEFINED), device_type_id_(0) {}
diff --git a/test/cpp/fluid/CMakeLists.txt b/test/cpp/fluid/CMakeLists.txt
@@ -1,5 +1,8 @@
 add_subdirectory(benchmark)
 add_subdirectory(framework)
+
+add_subdirectory(inference)
+
 if(WITH_CINN)
   add_subdirectory(cinn)
 endif()
diff --git a/test/cpp/fluid/inference/CMakeLists.txt b/test/cpp/fluid/inference/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(utils)
diff --git a/test/cpp/fluid/inference/utils/CMakeLists.txt b/test/cpp/fluid/inference/utils/CMakeLists.txt
@@ -0,0 +1,16 @@
+if(WITH_TESTING)
+    if(NOT APPLE)
+      inference_base_test(
+            infer_io_utils_tester SRCS io_utils_tester.cc 
+            DEPS
+            paddle_inference_shared
+            common
+      )
+      endif()
+endif()
+
+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(infer_io_utils_tester)
+endif()
diff --git a/test/cpp/fluid/inference/utils/io_utils_tester.cc b/test/cpp/fluid/inference/utils/io_utils_tester.cc
diff --git a/test/cpp/pir/core/CMakeLists.txt b/test/cpp/pir/core/CMakeLists.txt
@@ -1,19 +1,16 @@
-cc_test(
-  type_test
-  SRCS type_test.cc
-  DEPS pir op_dialect_vjp)
-cc_test_old(ir_attribute_test SRCS ir_attribute_test.cc DEPS pir gtest)
-cc_test_old(ir_value_test SRCS ir_value_test.cc DEPS pir gtest)
-cc_test_old(
+paddle_test(type_test SRCS type_test.cc DEPS pir op_dialect_vjp)
+paddle_test(ir_attribute_test SRCS ir_attribute_test.cc DEPS pir)
+paddle_test(ir_value_test SRCS ir_value_test.cc DEPS pir)
+paddle_test(
   ir_op_test
   SRCS
   ir_op_test.cc
   DEPS
   pir
   test_dialect
   op_dialect_vjp)
-cc_test_old(ir_region_test SRCS ir_region_test.cc DEPS pir gtest)
-cc_test_old(ir_builder_test SRCS ir_builder_test.cc DEPS pir gtest)
+paddle_test(ir_region_test SRCS ir_region_test.cc DEPS pir)
+paddle_test(ir_builder_test SRCS ir_builder_test.cc DEPS pir)
 cc_test_old(
   ir_program_test
   SRCS
@@ -134,14 +131,8 @@ cc_test_old(
   gtest
   pir)
 
-cc_test_old(
-  block_argument_test
-  SRCS
-  block_argument_test.cc
-  DEPS
-  test_dialect
-  gtest
-  pir)
+paddle_test(block_argument_test SRCS block_argument_test.cc DEPS test_dialect
+            pir)
 
 if(WITH_ONNXRUNTIME AND WIN32)
   # Copy onnxruntime for some c++ test in Windows, since the test will
diff --git a/test/cpp/pir/core/ir_value_test.cc b/test/cpp/pir/core/ir_value_test.cc
@@ -14,17 +14,33 @@
 
 #include <gtest/gtest.h>
 
+#include "paddle/fluid/pir/dialect/operator/ir/op_type.h"
 #include "paddle/pir/core/attribute.h"
 #include "paddle/pir/core/builtin_attribute.h"
+#include "paddle/pir/core/builtin_type.h"
 #include "paddle/pir/core/ir_context.h"
 #include "paddle/pir/core/operation.h"
-
-#include "test/cpp/pir/tools/test_pir_utils.h"
+#include "paddle/pir/dialect/shape/utils/shape_utils.h"
 
 // This unittest is used to test the construction interfaces of value class and
 // operation. The constructed test scenario is: a = OP1(); b = OP2(); c = OP3(a,
 // b); d, e, f, g, h, i, j = OP4(a, c);
+namespace test {
+
+pir::AttributeMap CreateAttributeMap(
+    const std::vector<std::string> &attribute_names,
+    const std::vector<std::string> &attributes) {
+  pir::IrContext *ctx = pir::IrContext::Instance();
+  pir::AttributeMap attr_map;
+  for (size_t i = 0; i < attribute_names.size(); i++) {
+    pir::Attribute attr_value = pir::StrAttribute::get(ctx, attributes[i]);
+    attr_map.insert(
+        std::pair<std::string, pir::Attribute>(attribute_names[i], attr_value));
+  }
+  return attr_map;
+}
 
+}  // namespace test
 TEST(value_test, value_test) {
   pir::IrContext *ctx = pir::IrContext::Instance();
   // 1. Construct OP1: a = OP1()
