Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Xiaomi
Mace
提交
b53a461c
Mace
项目概览
Xiaomi
/
Mace
通知
106
Star
40
Fork
27
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Mace
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b53a461c
编写于
5月 12, 2020
作者:
B
Bin Li
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix onnx depthspace and cmake host
上级
6cf3da24
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
13 addition
and
6 deletion
+13
-6
mace/core/net_def_adapter.cc
mace/core/net_def_adapter.cc
+2
-1
third_party/third_party.cmake
third_party/third_party.cmake
+4
-1
tools/python/transform/onnx_converter.py
tools/python/transform/onnx_converter.py
+7
-4
未找到文件。
mace/core/net_def_adapter.cc
浏览文件 @
b53a461c
...
...
@@ -347,7 +347,8 @@ MaceStatus NetDefAdapter::AdaptDevice(OpConditionContext *context,
if
(
device_type
==
target_device_type
)
{
context
->
set_device
(
target_device
);
}
else
{
LOG
(
INFO
)
<<
"Op "
<<
op_def
->
name
()
<<
" fall back to CPU"
;
LOG
(
INFO
)
<<
"Op "
<<
op_def
->
name
()
<<
"("
<<
op_def
->
type
()
<<
")"
<<
" fall back to CPU"
;
}
}
op_def
->
set_device_type
(
device_type
);
...
...
third_party/third_party.cmake
浏览文件 @
b53a461c
...
...
@@ -51,7 +51,10 @@ include(${PROJECT_SOURCE_DIR}/third_party/opencl-headers/opencl-headers.cmake)
include
(
${
PROJECT_SOURCE_DIR
}
/third_party/protobuf/protobuf.cmake
)
include
(
${
PROJECT_SOURCE_DIR
}
/third_party/tflite/tflite.cmake
)
include
(
${
PROJECT_SOURCE_DIR
}
/third_party/caffe/caffe.cmake
)
include
(
${
PROJECT_SOURCE_DIR
}
/third_party/rpcmem/rpcmem.cmake
)
if
(
MACE_ENABLE_RPCMEM
)
include
(
${
PROJECT_SOURCE_DIR
}
/third_party/rpcmem/rpcmem.cmake
)
endif
(
MACE_ENABLE_RPCMEM
)
if
(
MACE_ENABLE_HEXAGON_DSP
)
include
(
${
PROJECT_SOURCE_DIR
}
/third_party/nnlib/nnlib.cmake
)
...
...
tools/python/transform/onnx_converter.py
浏览文件 @
b53a461c
...
...
@@ -806,17 +806,20 @@ class OnnxConverter(base_converter.ConverterInterface):
def
convert_depth_space
(
self
,
node
):
op
=
self
.
convert_general_op
(
node
)
if
op
.
type
==
OnnxOpType
.
DepthToSpace
.
name
:
if
node
.
op_
type
==
OnnxOpType
.
DepthToSpace
.
name
:
op
.
type
=
MaceOp
.
DepthToSpace
.
name
else
:
op
.
type
=
MaceOp
.
SpaceToDepth
.
name
mace_check
((
'block
_
size'
in
node
.
attrs
),
"
depth to space op should have block
size attribute."
)
block_size
=
node
.
attrs
[
'block
_
size'
]
mace_check
((
'blocksize'
in
node
.
attrs
),
"
DepthToSpace/SpaceToDepth must have block
size attribute."
)
block_size
=
node
.
attrs
[
'blocksize'
]
size_arg
=
op
.
arg
.
add
()
size_arg
.
name
=
MaceKeyword
.
mace_space_depth_block_size_str
size_arg
.
i
=
block_size
if
'mode'
in
node
.
attrs
:
mace_check
(
node
.
attrs
[
'mode'
]
==
'DCR'
,
"Only supports DCR mode."
)
def
convert_dim_range
(
self
,
node
):
op
=
self
.
convert_general_op
(
node
)
op
.
type
=
MaceOp
.
Slice
.
name
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录