make all cpp tests dynamic linked to libpaddle.so [except windows] (P…

…addlePaddle#47088)

* make all cpp tests dynamic linked to libpaddle.so

* add comments

* keep old cc_test for some tests

* fix some ut

* make some ut use cc_test_old

* fix typos and fit for win32

* fix lib path

* fix some tests

* skip lite test

* fit for rocm

* fit for cinn

* fit for mac

* fit for win32

* skip inference ut

* skip  windows

* fix coverage

CMakeLists.txt

@@ -23,6 +23,7 @@ endif()
 # use to get_property location of static lib
 # https://cmake.org/cmake/help/v3.0/policy/CMP0026.html?highlight=cmp0026
 cmake_policy(SET CMP0026 OLD)
+cmake_policy(SET CMP0079 NEW)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set(PADDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(PADDLE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})

cmake/generic.cmake

@@ -486,14 +486,17 @@ endfunction()
 
 function(cc_test_run TARGET_NAME)
   if(WITH_TESTING)
-    set(oneValueArgs "")
+    set(oneValueArgs DIR)
     set(multiValueArgs COMMAND ARGS)
     cmake_parse_arguments(cc_test "${options}" "${oneValueArgs}"
                           "${multiValueArgs}" ${ARGN})
+    if(cc_test_DIR STREQUAL "")
+      set(cc_test_DIR ${CMAKE_CURRENT_BINARY_DIR})
+    endif()
     add_test(
       NAME ${TARGET_NAME}
       COMMAND ${cc_test_COMMAND} ${cc_test_ARGS}
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+      WORKING_DIRECTORY ${cc_test_DIR})
     set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT
                                               FLAGS_cpu_deterministic=true)
     set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT
@@ -513,7 +516,57 @@ function(cc_test_run TARGET_NAME)
   endif()
 endfunction()
 
+set_property(GLOBAL PROPERTY TEST_SRCS "")
+set_property(GLOBAL PROPERTY TEST_NAMES "")
 function(cc_test TARGET_NAME)
+  if(WITH_TESTING)
+    set(oneValueArgs "")
+    set(multiValueArgs SRCS DEPS ARGS)
+    cmake_parse_arguments(cc_test "${options}" "${oneValueArgs}"
+                          "${multiValueArgs}" ${ARGN})
+    if(WIN32)
+      # NOTE(zhiqiu): on windows platform, the symbols should be exported
+      # explicitly by __declspec(dllexport), however, there are serveral
+      # symbols not exported, and link error occurs.
+      # so, the tests are not built against dynamic libraries now.
+      cc_test_old(
+        ${TARGET_NAME}
+        SRCS
+        ${cc_test_SRCS}
+        DEPS
+        ${cc_test_DEPS}
+        ARGS
+        ${cc_test_ARGS})
+    else()
+      list(LENGTH cc_test_SRCS len)
+      # message("cc_test_SRCS ${cc_test_SRCS}")
+      # message("cc_test_ARGS ${cc_test_ARGS}")
+
+      if(${len} GREATER 1)
+        message(
+          SEND_ERROR
+            "The number source file of cc_test should be 1, but got ${len}, the source files are: ${cc_test_SRCS}"
+        )
+      endif()
+
+      list(LENGTH cc_test_ARGS len_arg)
+      if(len_arg GREATER_EQUAL 1)
+        set_property(GLOBAL PROPERTY "${TARGET_NAME}_ARGS" "${cc_test_ARGS}")
+        #message("${TARGET_NAME}_ARGS arg ${arg}")
+      endif()
+
+      get_property(test_srcs GLOBAL PROPERTY TEST_SRCS)
+      set(test_srcs ${test_srcs} "${CMAKE_CURRENT_SOURCE_DIR}/${cc_test_SRCS}")
+      set_property(GLOBAL PROPERTY TEST_SRCS "${test_srcs}")
+
+      get_property(test_names GLOBAL PROPERTY TEST_NAMES)
+      set(test_names ${test_names} ${TARGET_NAME})
+      set_property(GLOBAL PROPERTY TEST_NAMES "${test_names}")
+    endif()
+  endif()
+endfunction()
+
+function(cc_test_old TARGET_NAME)
   if(WITH_TESTING)
     set(oneValueArgs "")
     set(multiValueArgs SRCS DEPS ARGS)
