Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
慢慢CG
Mace
提交
c2a318bf
Mace
项目概览
慢慢CG
/
Mace
与 Fork 源项目一致
Fork自
Xiaomi / Mace
通知
1
Star
0
Fork
0
代码
文件
提交
分支
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看板
提交
c2a318bf
编写于
9月 04, 2018
作者:
L
liuqi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix the bug: convert image_to_buffer dtype from float to half.
上级
02837b81
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
7 addition
and
4 deletion
+7
-4
mace/core/net.cc
mace/core/net.cc
+0
-2
mace/core/operator.cc
mace/core/operator.cc
+2
-0
mace/kernels/opencl/cl/common.h
mace/kernels/opencl/cl/common.h
+1
-1
mace/python/tools/converter_tool/transformer.py
mace/python/tools/converter_tool/transformer.py
+4
-1
未找到文件。
mace/core/net.cc
浏览文件 @
c2a318bf
...
@@ -48,8 +48,6 @@ SerialNet::SerialNet(
...
@@ -48,8 +48,6 @@ SerialNet::SerialNet(
ProtoArgHelper
::
GetOptionalArg
<
OperatorDef
,
int
>
(
ProtoArgHelper
::
GetOptionalArg
<
OperatorDef
,
int
>
(
operator_def
,
"device"
,
static_cast
<
int
>
(
device_type_
));
operator_def
,
"device"
,
static_cast
<
int
>
(
device_type_
));
if
(
op_device
==
type
)
{
if
(
op_device
==
type
)
{
VLOG
(
3
)
<<
"Creating operator "
<<
operator_def
.
name
()
<<
"("
<<
operator_def
.
type
()
<<
")"
;
OperatorDef
temp_def
(
operator_def
);
OperatorDef
temp_def
(
operator_def
);
std
::
unique_ptr
<
OperatorBase
>
op
(
std
::
unique_ptr
<
OperatorBase
>
op
(
op_registry
->
CreateOperator
(
temp_def
,
ws
,
type
,
mode
));
op_registry
->
CreateOperator
(
temp_def
,
ws
,
type
,
mode
));
...
...
mace/core/operator.cc
浏览文件 @
c2a318bf
...
@@ -62,6 +62,8 @@ std::unique_ptr<OperatorBase> OperatorRegistryBase::CreateOperator(
...
@@ -62,6 +62,8 @@ std::unique_ptr<OperatorBase> OperatorRegistryBase::CreateOperator(
const
int
op_mode_i
=
ProtoArgHelper
::
GetOptionalArg
<
OperatorDef
,
int
>
(
const
int
op_mode_i
=
ProtoArgHelper
::
GetOptionalArg
<
OperatorDef
,
int
>
(
operator_def
,
"mode"
,
static_cast
<
int
>
(
NetMode
::
NORMAL
));
operator_def
,
"mode"
,
static_cast
<
int
>
(
NetMode
::
NORMAL
));
const
NetMode
op_mode
=
static_cast
<
NetMode
>
(
op_mode_i
);
const
NetMode
op_mode
=
static_cast
<
NetMode
>
(
op_mode_i
);
VLOG
(
3
)
<<
"Creating operator "
<<
operator_def
.
name
()
<<
"("
<<
operator_def
.
type
()
<<
"<"
<<
dtype
<<
">"
<<
")"
;
if
(
op_mode
==
mode
)
{
if
(
op_mode
==
mode
)
{
return
registry_
.
Create
(
return
registry_
.
Create
(
OpKeyBuilder
(
operator_def
.
type
().
data
())
OpKeyBuilder
(
operator_def
.
type
().
data
())
...
...
mace/kernels/opencl/cl/common.h
浏览文件 @
c2a318bf
...
@@ -63,7 +63,7 @@ __constant sampler_t SAMPLER =
...
@@ -63,7 +63,7 @@ __constant sampler_t SAMPLER =
inline
float4
do_sigmoid
(
float4
in
)
{
inline
float4
do_sigmoid
(
float4
in
)
{
// native_func not support half
// native_func not support half
return
native_recip
(
1
.
0
+
native_exp
(
-
in
));
return
native_recip
(
1
.
0
f
+
native_exp
(
-
in
));
}
}
inline
DATA_TYPE4
do_activation
(
DATA_TYPE4
in
,
inline
DATA_TYPE4
do_activation
(
DATA_TYPE4
in
,
...
...
mace/python/tools/converter_tool/transformer.py
浏览文件 @
c2a318bf
...
@@ -104,6 +104,7 @@ class Transformer(base_converter.ConverterInterface):
...
@@ -104,6 +104,7 @@ class Transformer(base_converter.ConverterInterface):
self
.
_target_data_format
=
DataFormat
.
NHWC
self
.
_target_data_format
=
DataFormat
.
NHWC
self
.
_input_output_added
=
False
self
.
_input_output_added
=
False
self
.
_opencl_max_image_size
=
[
0
,
0
]
self
.
_opencl_max_image_size
=
[
0
,
0
]
self
.
_output_op_names
=
set
()
self
.
_quantize_activation_info
=
{}
self
.
_quantize_activation_info
=
{}
self
.
_quantized_tensor
=
set
()
self
.
_quantized_tensor
=
set
()
...
@@ -1388,6 +1389,7 @@ class Transformer(base_converter.ConverterInterface):
...
@@ -1388,6 +1389,7 @@ class Transformer(base_converter.ConverterInterface):
ConverterUtil
.
add_data_type_arg
(
op_def
,
mace_pb2
.
DT_FLOAT
)
ConverterUtil
.
add_data_type_arg
(
op_def
,
mace_pb2
.
DT_FLOAT
)
ConverterUtil
.
add_data_format_arg
(
op_def
,
DataFormat
.
NHWC
)
ConverterUtil
.
add_data_format_arg
(
op_def
,
DataFormat
.
NHWC
)
self
.
_output_op_names
.
add
(
op_def
.
name
)
self
.
_input_output_added
=
True
self
.
_input_output_added
=
True
...
@@ -1525,7 +1527,8 @@ class Transformer(base_converter.ConverterInterface):
...
@@ -1525,7 +1527,8 @@ class Transformer(base_converter.ConverterInterface):
data_type_arg
.
name
=
MaceKeyword
.
mace_op_data_type_str
data_type_arg
.
name
=
MaceKeyword
.
mace_op_data_type_str
data_type_arg
.
i
=
self
.
_option
.
data_type
data_type_arg
.
i
=
self
.
_option
.
data_type
elif
data_type_arg
.
i
!=
self
.
_option
.
data_type
\
elif
data_type_arg
.
i
!=
self
.
_option
.
data_type
\
and
data_type_arg
.
i
==
mace_pb2
.
DT_FLOAT
:
and
data_type_arg
.
i
==
mace_pb2
.
DT_FLOAT
\
and
op
.
name
not
in
self
.
_output_op_names
:
data_type_arg
.
i
=
self
.
_option
.
data_type
data_type_arg
.
i
=
self
.
_option
.
data_type
return
False
return
False
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录