Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
magicwindyyd
mindspore
提交
02256e0d
M
mindspore
项目概览
magicwindyyd
/
mindspore
与 Fork 源项目一致
Fork自
MindSpore / mindspore
通知
1
Star
1
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看板
提交
02256e0d
编写于
8月 19, 2020
作者:
M
mindspore-ci-bot
提交者:
Gitee
8月 19, 2020
浏览文件
操作
浏览文件
下载
差异文件
!4729 fix caffe prelu secondly
Merge pull request !4729 from zhaodezan/master
上级
2112cb91
db1423f2
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
6 addition
and
5 deletion
+6
-5
mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.cc
mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.cc
+1
-1
mindspore/lite/src/runtime/kernel/arm/nnacl/caffeprelu.c
mindspore/lite/src/runtime/kernel/arm/nnacl/caffeprelu.c
+1
-1
mindspore/lite/test/models_caffe.cfg
mindspore/lite/test/models_caffe.cfg
+2
-2
mindspore/lite/tools/common/node_util.cc
mindspore/lite/tools/common/node_util.cc
+2
-1
未找到文件。
mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.cc
浏览文件 @
02256e0d
...
...
@@ -59,7 +59,7 @@ int CaffePReluCPUKernel::Run() {
output_data
=
reinterpret_cast
<
float
*>
(
out_tensors_
[
0
]
->
Data
());
auto
channels
=
input
->
shape
();
prelu_param_
->
negtive_slope_
=
reinterpret_cast
<
float
*>
(
input1
->
Data
());
prelu_param_
->
channel_num_
=
channels
.
at
(
1
);
prelu_param_
->
channel_num_
=
channels
.
at
(
channels
.
size
()
-
1
);
auto
ret
=
LiteBackendParallelLaunch
(
CaffePReluRun
,
this
,
prelu_param_
->
op_parameter_
.
thread_num_
);
if
(
ret
!=
RET_OK
)
{
...
...
mindspore/lite/src/runtime/kernel/arm/nnacl/caffeprelu.c
浏览文件 @
02256e0d
...
...
@@ -27,7 +27,7 @@ void CaffePRelu(float *input, float *output, CaffePReluParameter *prelu_param_,
output
[
i
]
=
input
[
i
];
}
else
{
if
(
!
prelu_param_
->
channeShared
)
{
int
temp
=
i
/
(
prelu_param_
->
input_num_
/
prelu_param_
->
channel_num_
)
;
int
temp
=
i
%
prelu_param_
->
channel_num_
;
output
[
i
]
=
input
[
i
]
*
prelu_param_
->
negtive_slope_
[
temp
];
}
else
{
output
[
i
]
=
input
[
i
]
*
prelu_param_
->
negtive_slope_
[
0
];
...
...
mindspore/lite/test/models_caffe.cfg
浏览文件 @
02256e0d
...
...
@@ -16,7 +16,7 @@ tracking
mtk_isface
mtk_landmark
mtk_pose_tuku
mtk_face_recognition_v1
#
mtk_face_recognition_v1
#mtk_2012_ATLANTA_10class_20190614_v4.1
mtk_detect-deeper-halfdeeper-mbv1-lastearlySSD-shortcut-400-400_nopostprocess_simplified
detect-deeper-halfdeeper-mbv1-shortcut-400-400_nopostprocess_simplified
...
...
@@ -34,7 +34,7 @@ ml_hardware_pose
ml_bank_recog
2012_ATLANTA_10class_20190131_v4.0
mnet
recognition
#
recognition
ml_face_landmark
model_hebing_3branch
detect-mbv1-shortcut-400-400_nopostprocess_simplified
mindspore/lite/tools/common/node_util.cc
浏览文件 @
02256e0d
...
...
@@ -28,7 +28,8 @@ static const std::vector<schema::PrimitiveType> nhwcOpList = {
schema
::
PrimitiveType_Conv2D
,
schema
::
PrimitiveType_DeConv2D
,
schema
::
PrimitiveType_DepthwiseConv2D
,
schema
::
PrimitiveType_DeDepthwiseConv2D
,
schema
::
PrimitiveType_Pooling
,
schema
::
PrimitiveType_Resize
,
schema
::
PrimitiveType_BatchNorm
,
schema
::
PrimitiveType_FusedBatchNorm
};
schema
::
PrimitiveType_BatchNorm
,
schema
::
PrimitiveType_FusedBatchNorm
,
schema
::
PrimitiveType_CaffePReLU
};
static
const
std
::
vector
<
schema
::
PrimitiveType
>
fp32FullOpList
=
{
schema
::
PrimitiveType_Concat
,
schema
::
PrimitiveType_Add
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录