Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle-Lite
提交
9359787d
P
Paddle-Lite
项目概览
PaddlePaddle
/
Paddle-Lite
通知
331
Star
4
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
271
列表
看板
标记
里程碑
合并请求
78
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle-Lite
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
271
Issue
271
列表
看板
标记
里程碑
合并请求
78
合并请求
78
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
9359787d
编写于
2月 22, 2020
作者:
Y
yiicy
提交者:
GitHub
2月 22, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[cherry-pick] fix tiny_publish link error when open LOG, test=develop (#2976)
上级
28f6506d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
4 deletion
+9
-4
docs/introduction/roadmap.md
docs/introduction/roadmap.md
+0
-1
lite/model_parser/model_parser.cc
lite/model_parser/model_parser.cc
+3
-3
lite/utils/replace_stl/stream.cc
lite/utils/replace_stl/stream.cc
+6
-0
未找到文件。
docs/introduction/roadmap.md
浏览文件 @
9359787d
...
@@ -30,4 +30,3 @@
...
@@ -30,4 +30,3 @@
## 2.6
## 2.6
[
v2.6 project
](
https://github.com/PaddlePaddle/Paddle-Lite/milestones/v2.6
)
[
v2.6 project
](
https://github.com/PaddlePaddle/Paddle-Lite/milestones/v2.6
)
lite/model_parser/model_parser.cc
浏览文件 @
9359787d
...
@@ -796,7 +796,7 @@ void LoadModelNaiveFromFile(const std::string &filename,
...
@@ -796,7 +796,7 @@ void LoadModelNaiveFromFile(const std::string &filename,
const
uint64_t
opt_version_length
=
16
*
sizeof
(
char
);
const
uint64_t
opt_version_length
=
16
*
sizeof
(
char
);
ReadModelDataFromFile
<
char
>
(
ReadModelDataFromFile
<
char
>
(
opt_version
,
prog_path
,
&
offset
,
opt_version_length
);
opt_version
,
prog_path
,
&
offset
,
opt_version_length
);
VLOG
(
4
)
<<
"Opt_version:"
<<
opt_version
;
VLOG
(
4
)
<<
"Opt_version:"
<<
static_cast
<
const
char
*>
(
opt_version
)
;
// check version, opt's version should be consistent with current Paddle-Lite
// check version, opt's version should be consistent with current Paddle-Lite
// version.
// version.
...
@@ -806,7 +806,7 @@ void LoadModelNaiveFromFile(const std::string &filename,
...
@@ -806,7 +806,7 @@ void LoadModelNaiveFromFile(const std::string &filename,
LOG
(
WARNING
)
<<
"warning: the version of opt that transformed this model "
LOG
(
WARNING
)
<<
"warning: the version of opt that transformed this model "
"is not consistent with current Paddle-Lite version."
"is not consistent with current Paddle-Lite version."
"
\n
version of opt:"
"
\n
version of opt:"
<<
opt_version
<<
static_cast
<
const
char
*>
(
opt_version
)
<<
"
\n
version of current Paddle-Lite:"
<<
paddle_version
;
<<
"
\n
version of current Paddle-Lite:"
<<
paddle_version
;
}
}
...
@@ -893,7 +893,7 @@ void LoadModelNaiveFromMemory(const std::string &model_buffer,
...
@@ -893,7 +893,7 @@ void LoadModelNaiveFromMemory(const std::string &model_buffer,
const
uint64_t
paddle_version_length
=
16
*
sizeof
(
char
);
const
uint64_t
paddle_version_length
=
16
*
sizeof
(
char
);
ReadModelDataFromBuffer
<
char
>
(
ReadModelDataFromBuffer
<
char
>
(
opt_version
,
model_buffer
,
&
offset
,
paddle_version_length
);
opt_version
,
model_buffer
,
&
offset
,
paddle_version_length
);
VLOG
(
4
)
<<
"Opt_version:"
<<
opt_version
;
VLOG
(
4
)
<<
"Opt_version:"
<<
static_cast
<
const
char
*>
(
opt_version
)
;
// (3)get topo_size and topo_data
// (3)get topo_size and topo_data
uint64_t
topo_size
;
uint64_t
topo_size
;
...
...
lite/utils/replace_stl/stream.cc
浏览文件 @
9359787d
...
@@ -100,6 +100,12 @@ ostream& ostream::operator<<(const unsigned& obj) {
...
@@ -100,6 +100,12 @@ ostream& ostream::operator<<(const unsigned& obj) {
return
*
this
;
return
*
this
;
}
}
template
<
>
ostream
&
ostream
::
operator
<<
(
const
uint16_t
&
obj
)
{
ADD_DATA_AS_STRING
(
data_
,
obj
);
return
*
this
;
}
template
<
>
template
<
>
ostream
&
ostream
::
operator
<<
(
const
unsigned
long
&
obj
)
{
// NOLINT
ostream
&
ostream
::
operator
<<
(
const
unsigned
long
&
obj
)
{
// NOLINT
ADD_DATA_AS_STRING
(
data_
,
obj
);
ADD_DATA_AS_STRING
(
data_
,
obj
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录