Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2301_77200941
mindspore
提交
a0fa047e
M
mindspore
项目概览
2301_77200941
/
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a0fa047e
编写于
8月 27, 2020
作者:
F
fuzhiye
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix resize
上级
e6112ed1
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
34 addition
and
37 deletion
+34
-37
mindspore/lite/src/runtime/kernel/arm/fp16/convolution_3x3_fp16.cc
.../lite/src/runtime/kernel/arm/fp16/convolution_3x3_fp16.cc
+3
-3
mindspore/lite/src/runtime/kernel/arm/fp16/convolution_fp16.cc
...pore/lite/src/runtime/kernel/arm/fp16/convolution_fp16.cc
+5
-5
mindspore/lite/src/runtime/kernel/arm/fp16/convolution_sw_fp16.cc
...e/lite/src/runtime/kernel/arm/fp16/convolution_sw_fp16.cc
+3
-3
mindspore/lite/src/runtime/kernel/arm/fp16/convolution_winograd_fp16.cc
.../src/runtime/kernel/arm/fp16/convolution_winograd_fp16.cc
+3
-4
mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc
mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc
+3
-3
mindspore/lite/src/runtime/kernel/arm/fp32/convolution_3x3.cc
...spore/lite/src/runtime/kernel/arm/fp32/convolution_3x3.cc
+3
-3
mindspore/lite/src/runtime/kernel/arm/fp32/convolution_slidewindow.cc
...te/src/runtime/kernel/arm/fp32/convolution_slidewindow.cc
+3
-3
mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd.cc
.../lite/src/runtime/kernel/arm/fp32/convolution_winograd.cc
+3
-4
mindspore/lite/src/runtime/kernel/arm/int8/convolution_3x3_int8.cc
.../lite/src/runtime/kernel/arm/int8/convolution_3x3_int8.cc
+5
-5
mindspore/lite/src/runtime/kernel/arm/int8/convolution_int8.cc
...pore/lite/src/runtime/kernel/arm/int8/convolution_int8.cc
+3
-4
未找到文件。
mindspore/lite/src/runtime/kernel/arm/fp16/convolution_3x3_fp16.cc
浏览文件 @
a0fa047e
...
...
@@ -142,14 +142,14 @@ void Convolution3x3FP16CPUKernel::ConfigInputOutput() {
}
int
Convolution3x3FP16CPUKernel
::
Init
()
{
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
auto
ret
=
InitWeightBias
();
if
(
ret
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"Init weight bias failed."
;
return
RET_ERROR
;
}
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
return
ReSize
();
}
...
...
mindspore/lite/src/runtime/kernel/arm/fp16/convolution_fp16.cc
浏览文件 @
a0fa047e
...
...
@@ -102,8 +102,8 @@ int ConvolutionFP16CPUKernel::InitTmpBuffer() {
return
RET_ERROR
;
}
size_t
nhwc4_input_size
=
channel_block
*
C4NUM
*
in_batch
*
conv_param_
->
input_h_
*
conv_param_
->
input_w_
*
sizeof
(
float16_t
);
size_t
nhwc4_input_size
=
channel_block
*
C4NUM
*
in_batch
*
conv_param_
->
input_h_
*
conv_param_
->
input_w_
*
sizeof
(
float16_t
);
nhwc4_input_
=
ctx_
->
allocator
->
Malloc
(
nhwc4_input_size
);
if
(
nhwc4_input_
==
nullptr
)
{
MS_LOG
(
ERROR
)
<<
"malloc nhwc4_input_ failed."
;
...
...
@@ -132,14 +132,14 @@ void ConvolutionFP16CPUKernel::ConfigInputOutput() {
}
int
ConvolutionFP16CPUKernel
::
Init
()
{
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
auto
ret
=
InitWeightBias
();
if
(
ret
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"Init weight bias failed."
;
return
RET_ERROR
;
}
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
ConfigInputOutput
();
return
ReSize
();
}
...
...
mindspore/lite/src/runtime/kernel/arm/fp16/convolution_sw_fp16.cc
浏览文件 @
a0fa047e
...
...
@@ -126,14 +126,14 @@ void ConvolutionSWFP16CPUKernel::ConfigInputOutput() {
}
int
ConvolutionSWFP16CPUKernel
::
Init
()
{
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
auto
ret
=
InitWeightBias
();
if
(
ret
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"Init weight bias failed."
;
return
RET_ERROR
;
}
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
ConfigInputOutput
();
return
ReSize
();
}
...
...
mindspore/lite/src/runtime/kernel/arm/fp16/convolution_winograd_fp16.cc
浏览文件 @
a0fa047e
...
...
@@ -277,19 +277,18 @@ int ConvolutionWinogradFP16CPUKernel::ConfigInputOutput() {
}
int
ConvolutionWinogradFP16CPUKernel
::
Init
()
{
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
kernel_unit_
=
conv_param_
->
kernel_h_
;
input_unit_
=
output_unit_
+
kernel_unit_
-
1
;
conv_param_
->
input_unit_
=
input_unit_
;
conv_param_
->
output_unit_
=
output_unit_
;
auto
ret
=
InitWeightBias
();
if
(
ret
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"Init weight bias failed."
;
return
RET_ERROR
;
}
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
return
ReSize
();
}
...
...
mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc
浏览文件 @
a0fa047e
...
...
@@ -125,14 +125,14 @@ void ConvolutionCPUKernel::ConfigInputOutput() {
}
int
ConvolutionCPUKernel
::
Init
()
{
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
auto
ret
=
InitWeightBias
();
if
(
ret
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"Init weight bias failed."
;
return
RET_ERROR
;
}
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
ConfigInputOutput
();
return
ReSize
();
}
...
...
mindspore/lite/src/runtime/kernel/arm/fp32/convolution_3x3.cc
浏览文件 @
a0fa047e
...
...
@@ -155,14 +155,14 @@ void Convolution3x3CPUKernel::ConfigInputOutput() {
}
int
Convolution3x3CPUKernel
::
Init
()
{
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
auto
ret
=
InitWeightBias
();
if
(
ret
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"Init weight bias failed.ret: "
<<
ret
;
return
RET_ERROR
;
}
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
ConfigInputOutput
();
return
ReSize
();
}
...
...
mindspore/lite/src/runtime/kernel/arm/fp32/convolution_slidewindow.cc
浏览文件 @
a0fa047e
...
...
@@ -96,14 +96,14 @@ void ConvolutionSWCPUKernel::ConfigInputOutput() {
}
int
ConvolutionSWCPUKernel
::
Init
()
{
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
auto
ret
=
InitWeightBias
();
if
(
ret
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"Init weight bias failed."
;
return
RET_ERROR
;
}
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
// config input output
ConfigInputOutput
();
return
ReSize
();
...
...
mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd.cc
浏览文件 @
a0fa047e
...
...
@@ -270,19 +270,18 @@ int ConvolutionWinogradCPUKernel::ConfigInputOutput() {
}
int
ConvolutionWinogradCPUKernel
::
Init
()
{
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
kernel_unit_
=
conv_param_
->
kernel_h_
;
input_unit_
=
output_unit_
+
kernel_unit_
-
1
;
conv_param_
->
input_unit_
=
input_unit_
;
conv_param_
->
output_unit_
=
output_unit_
;
auto
ret
=
InitWeightBias
();
if
(
ret
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"Init weight bias failed."
;
return
RET_ERROR
;
}
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
return
ReSize
();
}
...
...
mindspore/lite/src/runtime/kernel/arm/int8/convolution_3x3_int8.cc
浏览文件 @
a0fa047e
...
...
@@ -154,9 +154,8 @@ void Convolution3x3Int8CPUKernel::ConfigInputOutput() {
}
int
Convolution3x3Int8CPUKernel
::
Init
()
{
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
// config input output
ConfigInputOutput
();
auto
ret
=
SetQuantParam
();
if
(
ret
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"Set quant param failed."
;
...
...
@@ -167,8 +166,9 @@ int Convolution3x3Int8CPUKernel::Init() {
MS_LOG
(
ERROR
)
<<
"Init weight bias failed."
;
return
RET_ERROR
;
}
// config input output
ConfigInputOutput
();
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
return
ReSize
();
}
...
...
mindspore/lite/src/runtime/kernel/arm/int8/convolution_int8.cc
浏览文件 @
a0fa047e
...
...
@@ -247,9 +247,6 @@ void ConvolutionInt8CPUKernel::ConfigInputOutput() {
}
int
ConvolutionInt8CPUKernel
::
Init
()
{
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
// config input output
ConfigInputOutput
();
CheckSupportOptimize
();
...
...
@@ -273,7 +270,9 @@ int ConvolutionInt8CPUKernel::Init() {
return
RET_ERROR
;
}
}
if
(
!
InferShapeDone
())
{
return
RET_OK
;
}
return
ReSize
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录