@@ -626,25 +679,9 @@ function(nv_test TARGET_NAME)
     # Reference: https://cmake.org/cmake/help/v3.10/module/FindCUDA.html
     add_executable(${TARGET_NAME} ${nv_test_SRCS})
     get_property(os_dependency_modules GLOBAL PROPERTY OS_DEPENDENCY_MODULES)
-    target_link_libraries(
-      ${TARGET_NAME}
-      ${nv_test_DEPS}
-      paddle_gtest_main
-      lod_tensor
-      memory
-      gtest
-      gflags
-      glog
-      ${os_dependency_modules})
-    add_dependencies(
-      ${TARGET_NAME}
-      ${nv_test_DEPS}
-      paddle_gtest_main
-      lod_tensor
-      memory
-      gtest
-      gflags
-      glog)
+    target_link_libraries(${TARGET_NAME} ${nv_test_DEPS}
+                          ${os_dependency_modules} paddle_gtest_main)
+    add_dependencies(${TARGET_NAME} ${nv_test_DEPS} paddle_gtest_main)
     common_link(${TARGET_NAME})
     add_test(${TARGET_NAME} ${TARGET_NAME})
     set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT

paddle/CMakeLists.txt

@@ -1,9 +1,132 @@
-add_subdirectory(utils)
-add_subdirectory(scripts)
-add_subdirectory(testing)
+set(CC_TESTS_DIR
+    ${PADDLE_BINARY_DIR}/paddle/tests
+    CACHE INTERNAL "c++ tests directory")
 set(PYTHON_TESTS_DIR
     ${PADDLE_BINARY_DIR}/python/paddle/fluid/tests
     CACHE INTERNAL "python tests directory")
+
+add_subdirectory(utils)
+add_subdirectory(scripts)
+add_subdirectory(testing)
+
 add_subdirectory(phi)
 add_subdirectory(infrt)
 add_subdirectory(fluid)
