!953 add submodule id for log interface

Merge pull request !953 from fary86/add_submodule_id_for_log_interface
5 years ago · c72589aad6
parent 7068e708de 3f323e48e2
commit c72589aad6
35 changed files with 359 additions and 17 deletions
--- a/mindspore/ccsrc/CMakeLists.txt
+++ b/mindspore/ccsrc/CMakeLists.txt
@ -116,6 +116,7 @@ foreach (_comp ${SUB_COMP})
    endif ()
 endforeach ()

+set_property(SOURCE ${SUB_OBJECTS_SRC} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_ME)
 add_library(mindspore STATIC ${SUB_OBJECTS_SRC})
 target_link_libraries(mindspore proto_input)
 target_link_libraries(mindspore securec mindspore::flatbuffers)
--- a/mindspore/ccsrc/common/CMakeLists.txt
+++ b/mindspore/ccsrc/common/CMakeLists.txt
@ -1,2 +1,3 @@
 file(GLOB_RECURSE _COMMON_ALL_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc")
+set_property(SOURCE ${_COMMON_ALL_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_COMMON)
 add_library(_mindspore_common_obj OBJECT ${_COMMON_ALL_SRC_FILES})
--- a/mindspore/ccsrc/dataset/api/CMakeLists.txt
+++ b/mindspore/ccsrc/dataset/api/CMakeLists.txt
@ -1,3 +1,5 @@
+file(GLOB_RECURSE _CURRENT_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc")
+set_property(SOURCE ${_CURRENT_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_MD)
 add_library(APItoPython OBJECT
  de_pipeline.cc
  python_bindings.cc
--- a/mindspore/ccsrc/dataset/core/CMakeLists.txt
+++ b/mindspore/ccsrc/dataset/core/CMakeLists.txt
@ -1,3 +1,5 @@
+file(GLOB_RECURSE _CURRENT_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc")
+set_property(SOURCE ${_CURRENT_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_MD)
 add_library(core OBJECT
  client.cc
  config_manager.cc
--- a/mindspore/ccsrc/dataset/engine/CMakeLists.txt
+++ b/mindspore/ccsrc/dataset/engine/CMakeLists.txt
@ -3,6 +3,8 @@ if (ENABLE_TDTQUE)
  add_subdirectory(tdt)
 endif ()

+file(GLOB_RECURSE _CURRENT_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc")
+set_property(SOURCE ${_CURRENT_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_MD)
 add_library(engine OBJECT
    execution_tree.cc
    data_buffer.cc
--- a/mindspore/ccsrc/dataset/engine/datasetops/CMakeLists.txt
+++ b/mindspore/ccsrc/dataset/engine/datasetops/CMakeLists.txt
@ -1,5 +1,7 @@
 add_subdirectory(source)

+file(GLOB_RECURSE _CURRENT_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc")
+set_property(SOURCE ${_CURRENT_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_MD)
 add_library(engine-datasetops OBJECT
    dataset_op.cc
    parallel_op.cc
--- a/mindspore/ccsrc/dataset/engine/datasetops/source/CMakeLists.txt
+++ b/mindspore/ccsrc/dataset/engine/datasetops/source/CMakeLists.txt
@ -1,6 +1,8 @@
 ms_protobuf_generate(EXAMPLE_SRCS EXAMPLE_HDRS example.proto)
 ms_protobuf_generate(FEATURE_SRCS FEATURE_HDRS feature.proto)
 add_subdirectory(sampler)
+file(GLOB_RECURSE _CURRENT_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc")
+set_property(SOURCE ${_CURRENT_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_MD)
 add_library(engine-datasetops-source OBJECT
    generator_op.cc
    io_block.cc
--- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/CMakeLists.txt
+++ b/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/CMakeLists.txt
@ -1,3 +1,5 @@
+file(GLOB_RECURSE _CURRENT_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc")
+set_property(SOURCE ${_CURRENT_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_MD)
 add_library(engine-datasetops-source-sampler OBJECT
    distributed_sampler.cc
    pk_sampler.cc
--- a/mindspore/ccsrc/dataset/engine/tdt/CMakeLists.txt
+++ b/mindspore/ccsrc/dataset/engine/tdt/CMakeLists.txt
@ -1,3 +1,5 @@
+file(GLOB_RECURSE _CURRENT_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc")
+set_property(SOURCE ${_CURRENT_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_MD)
 add_library(engine-tdt OBJECT
    tdt_plugin.cc
    ${EXAMPLE_SRCS}
--- a/mindspore/ccsrc/dataset/kernels/CMakeLists.txt
+++ b/mindspore/ccsrc/dataset/kernels/CMakeLists.txt
@ -1,5 +1,7 @@
 add_subdirectory(image)
 add_subdirectory(data)
+file(GLOB_RECURSE _CURRENT_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc")
+set_property(SOURCE ${_CURRENT_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_MD)
 add_library(kernels OBJECT
    py_func_op.cc
    tensor_op.cc)
--- a/mindspore/ccsrc/dataset/kernels/data/CMakeLists.txt
+++ b/mindspore/ccsrc/dataset/kernels/data/CMakeLists.txt
@ -1,3 +1,5 @@
+file(GLOB_RECURSE _CURRENT_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc")
+set_property(SOURCE ${_CURRENT_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_MD)
 add_library(kernels-data OBJECT
    data_utils.cc
    one_hot_op.cc
--- a/mindspore/ccsrc/dataset/kernels/image/CMakeLists.txt
+++ b/mindspore/ccsrc/dataset/kernels/image/CMakeLists.txt
@ -1,3 +1,5 @@
+file(GLOB_RECURSE _CURRENT_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc")
+set_property(SOURCE ${_CURRENT_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_MD)
 add_library(kernels-image OBJECT
    center_crop_op.cc
    cut_out_op.cc
--- a/mindspore/ccsrc/dataset/util/CMakeLists.txt
+++ b/mindspore/ccsrc/dataset/util/CMakeLists.txt
@ -1,3 +1,5 @@
+file(GLOB_RECURSE _CURRENT_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc")
+set_property(SOURCE ${_CURRENT_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_MD)
 add_library(utils OBJECT
    arena.cc
    circular_pool.cc
--- a/mindspore/ccsrc/debug/CMakeLists.txt
+++ b/mindspore/ccsrc/debug/CMakeLists.txt
@ -13,4 +13,5 @@ if (ENABLE_DUMP_E2E)
    list(APPEND _DEBUG_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/e2e_dump.cc")
 endif (ENABLE_DUMP_E2E)

+set_property(SOURCE ${_DEBUG_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEBUG)
 add_library(_mindspore_debug_obj OBJECT ${_DEBUG_SRC_LIST})
--- a/mindspore/ccsrc/device/CMakeLists.txt
+++ b/mindspore/ccsrc/device/CMakeLists.txt
@ -47,4 +47,5 @@ if (ENABLE_GPU)
    # add_library(_mindspore_device_cuda_obj OBJECT ${CUDA_SRC_LIST})
 endif ()

+set_property(SOURCE ${DEVICE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE)
 add_library(_mindspore_device_obj OBJECT ${DEVICE_SRC_LIST} ${D_SRC_LIST} ${CPU_SRC_LIST})
--- a/mindspore/ccsrc/gvar/CMakeLists.txt
+++ b/mindspore/ccsrc/gvar/CMakeLists.txt
@ -1,4 +1,5 @@
 file(GLOB_RECURSE MS_GVAR_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cc)
+set_property(SOURCE ${MS_GVAR_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_COMMON)
 add_library(mindspore_gvar SHARED ${MS_GVAR_SRC_LIST})
 if (APPLE)
    set_target_properties(mindspore_gvar PROPERTIES MACOSX_RPATH ON)
--- a/mindspore/ccsrc/ir/CMakeLists.txt
+++ b/mindspore/ccsrc/ir/CMakeLists.txt
@ -1,2 +1,3 @@
 file(GLOB_RECURSE _IR_SRC_LIST ./*.cc dtype/*.cc)
+set_property(SOURCE ${_IR_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_IR)
 add_library(_mindspore_ir_obj OBJECT ${_IR_SRC_LIST})
--- a/mindspore/ccsrc/kernel/CMakeLists.txt
+++ b/mindspore/ccsrc/kernel/CMakeLists.txt
@ -43,4 +43,5 @@ if (ENABLE_GPU)
 	# add_library(_mindspore_kernel_cuda_obj OBJECT ${CUDA_SRC_LIST})
 endif()

+set_property(SOURCE ${KERNEL_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_KERNEL)
 add_library(_mindspore_kernel_obj OBJECT ${KERNEL_SRC_LIST} ${CPU_SRC_LIST} ${GPU_SRC_LIST} ${D_SRC_LIST})
--- a/mindspore/ccsrc/mindrecord/CMakeLists.txt
+++ b/mindspore/ccsrc/mindrecord/CMakeLists.txt
@ -18,6 +18,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default")

 # add shared link library
+set_property(SOURCE ${DIR_LIB_SRCS} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_MD)
 add_library(_c_mindrecord SHARED ${DIR_LIB_SRCS})

 set_target_properties(_c_mindrecord PROPERTIES
--- a/mindspore/ccsrc/onnx/CMakeLists.txt
+++ b/mindspore/ccsrc/onnx/CMakeLists.txt
@ -1,2 +1,3 @@
 file(GLOB_RECURSE _ONNX_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc")
+set_property(SOURCE ${_ONNX_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_ONNX)
 add_library(_mindspore_onnx_obj OBJECT ${_ONNX_SRC_FILES})
--- a/mindspore/ccsrc/operator/CMakeLists.txt
+++ b/mindspore/ccsrc/operator/CMakeLists.txt
@ -1,2 +1,3 @@
 file(GLOB_RECURSE _OPERATOR_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc")
+set_property(SOURCE ${_OPERATOR_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_ANALYZER)
 add_library(_mindspore_operator_obj OBJECT ${_OPERATOR_SRC_FILES})
--- a/mindspore/ccsrc/optimizer/CMakeLists.txt
+++ b/mindspore/ccsrc/optimizer/CMakeLists.txt
@ -1,2 +1,3 @@
 file(GLOB_RECURSE _OPTIMIZER_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc")
+set_property(SOURCE ${_OPTIMIZER_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_OPTIMIZER)
 add_library(_mindspore_optimizer_obj OBJECT ${_OPTIMIZER_SRC_FILES})
--- a/mindspore/ccsrc/parallel/CMakeLists.txt
+++ b/mindspore/ccsrc/parallel/CMakeLists.txt
@ -3,4 +3,5 @@ if (ENABLE_DUMP_PROTO)
    list(REMOVE_ITEM _PARALLEL_SRC_FILES "parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc")
 endif ()

+set_property(SOURCE ${_PARALLEL_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_PARALLEL)
 add_library(_mindspore_parallel_obj OBJECT ${_PARALLEL_SRC_FILES})
--- a/mindspore/ccsrc/pipeline/CMakeLists.txt
+++ b/mindspore/ccsrc/pipeline/CMakeLists.txt
@ -9,6 +9,16 @@ file(GLOB_RECURSE _PIPELINE_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
    "static_analysis/*.cc"
 )

+
+file(GLOB PIPELINE_SRC_FILES "*.cc")
+set_property(SOURCE ${PIPELINE_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_PIPELINE)
+
+file(GLOB_RECURSE PARSER_SRC_FILES "parse/*.cc")
+set_property(SOURCE ${PARSER_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_PARSER)
+
+file(GLOB_RECURSE ANALYZER_SRC_FILES "static_analysis/*.cc")
+set_property(SOURCE ${ANALYZER_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_ANALYZER)
+
 if (ENABLE_GE OR ENABLE_D)
    file(GLOB_RECURSE _PIPELINE_GE_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "pipeline_ge.cc")
    list(APPEND _PIPELINE_SRC_FILES ${_PIPELINE_GE_SRC_FILES})
--- a/mindspore/ccsrc/pre_activate/CMakeLists.txt
+++ b/mindspore/ccsrc/pre_activate/CMakeLists.txt
@ -10,4 +10,5 @@ if (ENABLE_D)
 	list(APPEND _PREACTIVATE_SRC_LIST ${_D_SRC_LIST})
 endif ()

-add_library(_mindspore_pre_activate_obj OBJECT ${_PREACTIVATE_SRC_LIST})
+set_property(SOURCE ${_PREACTIVATE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_PRE_ACT)
+add_library(_mindspore_pre_activate_obj OBJECT ${_PREACTIVATE_SRC_LIST})
--- a/Show More
+++ b/Show More