diff --git a/tests/ut/cpp/CMakeLists.txt b/tests/ut/cpp/CMakeLists.txt index 37d084d9d89..3d40687ddf5 100644 --- a/tests/ut/cpp/CMakeLists.txt +++ b/tests/ut/cpp/CMakeLists.txt @@ -33,7 +33,28 @@ if(ENABLE_MINDDATA) endif() # fetch ut test files if(ENABLE_MINDDATA) - file(GLOB_RECURSE UT_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ./*.cc) + file(GLOB_RECURSE UT_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ./stub/*.cc + ./common/*.cc + ./abstract/*.cc + ./base/*.cc + ./dataset/*.cc + ./debug/*.cc + ./device/*.cc + ./ir/*.cc + ./kernel/*.cc + ./mindrecord/*.cc + ./operator/*.cc + ./optimizer/*.cc + ./parallel/*.cc + ./pipeline/*.cc + ./pre_activate/*.cc + ./pynative/*.cc + ./session/*.cc + ./transform/*.cc + ./utils/*.cc + ./vm/*.cc + ) if(NOT ENABLE_PYTHON) set(PYTHON_RELATED_SRCS dataset/filter_op_test.cc @@ -51,61 +72,20 @@ else() endif() endforeach () endif() -# removing serving ut -file(GLOB_RECURSE SERVING_ACL_UT_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} serving/*.cc) -list(REMOVE_ITEM UT_SRCS ${SERVING_ACL_UT_SRCS}) +# serving ut add_subdirectory(serving) file(GLOB_RECURSE MINDSPORE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "../../../mindspore/core/base/*.cc" - "../../../mindspore/core/abstract/*.cc" - "../../../mindspore/core/ir/*.cc" - "../../../mindspore/core/utils/*.cc" - "../../../mindspore/core/c_ops/*.cc" - "../../../mindspore/ccsrc/common/*.cc" - "../../../mindspore/ccsrc/utils/*.cc" - "../../../mindspore/ccsrc/pipeline/jit/parse/*.cc" - "../../../mindspore/ccsrc/pipeline/jit/static_analysis/*.cc" - "../../../mindspore/ccsrc/pipeline/jit/pipeline.cc" - "../../../mindspore/ccsrc/pipeline/jit/resource.cc" - "../../../mindspore/ccsrc/pipeline/jit/pass.cc" - "../../../mindspore/ccsrc/pipeline/jit/action.cc" - "../../../mindspore/ccsrc/pipeline/jit/validator.cc" - "../../../mindspore/ccsrc/pipeline/jit/remove_value_node_dup.cc" + "../../../mindspore/ccsrc/pybind_api/*.cc" "../../../mindspore/ccsrc/frontend/optimizer/*.cc" "../../../mindspore/ccsrc/frontend/parallel/*.cc" - "../../../mindspore/ccsrc/debug/*.cc" "../../../mindspore/ccsrc/frontend/operator/*.cc" - "../../../mindspore/ccsrc/transform/graph_ir/*.cc" - "../../../mindspore/ccsrc/transform/graph_ir/op_declare/*.cc" - "../../../mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc" - "../../../mindspore/ccsrc/backend/session/ascend_session.cc" - "../../../mindspore/ccsrc/backend/session/ascend_control_parser.cc" - "../../../mindspore/ccsrc/backend/session/kernel_graph.cc" - "../../../mindspore/ccsrc/backend/session/session_basic.cc" - "../../../mindspore/ccsrc/backend/session/executor.cc" - "../../../mindspore/ccsrc/backend/session/executor_manager.cc" - "../../../mindspore/ccsrc/backend/session/session_factory.cc" - "../../../mindspore/ccsrc/backend/session/kernel_build_client.cc" - "../../../mindspore/ccsrc/vm/*.cc" - "../../../mindspore/ccsrc/pipeline/pynative/*.cc" - "../../../mindspore/ccsrc/pybind_api/*.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/akg/*.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/kash/*.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/rts/*.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/hccl/*.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/kernel_build_info.cc" - "../../../mindspore/ccsrc/backend/optimizer/ascend/*.cc" - "../../../mindspore/ccsrc/backend/optimizer/common/*.cc" - "../../../mindspore/ccsrc/backend/optimizer/gpu/*.cc" - "../../../mindspore/ccsrc/backend/optimizer/mem_reuse/*.cc" - "../../../mindspore/ccsrc/backend/optimizer/pass/*.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/common_utils.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/oplib/*.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/tbe/*.cc" + # dont remove the 4 lines above + "../../../mindspore/ccsrc/debug/e2e_dump.cc" + "../../../mindspore/ccsrc/debug/common.cc" + "../../../mindspore/ccsrc/debug/data_dump_parser.cc" + "../../../mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.cc" + "../../../mindspore/ccsrc/runtime/device/ascend/profiling/profiling_engine_impl.cc" "../../../mindspore/ccsrc/runtime/device/kernel_runtime.cc" "../../../mindspore/ccsrc/runtime/device/memory_manager.cc" "../../../mindspore/ccsrc/runtime/device/kernel_runtime_manager.cc" @@ -119,12 +99,6 @@ file(GLOB_RECURSE MINDSPORE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "../../../mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.cc" "../../../mindspore/ccsrc/runtime/device/ascend/ascend_device_address.cc" "../../../mindspore/ccsrc/runtime/device/ascend/ascend_memory_pool.cc" - "../../../mindspore/ccsrc/predict/generator/utils/ir_model_util.cc" - "../../../mindspore/ccsrc/predict/predict.cc" - "../../../mindspore/ccsrc/predict/converter/*.cc" - "../../../mindspore/ccsrc/predict/converter/attr_utils/*.cc" - "../../../mindspore/ccsrc/predict/converter/lite_model/*.cc" - "../../../mindspore/ccsrc/predict/converter/lite_model/operations/*.cc" "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.cc" "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.cc" "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.cc" @@ -133,47 +107,39 @@ file(GLOB_RECURSE MINDSPORE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.cc" "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/unique_cpu_kernel.cc" "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/unique_with_pad_cpu_kernel.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/akg/*.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/rts/*.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/hccl/*.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/tbe/*.cc" + "../../../mindspore/ccsrc/backend/optimizer/ascend/*.cc" + "../../../mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc" + "../../../mindspore/ccsrc/backend/session/ascend_session.cc" + "../../../mindspore/ccsrc/backend/session/ascend_control_parser.cc" + "../../../mindspore/ccsrc/backend/session/kernel_graph.cc" + "../../../mindspore/ccsrc/backend/session/session_basic.cc" + "../../../mindspore/ccsrc/backend/session/executor.cc" + "../../../mindspore/ccsrc/backend/session/executor_manager.cc" + "../../../mindspore/ccsrc/backend/session/session_factory.cc" + "../../../mindspore/ccsrc/backend/session/kernel_build_client.cc" + "../../../mindspore/ccsrc/transform/graph_ir/*.cc" + "../../../mindspore/ccsrc/transform/graph_ir/op_declare/*.cc" ) -if (CMAKE_SYSTEM_NAME MATCHES "Windows") - list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/common/duplex_pipe.cc") -else() - list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/common/duplex_pipe_win.cc") -endif() -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/debug/dump_proto.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/core/ir/lite/tensor.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/frontend/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/frontend/parallel/ps/util.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/frontend/parallel/ps/scheduler.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/frontend/parallel/ps/optimizer_info.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/frontend/parallel/ps/optimizer_info_builder.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/utils/anf_ir.pb.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/utils/node_strategy.pb.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/utils/load_onnx/anf_model_parser.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/utils/load_onnx/anf_converter.cc") -# remove files for debugger -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/debug/debugger/debugger.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/debug/debugger/grpc_client.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/debug/debug_services.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/debug/debugger/proto_exporter.cc") - -file(GLOB_RECURSE UT_SUTB_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "stub/aicpu/*.cc" - "stub/cce/*.cc" - "stub/tdt/*.cc" - "stub/tasksink/*.cc" - "stub/device/*.cc" - "stub/kernel/*.cc" - "stub/runtime/*.cc" - "stub/anf_ir/*.cc" - "stub/profiling/*.cc" - "stub/parallel_strategy_checkpoint/*.cc" - "stub/hccl/*.cc" - "stub/ge/*.cc" - ) - -add_executable(ut_tests ${UT_SRCS} ${MINDSPORE_SRC_LIST} ${UT_SUTB_SRC_LIST} $) +add_library(_ut_mindspore_obj OBJECT ${MINDSPORE_SRC_LIST}) +add_library(_ut_ut_obj OBJECT ${UT_SRCS}) +add_dependencies(_ut_ut_obj engine-cache-server) +add_executable(ut_tests $ + $ + $) if (ENABLE_GE) if(ENABLE_TRAIN) @@ -197,7 +163,7 @@ if (USE_GLOG) target_link_libraries(ut_tests PRIVATE mindspore::glog) endif() -target_link_libraries(ut_tests PRIVATE securec graph) +target_link_libraries(ut_tests PRIVATE mindspore securec graph) # link grpc if (EXISTS ${grpc_ROOT}/lib64) diff --git a/tests/ut/cpp/serving/CMakeLists.txt b/tests/ut/cpp/serving/CMakeLists.txt index 206e4c7eed7..f4b07a52f39 100644 --- a/tests/ut/cpp/serving/CMakeLists.txt +++ b/tests/ut/cpp/serving/CMakeLists.txt @@ -85,5 +85,5 @@ include_directories(${CMAKE_SOURCE_DIR}/serving) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR}/../) -add_library(ut_serving_obj OBJECT ${SERVING_SRC_TEST}) +add_library(_ut_serving_obj OBJECT ${SERVING_SRC_TEST})