Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
正统之独孤求败
mindspore
提交
ab8c267c
M
mindspore
项目概览
正统之独孤求败
/
mindspore
与 Fork 源项目一致
Fork自
MindSpore / mindspore
通知
1
Star
0
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ab8c267c
编写于
8月 25, 2020
作者:
W
wangshaocong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bug of building error
上级
c165a6d0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
17 deletion
+19
-17
mindspore/core/utils/log_adapter.h
mindspore/core/utils/log_adapter.h
+2
-1
mindspore/lite/CMakeLists.txt
mindspore/lite/CMakeLists.txt
+17
-16
未找到文件。
mindspore/core/utils/log_adapter.h
浏览文件 @
ab8c267c
...
@@ -147,7 +147,7 @@ class LogWriter {
...
@@ -147,7 +147,7 @@ class LogWriter {
LogWriter
(
const
LocationInfo
&
location
,
MsLogLevel
log_level
,
SubModuleId
submodule
,
LogWriter
(
const
LocationInfo
&
location
,
MsLogLevel
log_level
,
SubModuleId
submodule
,
ExceptionType
excp_type
=
NoExceptionType
)
ExceptionType
excp_type
=
NoExceptionType
)
:
location_
(
location
),
log_level_
(
log_level
),
exception_type_
(
excp_type
)
{}
:
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"
)));
...
@@ -161,6 +161,7 @@ class LogWriter {
...
@@ -161,6 +161,7 @@ class LogWriter {
LocationInfo
location_
;
LocationInfo
location_
;
MsLogLevel
log_level_
;
MsLogLevel
log_level_
;
SubModuleId
submodule_
;
ExceptionType
exception_type_
;
ExceptionType
exception_type_
;
inline
static
ExceptionHandler
exception_handler_
=
nullptr
;
inline
static
ExceptionHandler
exception_handler_
=
nullptr
;
...
...
mindspore/lite/CMakeLists.txt
浏览文件 @
ab8c267c
...
@@ -65,21 +65,22 @@ set(CMAKE_VERBOSE_MAKEFILE on)
...
@@ -65,21 +65,22 @@ set(CMAKE_VERBOSE_MAKEFILE on)
add_compile_definitions
(
USE_ANDROID_LOG
)
add_compile_definitions
(
USE_ANDROID_LOG
)
add_compile_definitions
(
NO_DLIB
)
add_compile_definitions
(
NO_DLIB
)
add_compile_options
(
-fPIC
)
add_compile_options
(
-fPIC
)
if
(
NOT PLATFORM_ARM64 AND NOT PLATFORM_ARM32
)
if
(
"
${
CMAKE_BUILD_TYPE
}
"
STREQUAL
"Debug"
)
if
(
"
${
CMAKE_BUILD_TYPE
}
"
STREQUAL
"Debug"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-DDebug -g"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-DDebug -g"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DDebug -g"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DDebug -g"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-fvisibility=default"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-fvisibility=default"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fvisibility=default"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fvisibility=default"
)
else
()
else
()
## enable for binscope for release
## enable for binscope for release
set
(
CMAKE_C_FLAGS
"-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -fstack-protector-strong -Wno-attributes -Wno-deprecated-declarations -Wno-missing-braces -Wno-overloaded-virtual
${
CMAKE_C_FLAGS
}
"
)
set
(
CMAKE_C_FLAGS
"-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -fstack-protector-strong -Wno-attributes -Wno-deprecated-declarations -Wno-missing-braces
${
CMAKE_C_FLAGS
}
"
)
set
(
CMAKE_CXX_FLAGS
"-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -fstack-protector-strong -Wno-attributes -Wno-deprecated-declarations -Wno-missing-braces -Wno-overloaded-virtual
${
CMAKE_CXX_FLAGS
}
"
)
set
(
CMAKE_CXX_FLAGS
"-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -fstack-protector-strong -Wno-attributes -Wno-deprecated-declarations -Wno-missing-braces -Wno-overloaded-virtual
${
CMAKE_CXX_FLAGS
}
"
)
if
(
NOT WIN32
)
if
(
NOT WIN32
)
set
(
CMAKE_SHARED_LINKER_FLAGS
"-Wl,-z,relro,-z,now -Wl,-z,noexecstack
${
CMAKE_SHARED_LINKER_FLAGS
}
"
)
set
(
CMAKE_SHARED_LINKER_FLAGS
"-Wl,-z,relro,-z,now -Wl,-z,noexecstack
${
CMAKE_SHARED_LINKER_FLAGS
}
"
)
set
(
CMAKE_EXE_LINKER_FLAGS
"-Wl,-z,relro,-z,now -Wl,-z,noexecstack
${
CMAKE_EXE_LINKER_FLAGS
}
"
)
set
(
CMAKE_EXE_LINKER_FLAGS
"-Wl,-z,relro,-z,now -Wl,-z,noexecstack
${
CMAKE_EXE_LINKER_FLAGS
}
"
)
endif
()
endif
()
string
(
REPLACE
" -g "
" "
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
"
)
string
(
REPLACE
" -g "
" "
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
"
)
endif
()
endif
()
endif
()
if
(
BUILD_DEVICE
)
if
(
BUILD_DEVICE
)
...
@@ -208,4 +209,4 @@ if (BUILD_DEVICE)
...
@@ -208,4 +209,4 @@ if (BUILD_DEVICE)
endif
()
endif
()
endif
()
endif
()
include
(
${
TOP_DIR
}
/cmake/package_lite.cmake
)
include
(
${
TOP_DIR
}
/cmake/package_lite.cmake
)
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录