Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MegEngine 天元
MegEngine
提交
f0088335
MegEngine
项目概览
MegEngine 天元
/
MegEngine
1 年多 前同步成功
通知
410
Star
4707
Fork
583
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
MegEngine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
f0088335
编写于
6月 15, 2022
作者:
M
Megvii Engine Team
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(mgb): upgrade flatbuffer
GitOrigin-RevId: 7b1a04934ea3a7936661bb0558e4c58b258cdff2
上级
657db8dc
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
14 addition
and
20 deletion
+14
-20
src/serialization/impl/file.cpp
src/serialization/impl/file.cpp
+3
-3
src/serialization/impl/serializer_oss.cpp
src/serialization/impl/serializer_oss.cpp
+4
-7
src/serialization/impl/serializer_oss_v2.cpp
src/serialization/impl/serializer_oss_v2.cpp
+4
-7
src/serialization/include/megbrain/serialization/file.h
src/serialization/include/megbrain/serialization/file.h
+1
-1
toolchains/ios.toolchain.cmake
toolchains/ios.toolchain.cmake
+2
-2
未找到文件。
src/serialization/impl/file.cpp
浏览文件 @
f0088335
...
...
@@ -33,7 +33,7 @@ public:
void
rewind
()
override
{
std
::
rewind
(
m_fptr
);
}
void
skip
(
size
_t
bytes
)
override
{
void
skip
(
int64
_t
bytes
)
override
{
auto
err
=
fseek
(
m_fptr
,
bytes
,
SEEK_CUR
);
mgb_assert
(
!
err
);
}
...
...
@@ -104,7 +104,7 @@ public:
void
rewind
()
override
{
m_offset
=
0
;
}
void
skip
(
size
_t
bytes
)
override
{
void
skip
(
int64
_t
bytes
)
override
{
m_offset
+=
bytes
;
mgb_assert
(
m_offset
<=
m_size
);
}
...
...
@@ -146,7 +146,7 @@ public:
m_offset
=
0
;
}
void
skip
(
size
_t
bytes
)
override
{
void
skip
(
int64
_t
bytes
)
override
{
m_offset
+=
bytes
;
mgb_assert
(
m_offset
<=
m_size
);
}
...
...
src/serialization/impl/serializer_oss.cpp
浏览文件 @
f0088335
...
...
@@ -838,25 +838,22 @@ GraphLoader::LoadResult GraphLoaderOSS::load(const LoadConfig& config, bool rewi
// Read fbs::Graph
uint32_t
size
;
m_file
->
read
(
&
size
,
sizeof
(
size
));
m_graph_buf
=
m_file
->
read_shared
(
size
);
m_file
->
skip
(
-
sizeof
(
size
));
m_graph_buf
=
m_file
->
read_shared
(
size
+
sizeof
(
size
));
// Rewind back to tensor data
m_file
->
rewind
();
m_file
->
skip
(
tensor_begin
);
mgb_throw_if
(
!
fbs
::
GraphBufferHasIdentifier
(
m_graph_buf
.
data
()),
SerializationError
,
"invalid fbs model"
);
{
flatbuffers
::
Verifier
verifier
(
static_cast
<
const
uint8_t
*>
(
m_graph_buf
.
data
()),
m_graph_buf
.
size
());
mgb_throw_if
(
!
fbs
::
VerifyGraphBuffer
(
verifier
),
SerializationError
,
!
fbs
::
Verify
SizePrefixed
GraphBuffer
(
verifier
),
SerializationError
,
"model verification failed (invalid or corrupted model?)"
);
}
m_graph
=
fbs
::
GetGraph
(
m_graph_buf
.
data
());
m_graph
=
fbs
::
Get
SizePrefixed
Graph
(
m_graph_buf
.
data
());
m_mgb_version
=
m_graph
->
mgb_version
();
if
(
m_graph
->
mgb_version
()
>
MGB_VERSION
)
{
mgb_log_warn
(
...
...
src/serialization/impl/serializer_oss_v2.cpp
浏览文件 @
f0088335
...
...
@@ -801,21 +801,18 @@ GraphLoader::LoadResult GraphLoaderOSSV2::load(const LoadConfig& config, bool re
// Read fbs::Graph
uint32_t
size
;
m_file
->
read
(
&
size
,
sizeof
(
size
));
m_model_buf
=
m_file
->
read_shared
(
size
);
mgb_throw_if
(
!
fbs
::
v2
::
ModelBufferHasIdentifier
(
m_model_buf
.
data
()),
SerializationError
,
"invalid fbs model"
);
m_file
->
skip
(
-
sizeof
(
size
));
m_model_buf
=
m_file
->
read_shared
(
size
+
sizeof
(
size
));
{
flatbuffers
::
Verifier
verifier
(
static_cast
<
const
uint8_t
*>
(
m_model_buf
.
data
()),
m_model_buf
.
size
());
mgb_throw_if
(
!
fbs
::
v2
::
VerifyModelBuffer
(
verifier
),
SerializationError
,
!
fbs
::
v2
::
Verify
SizePrefixed
ModelBuffer
(
verifier
),
SerializationError
,
"model verification failed (invalid or corrupted model?)"
);
}
m_model
=
fbs
::
v2
::
GetModel
(
m_model_buf
.
data
());
m_model
=
fbs
::
v2
::
Get
SizePrefixed
Model
(
m_model_buf
.
data
());
m_mgb_version
=
m_model
->
mge_version
();
m_model_version
=
m_model
->
model_version
();
if
(
m_model
->
mge_version
()
>
MGB_VERSION
)
{
...
...
src/serialization/include/megbrain/serialization/file.h
浏览文件 @
f0088335
...
...
@@ -33,7 +33,7 @@ public:
virtual
void
rewind
()
=
0
;
//! skip given number of bytes
virtual
void
skip
(
size
_t
bytes
)
=
0
;
virtual
void
skip
(
int64
_t
bytes
)
=
0
;
//! read data into buffer
virtual
void
read
(
void
*
dst
,
size_t
size
)
=
0
;
...
...
toolchains/ios.toolchain.cmake
浏览文件 @
f0088335
...
...
@@ -217,10 +217,10 @@ if(NOT DEFINED IOS_DEPLOYMENT_TARGET)
"2.0"
CACHE STRING
"Minimum iOS version to build for."
)
else
()
# Unless specified, SDK version 1
0
.0 is used by default as minimum target version
# Unless specified, SDK version 1
1
.0 is used by default as minimum target version
# (iOS, tvOS).
set
(
IOS_DEPLOYMENT_TARGET
"1
0
.0"
"1
1
.0"
CACHE STRING
"Minimum iOS version to build for."
)
endif
()
message
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录