+
+# NOTE(zhiqiu): The changes of cc tests
+# Before, (1) the source file of cc tests are distributed in different sub-directories,
+# (2) the tests are added and configured by calling `cc_test()` in each `CMakeLists.txt`,
+# (3) the tests links static libraries of paddle modules,
+# (4) the tests binaries are generated in different directories, as the same as the
+# folder of source file.
+
+# Now, we want to make all cc tests dynamically linked to the main paddle labrary,
+# i.e., `libpaddle.so`, so we changes the logic of (2), (3), (4):
+# (2) calling `cc_test()` in each `CMakeLists.txt` will not `exactly` add test, but
+# record all tests and its source files, the action of add tests is defered to HERE.
+# Why doing so? since the target of `libpaddle.so` is mostly the last target, and
+# the tests should be added after that accroding to dependency.
+# (3) the tests links dynamic libraries, `libpaddle.so`
+# (4) the tests are generated to the same directory, i.e., `CC_TESTS_DIR` defined above.
+
+# Next, (to be discusssed)
+# (1) move all source files to same folder,
+# (2) naturally, and and configure tests in only one `CMakeLists.txt`,
+# (3) cc tests support linking pre-built dynamic libraries. For example, use the dynamic
+# library in the installed paddle by `pip`.
+
+# add all tests here
+get_property(test_srcs GLOBAL PROPERTY TEST_SRCS)
+get_property(test_names GLOBAL PROPERTY TEST_NAMES)
+# message("test_srcs ${test_srcs}")
+
+get_property(paddle_lib GLOBAL PROPERTY PADDLE_LIB_NAME)
+
+set(POSTFIX ".so")
+if(WIN32)
+  set(POSTFIX ".dll")
+endif()
+
+list(LENGTH test_names len)
+if(${len} GREATER_EQUAL 1)
+  message("Total tests: ${len}")
+  math(EXPR stop "${len} - 1")
+  foreach(idx RANGE ${stop})
+    if(WITH_TESTING)
+      list(GET test_srcs ${idx} test_src)
+      list(GET test_names ${idx} test_name)
+      get_property(test_arg GLOBAL PROPERTY "${test_name}_ARGS")
+      message("add test ${test_name}")
+      add_executable(${test_name} ${test_src})
+      # target_link_libraries(
+      #   ${test_name}
+      #   ${CMAKE_BINARY_DIR}/paddle/fluid/pybind/libpaddle${POSTFIX})
+      target_link_libraries(${test_name} $<TARGET_LINKER_FILE:${paddle_lib}>)
+      target_link_libraries(${test_name} paddle_gtest_main_new)
+      add_dependencies(${test_name} ${paddle_lib} paddle_gtest_main_new)
+      if(WITH_GPU)
+        target_link_libraries(${test_name} ${CUDA_CUDART_LIBRARY}
+                              "-Wl,--as-needed")
+      endif()
+      if(WITH_ROCM)
+        target_link_libraries(${test_name} ${ROCM_HIPRTC_LIB})
+      endif()
+      if(APPLE)
+        target_link_libraries(${test_name}
+                              "-Wl,-rpath,$<TARGET_FILE_DIR:${paddle_lib}>")
+      endif()
+      if(NOT
+         ("${test_name}" STREQUAL "c_broadcast_op_npu_test"
+          OR "${test_name}" STREQUAL "c_allreduce_sum_op_npu_test"
+          OR "${test_name}" STREQUAL "c_allreduce_max_op_npu_test"
+          OR "${test_name}" STREQUAL "c_reducescatter_op_npu_test"
+          OR "${test_name}" STREQUAL "c_allgather_op_npu_test"
+          OR "${test_name}" STREQUAL "send_v2_op_npu_test"
+          OR "${test_name}" STREQUAL "c_reduce_sum_op_npu_test"
+          OR "${test_name}" STREQUAL "recv_v2_op_npu_test"))
+        cc_test_run(
+          ${test_name}
+          COMMAND
+          ${test_name}
+          ARGS
+          ${test_arg}
+          DIR
+          ${CC_TESTS_DIR})
+      endif()
+    elseif(WITH_TESTING AND NOT TEST ${test_name})
+      add_test(NAME ${test_name} COMMAND ${CMAKE_COMMAND} -E echo CI skip
+                                         ${test_name}.)
+    endif()
+    set_target_properties(${test_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
+                                                  "${CC_TESTS_DIR}")
+  endforeach()
+endif()
+
+# set properties for some tests, it should be set after the tests defined.
+if(TARGET standalone_executor_test)
+  set_tests_properties(standalone_executor_test PROPERTIES TIMEOUT 100)
+  if(NOT WIN32)
+    add_dependencies(standalone_executor_test download_program)
+  endif()
+endif()
+
+if(TARGET layer_test)
+  add_dependencies(layer_test jit_download_program)
+  add_dependencies(layer_test_new jit_download_program)
+  set_tests_properties(layer_test_new PROPERTIES ENVIRONMENT
+                                                 "FLAGS_jit_engine_type=New")
+endif()
+
+if(TEST buddy_allocator_test)
+  if(NOT WIN32)
+    add_dependencies(buddy_allocator_test download_data)
+  endif()
+  set_tests_properties(buddy_allocator_test PROPERTIES LABELS
+                                                       "RUN_TYPE=EXCLUSIVE")
+endif()
+
+add_custom_target(build_tests)
+# add target to build all cpp tests
+if(${len} GREATER_EQUAL 1)
+  add_dependencies(build_tests ${test_names})
+endif()

paddle/fluid/distributed/fleet_executor/test/CMakeLists.txt

@@ -1,72 +1,63 @@
 set_source_files_properties(
   interceptor_ping_pong_test.cc PROPERTIES COMPILE_FLAGS
                                            ${DISTRIBUTE_COMPILE_FLAGS})
-cc_test(
-  interceptor_ping_pong_test
-  SRCS interceptor_ping_pong_test.cc
-  DEPS fleet_executor ${BRPC_DEPS})
+cc_test_old(interceptor_ping_pong_test SRCS interceptor_ping_pong_test.cc DEPS
+            fleet_executor ${BRPC_DEPS})
 
 set_source_files_properties(
   compute_interceptor_test.cc PROPERTIES COMPILE_FLAGS
                                          ${DISTRIBUTE_COMPILE_FLAGS})
-cc_test(
-  compute_interceptor_test
-  SRCS compute_interceptor_test.cc
-  DEPS fleet_executor ${BRPC_DEPS})
+cc_test_old(compute_interceptor_test SRCS compute_interceptor_test.cc DEPS
+            fleet_executor ${BRPC_DEPS})
 
 set_source_files_properties(
   source_interceptor_test.cc PROPERTIES COMPILE_FLAGS
                                         ${DISTRIBUTE_COMPILE_FLAGS})
-cc_test(
-  source_interceptor_test
-  SRCS source_interceptor_test.cc
-  DEPS fleet_executor ${BRPC_DEPS})
+cc_test_old(source_interceptor_test SRCS source_interceptor_test.cc DEPS
+            fleet_executor ${BRPC_DEPS})
 
 set_source_files_properties(
   sink_interceptor_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
-cc_test(
-  sink_interceptor_test
-  SRCS sink_interceptor_test.cc
-  DEPS fleet_executor ${BRPC_DEPS})
+cc_test_old(sink_interceptor_test SRCS sink_interceptor_test.cc DEPS
+            fleet_executor ${BRPC_DEPS})
 
 set_source_files_properties(
   interceptor_pipeline_short_path_test.cc
   PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
-cc_test(
-  interceptor_pipeline_short_path_test
-  SRCS interceptor_pipeline_short_path_test.cc
-  DEPS fleet_executor ${BRPC_DEPS})
+cc_test_old(
+  interceptor_pipeline_short_path_test SRCS
+  interceptor_pipeline_short_path_test.cc DEPS fleet_executor ${BRPC_DEPS})
 
 set_source_files_properties(
   interceptor_pipeline_long_path_test.cc PROPERTIES COMPILE_FLAGS
                                                     ${DISTRIBUTE_COMPILE_FLAGS})
-cc_test(
-  interceptor_pipeline_long_path_test
-  SRCS interceptor_pipeline_long_path_test.cc
-  DEPS fleet_executor ${BRPC_DEPS})
+cc_test_old(
+  interceptor_pipeline_long_path_test SRCS
+  interceptor_pipeline_long_path_test.cc DEPS fleet_executor ${BRPC_DEPS})
 
 set_source_files_properties(
   compute_interceptor_run_op_test.cc PROPERTIES COMPILE_FLAGS
                                                 ${DISTRIBUTE_COMPILE_FLAGS})
-cc_test(
+cc_test_old(
   compute_interceptor_run_op_test
-  SRCS compute_interceptor_run_op_test.cc
-  DEPS fleet_executor
-       ${BRPC_DEPS}
-       op_registry
-       fill_constant_op
-       elementwise_add_op
-       scope
-       device_context)
+  SRCS
+  compute_interceptor_run_op_test.cc
+  DEPS
+  fleet_executor
+  ${BRPC_DEPS}
+  op_registry
+  fill_constant_op
+  elementwise_add_op
+  scope
+  device_context)
 
 if(WITH_DISTRIBUTE
    AND WITH_PSCORE
    AND NOT (WITH_ASCEND OR WITH_ASCEND_CL))
   set_source_files_properties(
     interceptor_ping_pong_with_brpc_test.cc
     PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
-  cc_test(
-    interceptor_ping_pong_with_brpc_test
-    SRCS interceptor_ping_pong_with_brpc_test.cc
-    DEPS fleet_executor ${BRPC_DEPS})
+  cc_test_old(
+    interceptor_ping_pong_with_brpc_test SRCS
+    interceptor_ping_pong_with_brpc_test.cc DEPS fleet_executor ${BRPC_DEPS})
 endif()