Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
magicwindyyd
mindspore
提交
3f323e48
M
mindspore
项目概览
magicwindyyd
/
mindspore
与 Fork 源项目一致
Fork自
MindSpore / mindspore
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
mindspore
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
3f323e48
编写于
4月 27, 2020
作者:
F
fary86
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add submodule id for log interface
上级
0edc6d25
变更
35
隐藏空白更改
内联
并排
Showing
35 changed file
with
359 addition
and
17 deletion
+359
-17
mindspore/ccsrc/CMakeLists.txt
mindspore/ccsrc/CMakeLists.txt
+1
-0
mindspore/ccsrc/common/CMakeLists.txt
mindspore/ccsrc/common/CMakeLists.txt
+1
-0
mindspore/ccsrc/dataset/api/CMakeLists.txt
mindspore/ccsrc/dataset/api/CMakeLists.txt
+2
-0
mindspore/ccsrc/dataset/core/CMakeLists.txt
mindspore/ccsrc/dataset/core/CMakeLists.txt
+2
-0
mindspore/ccsrc/dataset/engine/CMakeLists.txt
mindspore/ccsrc/dataset/engine/CMakeLists.txt
+2
-0
mindspore/ccsrc/dataset/engine/datasetops/CMakeLists.txt
mindspore/ccsrc/dataset/engine/datasetops/CMakeLists.txt
+2
-0
mindspore/ccsrc/dataset/engine/datasetops/source/CMakeLists.txt
...ore/ccsrc/dataset/engine/datasetops/source/CMakeLists.txt
+2
-0
mindspore/ccsrc/dataset/engine/datasetops/source/sampler/CMakeLists.txt
...c/dataset/engine/datasetops/source/sampler/CMakeLists.txt
+2
-0
mindspore/ccsrc/dataset/engine/tdt/CMakeLists.txt
mindspore/ccsrc/dataset/engine/tdt/CMakeLists.txt
+2
-0
mindspore/ccsrc/dataset/kernels/CMakeLists.txt
mindspore/ccsrc/dataset/kernels/CMakeLists.txt
+2
-0
mindspore/ccsrc/dataset/kernels/data/CMakeLists.txt
mindspore/ccsrc/dataset/kernels/data/CMakeLists.txt
+2
-0
mindspore/ccsrc/dataset/kernels/image/CMakeLists.txt
mindspore/ccsrc/dataset/kernels/image/CMakeLists.txt
+2
-0
mindspore/ccsrc/dataset/util/CMakeLists.txt
mindspore/ccsrc/dataset/util/CMakeLists.txt
+2
-0
mindspore/ccsrc/debug/CMakeLists.txt
mindspore/ccsrc/debug/CMakeLists.txt
+1
-0
mindspore/ccsrc/device/CMakeLists.txt
mindspore/ccsrc/device/CMakeLists.txt
+1
-0
mindspore/ccsrc/gvar/CMakeLists.txt
mindspore/ccsrc/gvar/CMakeLists.txt
+1
-0
mindspore/ccsrc/ir/CMakeLists.txt
mindspore/ccsrc/ir/CMakeLists.txt
+1
-0
mindspore/ccsrc/kernel/CMakeLists.txt
mindspore/ccsrc/kernel/CMakeLists.txt
+1
-0
mindspore/ccsrc/mindrecord/CMakeLists.txt
mindspore/ccsrc/mindrecord/CMakeLists.txt
+1
-0
mindspore/ccsrc/onnx/CMakeLists.txt
mindspore/ccsrc/onnx/CMakeLists.txt
+1
-0
mindspore/ccsrc/operator/CMakeLists.txt
mindspore/ccsrc/operator/CMakeLists.txt
+1
-0
mindspore/ccsrc/optimizer/CMakeLists.txt
mindspore/ccsrc/optimizer/CMakeLists.txt
+1
-0
mindspore/ccsrc/parallel/CMakeLists.txt
mindspore/ccsrc/parallel/CMakeLists.txt
+1
-0
mindspore/ccsrc/pipeline/CMakeLists.txt
mindspore/ccsrc/pipeline/CMakeLists.txt
+10
-0
mindspore/ccsrc/pre_activate/CMakeLists.txt
mindspore/ccsrc/pre_activate/CMakeLists.txt
+2
-1
mindspore/ccsrc/pybind_api/CMakeLists.txt
mindspore/ccsrc/pybind_api/CMakeLists.txt
+2
-1
mindspore/ccsrc/pynative/CMakeLists.txt
mindspore/ccsrc/pynative/CMakeLists.txt
+1
-0
mindspore/ccsrc/session/CMakeLists.txt
mindspore/ccsrc/session/CMakeLists.txt
+2
-1
mindspore/ccsrc/transform/CMakeLists.txt
mindspore/ccsrc/transform/CMakeLists.txt
+1
-0
mindspore/ccsrc/utils/CMakeLists.txt
mindspore/ccsrc/utils/CMakeLists.txt
+1
-0
mindspore/ccsrc/utils/contract.h
mindspore/ccsrc/utils/contract.h
+1
-1
mindspore/ccsrc/utils/log_adapter.cc
mindspore/ccsrc/utils/log_adapter.cc
+261
-3
mindspore/ccsrc/utils/log_adapter.h
mindspore/ccsrc/utils/log_adapter.h
+38
-10
mindspore/ccsrc/vm/CMakeLists.txt
mindspore/ccsrc/vm/CMakeLists.txt
+1
-0
tests/ut/cpp/common/test_main.cc
tests/ut/cpp/common/test_main.cc
+5
-0
未找到文件。
mindspore/ccsrc/CMakeLists.txt
浏览文件 @
3f323e48
...
@@ -116,6 +116,7 @@ foreach (_comp ${SUB_COMP})
...
@@ -116,6 +116,7 @@ foreach (_comp ${SUB_COMP})
endif
()
endif
()
endforeach
()
endforeach
()
set_property
(
SOURCE
${
SUB_OBJECTS_SRC
}
PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_ME
)
add_library
(
mindspore STATIC
${
SUB_OBJECTS_SRC
}
)
add_library
(
mindspore STATIC
${
SUB_OBJECTS_SRC
}
)
target_link_libraries
(
mindspore proto_input
)
target_link_libraries
(
mindspore proto_input
)
target_link_libraries
(
mindspore securec mindspore::flatbuffers
)
target_link_libraries
(
mindspore securec mindspore::flatbuffers
)
...
...
mindspore/ccsrc/common/CMakeLists.txt
浏览文件 @
3f323e48
file
(
GLOB_RECURSE _COMMON_ALL_SRC_FILES RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
"*.cc"
)
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
}
)
add_library
(
_mindspore_common_obj OBJECT
${
_COMMON_ALL_SRC_FILES
}
)
mindspore/ccsrc/dataset/api/CMakeLists.txt
浏览文件 @
3f323e48
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
add_library
(
APItoPython OBJECT
de_pipeline.cc
de_pipeline.cc
python_bindings.cc
python_bindings.cc
...
...
mindspore/ccsrc/dataset/core/CMakeLists.txt
浏览文件 @
3f323e48
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
add_library
(
core OBJECT
client.cc
client.cc
config_manager.cc
config_manager.cc
...
...
mindspore/ccsrc/dataset/engine/CMakeLists.txt
浏览文件 @
3f323e48
...
@@ -3,6 +3,8 @@ if (ENABLE_TDTQUE)
...
@@ -3,6 +3,8 @@ if (ENABLE_TDTQUE)
add_subdirectory
(
tdt
)
add_subdirectory
(
tdt
)
endif
()
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
add_library
(
engine OBJECT
execution_tree.cc
execution_tree.cc
data_buffer.cc
data_buffer.cc
...
...
mindspore/ccsrc/dataset/engine/datasetops/CMakeLists.txt
浏览文件 @
3f323e48
add_subdirectory
(
source
)
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
add_library
(
engine-datasetops OBJECT
dataset_op.cc
dataset_op.cc
parallel_op.cc
parallel_op.cc
...
...
mindspore/ccsrc/dataset/engine/datasetops/source/CMakeLists.txt
浏览文件 @
3f323e48
ms_protobuf_generate
(
EXAMPLE_SRCS EXAMPLE_HDRS example.proto
)
ms_protobuf_generate
(
EXAMPLE_SRCS EXAMPLE_HDRS example.proto
)
ms_protobuf_generate
(
FEATURE_SRCS FEATURE_HDRS feature.proto
)
ms_protobuf_generate
(
FEATURE_SRCS FEATURE_HDRS feature.proto
)
add_subdirectory
(
sampler
)
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
add_library
(
engine-datasetops-source OBJECT
generator_op.cc
generator_op.cc
io_block.cc
io_block.cc
...
...
mindspore/ccsrc/dataset/engine/datasetops/source/sampler/CMakeLists.txt
浏览文件 @
3f323e48
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
add_library
(
engine-datasetops-source-sampler OBJECT
distributed_sampler.cc
distributed_sampler.cc
pk_sampler.cc
pk_sampler.cc
...
...
mindspore/ccsrc/dataset/engine/tdt/CMakeLists.txt
浏览文件 @
3f323e48
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
add_library
(
engine-tdt OBJECT
tdt_plugin.cc
tdt_plugin.cc
${
EXAMPLE_SRCS
}
${
EXAMPLE_SRCS
}
...
...
mindspore/ccsrc/dataset/kernels/CMakeLists.txt
浏览文件 @
3f323e48
add_subdirectory
(
image
)
add_subdirectory
(
image
)
add_subdirectory
(
data
)
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
add_library
(
kernels OBJECT
py_func_op.cc
py_func_op.cc
tensor_op.cc
)
tensor_op.cc
)
...
...
mindspore/ccsrc/dataset/kernels/data/CMakeLists.txt
浏览文件 @
3f323e48
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
add_library
(
kernels-data OBJECT
data_utils.cc
data_utils.cc
one_hot_op.cc
one_hot_op.cc
...
...
mindspore/ccsrc/dataset/kernels/image/CMakeLists.txt
浏览文件 @
3f323e48
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
add_library
(
kernels-image OBJECT
center_crop_op.cc
center_crop_op.cc
cut_out_op.cc
cut_out_op.cc
...
...
mindspore/ccsrc/dataset/util/CMakeLists.txt
浏览文件 @
3f323e48
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
add_library
(
utils OBJECT
arena.cc
arena.cc
circular_pool.cc
circular_pool.cc
...
...
mindspore/ccsrc/debug/CMakeLists.txt
浏览文件 @
3f323e48
...
@@ -13,4 +13,5 @@ if (ENABLE_DUMP_E2E)
...
@@ -13,4 +13,5 @@ if (ENABLE_DUMP_E2E)
list
(
APPEND _DEBUG_SRC_LIST
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/e2e_dump.cc"
)
list
(
APPEND _DEBUG_SRC_LIST
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/e2e_dump.cc"
)
endif
(
ENABLE_DUMP_E2E
)
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
}
)
add_library
(
_mindspore_debug_obj OBJECT
${
_DEBUG_SRC_LIST
}
)
mindspore/ccsrc/device/CMakeLists.txt
浏览文件 @
3f323e48
...
@@ -47,4 +47,5 @@ if (ENABLE_GPU)
...
@@ -47,4 +47,5 @@ if (ENABLE_GPU)
# add_library(_mindspore_device_cuda_obj OBJECT ${CUDA_SRC_LIST})
# add_library(_mindspore_device_cuda_obj OBJECT ${CUDA_SRC_LIST})
endif
()
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
}
)
add_library
(
_mindspore_device_obj OBJECT
${
DEVICE_SRC_LIST
}
${
D_SRC_LIST
}
${
CPU_SRC_LIST
}
)
mindspore/ccsrc/gvar/CMakeLists.txt
浏览文件 @
3f323e48
file
(
GLOB_RECURSE MS_GVAR_SRC_LIST RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
*.cc
)
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
}
)
add_library
(
mindspore_gvar SHARED
${
MS_GVAR_SRC_LIST
}
)
if
(
APPLE
)
if
(
APPLE
)
set_target_properties
(
mindspore_gvar PROPERTIES MACOSX_RPATH ON
)
set_target_properties
(
mindspore_gvar PROPERTIES MACOSX_RPATH ON
)
...
...
mindspore/ccsrc/ir/CMakeLists.txt
浏览文件 @
3f323e48
file
(
GLOB_RECURSE _IR_SRC_LIST ./*.cc dtype/*.cc
)
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
}
)
add_library
(
_mindspore_ir_obj OBJECT
${
_IR_SRC_LIST
}
)
mindspore/ccsrc/kernel/CMakeLists.txt
浏览文件 @
3f323e48
...
@@ -43,4 +43,5 @@ if (ENABLE_GPU)
...
@@ -43,4 +43,5 @@ if (ENABLE_GPU)
# add_library(_mindspore_kernel_cuda_obj OBJECT ${CUDA_SRC_LIST})
# add_library(_mindspore_kernel_cuda_obj OBJECT ${CUDA_SRC_LIST})
endif
()
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
}
)
add_library
(
_mindspore_kernel_obj OBJECT
${
KERNEL_SRC_LIST
}
${
CPU_SRC_LIST
}
${
GPU_SRC_LIST
}
${
D_SRC_LIST
}
)
mindspore/ccsrc/mindrecord/CMakeLists.txt
浏览文件 @
3f323e48
...
@@ -18,6 +18,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare")
...
@@ -18,6 +18,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare")
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fvisibility=default"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fvisibility=default"
)
# add shared link library
# 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
}
)
add_library
(
_c_mindrecord SHARED
${
DIR_LIB_SRCS
}
)
set_target_properties
(
_c_mindrecord PROPERTIES
set_target_properties
(
_c_mindrecord PROPERTIES
...
...
mindspore/ccsrc/onnx/CMakeLists.txt
浏览文件 @
3f323e48
file
(
GLOB_RECURSE _ONNX_SRC_FILES RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
"*.cc"
)
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
}
)
add_library
(
_mindspore_onnx_obj OBJECT
${
_ONNX_SRC_FILES
}
)
mindspore/ccsrc/operator/CMakeLists.txt
浏览文件 @
3f323e48
file
(
GLOB_RECURSE _OPERATOR_SRC_FILES RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
"*.cc"
)
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
}
)
add_library
(
_mindspore_operator_obj OBJECT
${
_OPERATOR_SRC_FILES
}
)
mindspore/ccsrc/optimizer/CMakeLists.txt
浏览文件 @
3f323e48
file
(
GLOB_RECURSE _OPTIMIZER_SRC_FILES RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
"*.cc"
)
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
}
)
add_library
(
_mindspore_optimizer_obj OBJECT
${
_OPTIMIZER_SRC_FILES
}
)
mindspore/ccsrc/parallel/CMakeLists.txt
浏览文件 @
3f323e48
...
@@ -3,4 +3,5 @@ if (ENABLE_DUMP_PROTO)
...
@@ -3,4 +3,5 @@ if (ENABLE_DUMP_PROTO)
list
(
REMOVE_ITEM _PARALLEL_SRC_FILES
"parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc"
)
list
(
REMOVE_ITEM _PARALLEL_SRC_FILES
"parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc"
)
endif
()
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
}
)
add_library
(
_mindspore_parallel_obj OBJECT
${
_PARALLEL_SRC_FILES
}
)
mindspore/ccsrc/pipeline/CMakeLists.txt
浏览文件 @
3f323e48
...
@@ -9,6 +9,16 @@ file(GLOB_RECURSE _PIPELINE_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
...
@@ -9,6 +9,16 @@ file(GLOB_RECURSE _PIPELINE_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
"static_analysis/*.cc"
"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
)
if
(
ENABLE_GE OR ENABLE_D
)
file
(
GLOB_RECURSE _PIPELINE_GE_SRC_FILES RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
"pipeline_ge.cc"
)
file
(
GLOB_RECURSE _PIPELINE_GE_SRC_FILES RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
"pipeline_ge.cc"
)
list
(
APPEND _PIPELINE_SRC_FILES
${
_PIPELINE_GE_SRC_FILES
}
)
list
(
APPEND _PIPELINE_SRC_FILES
${
_PIPELINE_GE_SRC_FILES
}
)
...
...
mindspore/ccsrc/pre_activate/CMakeLists.txt
浏览文件 @
3f323e48
...
@@ -10,4 +10,5 @@ if (ENABLE_D)
...
@@ -10,4 +10,5 @@ if (ENABLE_D)
list
(
APPEND _PREACTIVATE_SRC_LIST
${
_D_SRC_LIST
}
)
list
(
APPEND _PREACTIVATE_SRC_LIST
${
_D_SRC_LIST
}
)
endif
()
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
)
\ No newline at end of file
add_library
(
_mindspore_pre_activate_obj OBJECT
${
_PREACTIVATE_SRC_LIST
}
)
mindspore/ccsrc/pybind_api/CMakeLists.txt
浏览文件 @
3f323e48
file
(
GLOB_RECURSE _PYBIND_API_SRC_LIST RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
"*.cc"
)
file
(
GLOB_RECURSE _PYBIND_API_SRC_LIST RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
"*.cc"
)
add_library
(
_mindspore_pybind_api_obj OBJECT
${
_PYBIND_API_SRC_LIST
}
)
set_property
(
SOURCE
${
_PYBIND_API_SRC_LIST
}
PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_COMMON
)
\ No newline at end of file
add_library
(
_mindspore_pybind_api_obj OBJECT
${
_PYBIND_API_SRC_LIST
}
)
mindspore/ccsrc/pynative/CMakeLists.txt
浏览文件 @
3f323e48
...
@@ -5,4 +5,5 @@ if (ENABLE_GE)
...
@@ -5,4 +5,5 @@ if (ENABLE_GE)
list
(
APPEND _PYNATIVE_SRC_LIST
${
_GE_SRC_LIST
}
)
list
(
APPEND _PYNATIVE_SRC_LIST
${
_GE_SRC_LIST
}
)
endif
()
endif
()
set_property
(
SOURCE
${
_PYNATIVE_SRC_LIST
}
PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_PYNATIVE
)
add_library
(
_mindspore_pynative_obj OBJECT
${
_PYNATIVE_SRC_LIST
}
)
add_library
(
_mindspore_pynative_obj OBJECT
${
_PYNATIVE_SRC_LIST
}
)
mindspore/ccsrc/session/CMakeLists.txt
浏览文件 @
3f323e48
...
@@ -26,4 +26,5 @@ if (ENABLE_D)
...
@@ -26,4 +26,5 @@ if (ENABLE_D)
list
(
APPEND _SESSION_SRC_LIST
${
_D_SRC_LIST
}
)
list
(
APPEND _SESSION_SRC_LIST
${
_D_SRC_LIST
}
)
endif
()
endif
()
add_library
(
_mindspore_session_obj OBJECT
${
_SESSION_SRC_LIST
}
)
set_property
(
SOURCE
${
_SESSION_SRC_LIST
}
PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_SESSION
)
\ No newline at end of file
add_library
(
_mindspore_session_obj OBJECT
${
_SESSION_SRC_LIST
}
)
mindspore/ccsrc/transform/CMakeLists.txt
浏览文件 @
3f323e48
if
(
ENABLE_GE OR ENABLE_D
)
if
(
ENABLE_GE OR ENABLE_D
)
file
(
GLOB_RECURSE _TRANSFORM_SRC_LIST RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
"*.cc"
)
file
(
GLOB_RECURSE _TRANSFORM_SRC_LIST RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
"*.cc"
)
set_property
(
SOURCE
${
_TRANSFORM_SRC_LIST
}
PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_GE_ADPT
)
add_library
(
_mindspore_transform_obj OBJECT
${
_TRANSFORM_SRC_LIST
}
)
add_library
(
_mindspore_transform_obj OBJECT
${
_TRANSFORM_SRC_LIST
}
)
if
(
NOT ENABLE_GE
)
if
(
NOT ENABLE_GE
)
...
...
mindspore/ccsrc/utils/CMakeLists.txt
浏览文件 @
3f323e48
...
@@ -5,4 +5,5 @@ if (NOT ENABLE_GE)
...
@@ -5,4 +5,5 @@ if (NOT ENABLE_GE)
list
(
REMOVE_ITEM _UTILS_SRC_LIST
${
_UTILS_GE_SRC_FILES
}
)
list
(
REMOVE_ITEM _UTILS_SRC_LIST
${
_UTILS_GE_SRC_FILES
}
)
endif
()
endif
()
set_property
(
SOURCE
${
_UTILS_SRC_LIST
}
PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_UTILS
)
add_library
(
_mindspore_utils_obj OBJECT
${
_UTILS_SRC_LIST
}
)
add_library
(
_mindspore_utils_obj OBJECT
${
_UTILS_SRC_LIST
}
)
mindspore/ccsrc/utils/contract.h
浏览文件 @
3f323e48
...
@@ -56,7 +56,7 @@ class Ensures : public EnsuresAccess<T, R> {
...
@@ -56,7 +56,7 @@ class Ensures : public EnsuresAccess<T, R> {
if
(
!
R
::
Check
(
value_
))
{
if
(
!
R
::
Check
(
value_
))
{
LogStream
contract_stream
;
LogStream
contract_stream
;
contract_stream
<<
"contract error: "
<<
signatory
.
extra_info
<<
R
::
Desc
();
contract_stream
<<
"contract error: "
<<
signatory
.
extra_info
<<
R
::
Desc
();
LogWriter
(
signatory
.
location_info
,
EXCEPTION
,
ArgumentError
)
^
contract_stream
;
LogWriter
(
signatory
.
location_info
,
EXCEPTION
,
SUBMODULE_ID
,
ArgumentError
)
^
contract_stream
;
}
}
}
}
template
<
class
O
,
typename
=
std
::
enable_if_t
<
std
::
is_convertible_v
<
O
,
T
>
>>
template
<
class
O
,
typename
=
std
::
enable_if_t
<
std
::
is_convertible_v
<
O
,
T
>
>>
...
...
mindspore/ccsrc/utils/log_adapter.cc
浏览文件 @
3f323e48
...
@@ -17,8 +17,8 @@
...
@@ -17,8 +17,8 @@
#include "utils/log_adapter.h"
#include "utils/log_adapter.h"
#include <unistd.h>
#include <unistd.h>
#include <map>
#include "pybind11/pybind11.h"
#include "pybind11/pybind11.h"
#include "debug/trace.h"
#include "debug/trace.h"
// namespace to support utils module definition
// namespace to support utils module definition
...
@@ -155,14 +155,44 @@ static std::string ExceptionTypeToString(ExceptionType type) {
...
@@ -155,14 +155,44 @@ static std::string ExceptionTypeToString(ExceptionType type) {
return
std
::
string
(
type_names
[
type
]);
return
std
::
string
(
type_names
[
type
]);
}
}
static
const
char
*
GetSubModuleName
(
SubModuleId
module_id
)
{
static
const
char
*
sub_module_names
[
NUM_SUBMODUES
]
=
{
"UNKNOWN"
,
// SM_UNKNOWN
"ANALYZER"
,
// SM_ANALYZER
"COMMON"
,
// SM_COMMON
"DEBUG"
,
// SM_DEBUG
"DEVICE"
,
// SM_DEVICE
"GE_ADPT"
,
// SM_GE_ADPT
"IR"
,
// SM_IR
"KERNEL"
,
// SM_KERNEL
"MD"
,
// SM_MD
"ME"
,
// SM_ME
"ONNX"
,
// SM_ONNX
"OPTIMIZER"
,
// SM_OPTIMIZER
"PARALLEL"
,
// SM_PARALLEL
"PARSER"
,
// SM_PARSER
"PIPELINE"
,
// SM_PIPELINE
"PRE_ACT"
,
// SM_PRE_ACT
"PYNATIVE"
,
// SM_PYNATIVE
"SESSION"
,
// SM_SESSION
"UTILS"
,
// SM_UTILS
"VM"
// SM_VM
};
return
sub_module_names
[
module_id
%
NUM_SUBMODUES
];
}
void
LogWriter
::
OutputLog
(
const
std
::
ostringstream
&
msg
)
const
{
void
LogWriter
::
OutputLog
(
const
std
::
ostringstream
&
msg
)
const
{
#ifdef USE_GLOG
#ifdef USE_GLOG
auto
submodule_name
=
GetSubModuleName
(
submodule_
);
google
::
LogMessage
(
""
,
0
,
GetGlogLevel
(
log_level_
)).
stream
()
google
::
LogMessage
(
""
,
0
,
GetGlogLevel
(
log_level_
)).
stream
()
<<
"["
<<
GetLogLevel
(
log_level_
)
<<
"] ME("
<<
getpid
()
<<
","
<<
GetProcName
()
<<
"):"
<<
GetTime
()
<<
" "
<<
"["
<<
GetLogLevel
(
log_level_
)
<<
"] "
<<
submodule_name
<<
"("
<<
getpid
()
<<
","
<<
GetProcName
()
<<
"):"
<<
GetTime
()
<<
" "
<<
"["
<<
location_
.
file_
<<
":"
<<
location_
.
line_
<<
"] "
<<
location_
.
func_
<<
"] "
<<
msg
.
str
()
<<
std
::
endl
;
<<
"["
<<
location_
.
file_
<<
":"
<<
location_
.
line_
<<
"] "
<<
location_
.
func_
<<
"] "
<<
msg
.
str
()
<<
std
::
endl
;
#else
#else
auto
str_msg
=
msg
.
str
();
auto
str_msg
=
msg
.
str
();
Dlog
(
static_cast
<
int
>
(
ME
),
GetSlogLevel
(
log_level_
),
"[%s:%d] %s] %s"
,
location_
.
file_
,
location_
.
line_
,
auto
slog_module_id
=
(
submodule_
==
SM_MD
?
MD
:
ME
);
Dlog
(
static_cast
<
int
>
(
slog_module_id
),
GetSlogLevel
(
log_level_
),
"[%s:%d] %s] %s"
,
location_
.
file_
,
location_
.
line_
,
location_
.
func_
,
str_msg
.
c_str
());
location_
.
func_
,
str_msg
.
c_str
());
#endif
#endif
}
}
...
@@ -230,6 +260,231 @@ static void InitMsLogLevel() {
...
@@ -230,6 +260,231 @@ static void InitMsLogLevel() {
#endif
#endif
// set default log level to WARNING for all sub modules
int
g_ms_submodule_log_levels
[
NUM_SUBMODUES
]
=
{
WARNING
};
enum
LogConfigToken
{
INVALID
,
// indicate invalid token
LEFT_BRACE
,
// '{'
RIGHT_BRACE
,
// '}'
VARIABLE
,
// '[A-Za-z][A-Za-z0-9_]*'
NUMBER
,
// [0-9]+
COMMA
,
// ','
COLON
,
// ';'
EOS
,
// End Of String, '\0'
};
static
inline
bool
IsAlpha
(
char
ch
)
{
return
(
ch
>=
'A'
&&
ch
<=
'Z'
)
||
(
ch
>=
'a'
&&
ch
<=
'z'
);
}
static
inline
bool
IsDigit
(
char
ch
)
{
return
ch
>=
'0'
&&
ch
<=
'9'
;
}
class
LogConfigLexer
{
public:
explicit
LogConfigLexer
(
const
std
::
string
&
text
)
:
buffer_
(
text
)
{
cur_idx_
=
0
;
cur_token_
=
LogConfigToken
::
INVALID
;
}
~
LogConfigLexer
()
=
default
;
// skip white space, and return the first char after white space
char
SkipWhiteSpace
()
{
while
(
cur_idx_
<
buffer_
.
size
())
{
char
ch
=
buffer_
[
cur_idx_
];
if
(
ch
==
' '
||
ch
==
'\t'
)
{
++
cur_idx_
;
continue
;
}
return
ch
;
}
return
'\0'
;
}
LogConfigToken
GetNext
(
std
::
string
*
ptr
)
{
#ifdef DEBUG
std
::
string
text
;
auto
tok
=
GetNextInner
(
&
text
);
MS_LOG
(
DEBUG
)
<<
"Got token "
<<
tok
<<
" with value ["
<<
text
<<
"]"
;
if
(
ptr
!=
nullptr
)
{
*
ptr
=
text
;
}
return
tok
;
}
LogConfigToken
GetNextInner
(
std
::
string
*
ptr
)
{
#endif
char
ch
=
SkipWhiteSpace
();
// clang-format off
static
const
std
::
map
<
char
,
LogConfigToken
>
single_char_map
=
{
{
'{'
,
LogConfigToken
::
LEFT_BRACE
},
{
'}'
,
LogConfigToken
::
RIGHT_BRACE
},
{
','
,
LogConfigToken
::
COMMA
},
{
':'
,
LogConfigToken
::
COLON
},
{
'\0'
,
LogConfigToken
::
EOS
},
};
// clang-format on
auto
iter
=
single_char_map
.
find
(
ch
);
if
(
iter
!=
single_char_map
.
end
())
{
if
(
ptr
!=
nullptr
)
{
*
ptr
=
std
::
string
()
+
ch
;
}
++
cur_idx_
;
return
iter
->
second
;
}
else
if
(
IsAlpha
(
ch
))
{
std
::
ostringstream
oss
;
do
{
oss
<<
ch
;
ch
=
buffer_
[
++
cur_idx_
];
}
while
(
cur_idx_
<
buffer_
.
size
()
&&
(
IsAlpha
(
ch
)
||
IsDigit
(
ch
)
||
ch
==
'_'
));
if
(
ptr
!=
nullptr
)
{
*
ptr
=
std
::
string
(
oss
.
str
());
}
return
LogConfigToken
::
VARIABLE
;
}
else
if
(
IsDigit
(
ch
))
{
std
::
ostringstream
oss
;
do
{
oss
<<
ch
;
ch
=
buffer_
[
++
cur_idx_
];
}
while
(
cur_idx_
<
buffer_
.
size
()
&&
IsDigit
(
ch
));
if
(
ptr
!=
nullptr
)
{
*
ptr
=
std
::
string
(
oss
.
str
());
}
return
LogConfigToken
::
NUMBER
;
}
return
LogConfigToken
::
INVALID
;
}
private:
std
::
string
buffer_
;
size_t
cur_idx_
;
LogConfigToken
cur_token_
;
std
::
string
cur_text_
;
};
class
LogConfigParser
{
public:
explicit
LogConfigParser
(
const
std
::
string
&
cfg
)
:
lexer
(
cfg
)
{}
bool
Expect
(
LogConfigToken
expected
,
LogConfigToken
tok
)
{
if
(
expected
!=
tok
)
{
MS_LOG
(
ERROR
)
<<
"Expect "
<<
expected
<<
", but got "
<<
tok
;
return
false
;
}
return
true
;
}
// The text of config MS_SUBMODULE_LOG_v is in the form {submodule1:log_level1,submodule2:log_level2,...}.
// Valid values of log levels are: 0 - debug, 1 - info, 2 - warning, 3 - error
// e.g. MS_SUBMODULE_LOG_v={PARSER:0, ANALYZER:2, PIPELINE:1}
std
::
map
<
std
::
string
,
std
::
string
>
Parse
()
{
std
::
map
<
std
::
string
,
std
::
string
>
log_levels
;
bool
flag_error
=
false
;
std
::
string
text
;
auto
tok
=
lexer
.
GetNext
(
&
text
);
// empty string
if
(
tok
==
LogConfigToken
::
EOS
)
{
return
log_levels
;
}
if
(
!
Expect
(
LogConfigToken
::
LEFT_BRACE
,
tok
))
{
return
log_levels
;
}
do
{
std
::
string
key
,
val
;
tok
=
lexer
.
GetNext
(
&
key
);
if
(
!
Expect
(
LogConfigToken
::
VARIABLE
,
tok
))
{
flag_error
=
true
;
break
;
}
tok
=
lexer
.
GetNext
(
&
text
);
if
(
!
Expect
(
LogConfigToken
::
COLON
,
tok
))
{
flag_error
=
true
;
break
;
}
tok
=
lexer
.
GetNext
(
&
val
);
if
(
!
Expect
(
LogConfigToken
::
NUMBER
,
tok
))
{
flag_error
=
true
;
break
;
}
log_levels
[
key
]
=
val
;
tok
=
lexer
.
GetNext
(
&
text
);
}
while
(
tok
==
LogConfigToken
::
COMMA
);
if
(
!
flag_error
&&
!
Expect
(
LogConfigToken
::
RIGHT_BRACE
,
tok
))
{
flag_error
=
true
;
}
if
(
flag_error
)
{
log_levels
.
clear
();
}
return
log_levels
;
}
private:
LogConfigLexer
lexer
;
};
bool
ParseLogLevel
(
const
std
::
string
&
str_level
,
MsLogLevel
*
ptr_level
)
{
if
(
str_level
.
size
()
==
1
)
{
int
ch
=
str_level
.
c_str
()[
0
];
ch
=
ch
-
'0'
;
// substract ASCII code of '0', which is 48
if
(
ch
>=
DEBUG
&&
ch
<=
ERROR
)
{
if
(
ptr_level
!=
nullptr
)
{
*
ptr_level
=
static_cast
<
MsLogLevel
>
(
ch
);
}
return
true
;
}
}
return
false
;
}
static
MsLogLevel
GetGlobalLogLevel
()
{
#ifdef USE_GLOG
return
static_cast
<
MsLogLevel
>
(
FLAGS_v
);
#else
return
static_cast
<
MsLogLevel
>
(
g_mslog_level
);
#endif
}
void
InitSubModulesLogLevel
()
{
// initialize submodule's log level using global
auto
global_log_level
=
GetGlobalLogLevel
();
for
(
int
i
=
0
;
i
<
NUM_SUBMODUES
;
++
i
)
{
g_ms_submodule_log_levels
[
i
]
=
global_log_level
;
}
// set submodule's log level
auto
submodule
=
GetEnv
(
"MS_SUBMODULE_LOG_v"
);
MS_LOG
(
INFO
)
<<
"MS_SUBMODULE_LOG_v=`"
<<
submodule
<<
"`"
;
LogConfigParser
parser
(
submodule
);
auto
configs
=
parser
.
Parse
();
for
(
const
auto
&
cfg
:
configs
)
{
int
mod_idx
=
-
1
;
for
(
int
i
=
0
;
i
<
NUM_SUBMODUES
;
++
i
)
{
if
(
cfg
.
first
==
GetSubModuleName
(
static_cast
<
SubModuleId
>
(
i
)))
{
mod_idx
=
i
;
break
;
}
}
if
(
mod_idx
<
0
)
{
MS_LOG
(
WARNING
)
<<
"Undefined module name "
<<
cfg
.
first
<<
", ignore it"
;
continue
;
}
MsLogLevel
submodule_log_level
;
if
(
!
ParseLogLevel
(
cfg
.
second
,
&
submodule_log_level
))
{
MS_LOG
(
WARNING
)
<<
"Illegal log level value "
<<
cfg
.
second
<<
" for "
<<
cfg
.
first
<<
", ignore it."
;
continue
;
}
g_ms_submodule_log_levels
[
mod_idx
]
=
submodule_log_level
;
}
}
}
// namespace mindspore
}
// namespace mindspore
extern
"C"
{
extern
"C"
{
...
@@ -253,6 +508,7 @@ void mindspore_log_init(void) {
...
@@ -253,6 +508,7 @@ void mindspore_log_init(void) {
if
(
mindspore
::
GetEnv
(
"GLOG_v"
).
empty
())
{
if
(
mindspore
::
GetEnv
(
"GLOG_v"
).
empty
())
{
FLAGS_v
=
mindspore
::
WARNING
;
FLAGS_v
=
mindspore
::
WARNING
;
}
}
// set default log file mode to 0640
// set default log file mode to 0640
if
(
mindspore
::
GetEnv
(
"GLOG_logfile_mode"
).
empty
())
{
if
(
mindspore
::
GetEnv
(
"GLOG_logfile_mode"
).
empty
())
{
FLAGS_logfile_mode
=
0640
;
FLAGS_logfile_mode
=
0640
;
...
@@ -265,6 +521,8 @@ void mindspore_log_init(void) {
...
@@ -265,6 +521,8 @@ void mindspore_log_init(void) {
FLAGS_logtostderr
=
true
;
FLAGS_logtostderr
=
true
;
MS_LOG
(
WARNING
)
<<
"`GLOG_log_dir` is not set, output log to screen."
;
MS_LOG
(
WARNING
)
<<
"`GLOG_log_dir` is not set, output log to screen."
;
}
}
mindspore
::
InitSubModulesLogLevel
();
#else
#else
mindspore
::
InitMsLogLevel
();
mindspore
::
InitMsLogLevel
();
#endif
#endif
...
...
mindspore/ccsrc/utils/log_adapter.h
浏览文件 @
3f323e48
...
@@ -97,14 +97,44 @@ constexpr std::ostream &operator<<(std::ostream &stream, const T &value) {
...
@@ -97,14 +97,44 @@ constexpr std::ostream &operator<<(std::ostream &stream, const T &value) {
enum
MsLogLevel
:
int
{
DEBUG
=
0
,
INFO
,
WARNING
,
ERROR
,
EXCEPTION
};
enum
MsLogLevel
:
int
{
DEBUG
=
0
,
INFO
,
WARNING
,
ERROR
,
EXCEPTION
};
enum
SubModuleId
:
int
{
SM_UNKNOWN
=
0
,
// unknown submodule
SM_ANALYZER
,
// static analyzer
SM_COMMON
,
// common
SM_DEBUG
,
// debug
SM_DEVICE
,
// device
SM_GE_ADPT
,
// ge adapter
SM_IR
,
// IR
SM_KERNEL
,
// kernel
SM_MD
,
// MindData
SM_ME
,
// MindExpression
SM_ONNX
,
// ONNX
SM_OPTIMIZER
,
// optimzer
SM_PARALLEL
,
// parallel
SM_PARSER
,
// parser
SM_PIPELINE
,
// ME pipeline
SM_PRE_ACT
,
// pre-activate
SM_PYNATIVE
,
// PyNative
SM_SESSION
,
// session
SM_UTILS
,
// utils
SM_VM
,
// VM
NUM_SUBMODUES
// number of submodules
};
#ifndef SUBMODULE_ID
#define SUBMODULE_ID mindspore::SubModuleId::SM_ME
#endif
#ifndef USE_GLOG
#ifndef USE_GLOG
extern
int
g_mslog_level
;
extern
int
g_mslog_level
;
#endif
#endif
extern
int
g_ms_submodule_log_levels
[]
__attribute__
((
visibility
(
"default"
)));
class
LogWriter
{
class
LogWriter
{
public:
public:
LogWriter
(
const
LocationInfo
&
location
,
MsLogLevel
log_level
,
ExceptionType
excp_type
=
NoExceptionType
)
LogWriter
(
const
LocationInfo
&
location
,
MsLogLevel
log_level
,
SubModuleId
submodule
,
:
location_
(
location
),
log_level_
(
log_level
),
exception_type_
(
excp_type
)
{}
ExceptionType
excp_type
=
NoExceptionType
)
:
location_
(
location
),
log_level_
(
log_level
),
submodule_
(
submodule
),
exception_type_
(
excp_type
)
{}
~
LogWriter
()
=
default
;
~
LogWriter
()
=
default
;
void
operator
<
(
const
LogStream
&
stream
)
const
noexcept
__attribute__
((
visibility
(
"default"
)));
void
operator
<
(
const
LogStream
&
stream
)
const
noexcept
__attribute__
((
visibility
(
"default"
)));
...
@@ -115,6 +145,7 @@ class LogWriter {
...
@@ -115,6 +145,7 @@ class LogWriter {
LocationInfo
location_
;
LocationInfo
location_
;
MsLogLevel
log_level_
;
MsLogLevel
log_level_
;
SubModuleId
submodule_
;
ExceptionType
exception_type_
;
ExceptionType
exception_type_
;
};
};
...
@@ -122,16 +153,13 @@ class LogWriter {
...
@@ -122,16 +153,13 @@ class LogWriter {
static_cast<void>(0), !(condition) \
static_cast<void>(0), !(condition) \
? void(0) \
? void(0) \
: mindspore::LogWriter(mindspore::LocationInfo(FILE_NAME, __LINE__, __FUNCTION__), level, \
: mindspore::LogWriter(mindspore::LocationInfo(FILE_NAME, __LINE__, __FUNCTION__), level, \
excp_type) < mindspore::LogStream()
SUBMODULE_ID, excp_type) < mindspore::LogStream()
#define MSLOG_THROW(excp_type) \
#define MSLOG_THROW(excp_type) \
mindspore::LogWriter(mindspore::LocationInfo(FILE_NAME, __LINE__, __FUNCTION__), mindspore::EXCEPTION, excp_type) ^ \
mindspore::LogWriter(mindspore::LocationInfo(FILE_NAME, __LINE__, __FUNCTION__), mindspore::EXCEPTION, SUBMODULE_ID, \
excp_type) ^ \
mindspore::LogStream()
mindspore::LogStream()
#ifdef USE_GLOG
#define IS_OUTPUT_ON(level) (level) >= mindspore::g_ms_submodule_log_levels[SUBMODULE_ID]
#define IS_OUTPUT_ON(level) (level) >= FLAGS_v
#else
#define IS_OUTPUT_ON(level) (level) >= mindspore::g_mslog_level
#endif
#define MS_LOG(level) MS_LOG_##level
#define MS_LOG(level) MS_LOG_##level
...
...
mindspore/ccsrc/vm/CMakeLists.txt
浏览文件 @
3f323e48
file
(
GLOB_RECURSE _VM_SRC_LIST RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
"*.cc"
)
file
(
GLOB_RECURSE _VM_SRC_LIST RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
"*.cc"
)
set_property
(
SOURCE
${
_VM_SRC_LIST
}
PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_VM
)
add_library
(
_mindspore_vm_obj OBJECT
${
_VM_SRC_LIST
}
)
add_library
(
_mindspore_vm_obj OBJECT
${
_VM_SRC_LIST
}
)
tests/ut/cpp/common/test_main.cc
浏览文件 @
3f323e48
...
@@ -19,7 +19,12 @@
...
@@ -19,7 +19,12 @@
#include "pipeline/pipeline.h"
#include "pipeline/pipeline.h"
#include "pipeline/resource.h"
#include "pipeline/resource.h"
namespace
mindspore
{
extern
void
InitSubModulesLogLevel
();
}
GTEST_API_
int
main
(
int
argc
,
char
**
argv
)
{
GTEST_API_
int
main
(
int
argc
,
char
**
argv
)
{
mindspore
::
InitSubModulesLogLevel
();
testing
::
InitGoogleTest
(
&
argc
,
argv
);
testing
::
InitGoogleTest
(
&
argc
,
argv
);
int
ret
=
RUN_ALL_TESTS
();
int
ret
=
RUN_ALL_TESTS
();
mindspore
::
pipeline
::
ClearResAtexit
();
mindspore
::
pipeline
::
ClearResAtexit
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录