Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
TonyTonyFun
Paddle
提交
460320a4
P
Paddle
项目概览
TonyTonyFun
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
460320a4
编写于
10月 30, 2016
作者:
L
liaogang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix type unmatch on gcc
上级
fd4eeaf5
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
16 deletion
+18
-16
paddle/math/Matrix.cpp
paddle/math/Matrix.cpp
+18
-16
未找到文件。
paddle/math/Matrix.cpp
浏览文件 @
460320a4
...
...
@@ -3786,6 +3786,7 @@ void CpuMatrix::bilinearForward(const Matrix& in,
size_t
outputH
=
getHeight
();
size_t
inputW
=
in
.
getWidth
();
size_t
inputH
=
in
.
getHeight
();
(
void
)(
inputH
);
real
*
outData
=
getData
();
const
real
*
inData
=
in
.
getData
();
...
...
@@ -3798,20 +3799,20 @@ void CpuMatrix::bilinearForward(const Matrix& in,
if
(
inImgH
==
outImgH
&&
inImgW
==
outImgW
)
{
this
->
copyFrom
(
in
);
}
else
{
for
(
in
t
k
=
0
;
k
<
outputH
;
++
k
)
{
// loop for batches
for
(
in
t
i
=
0
;
i
<
outImgH
;
++
i
)
{
// loop for images
in
t
h
=
ratioH
*
i
;
in
t
hid
=
(
h
<
inImgH
-
1
)
?
1
:
0
;
for
(
size_
t
k
=
0
;
k
<
outputH
;
++
k
)
{
// loop for batches
for
(
size_
t
i
=
0
;
i
<
outImgH
;
++
i
)
{
// loop for images
size_
t
h
=
ratioH
*
i
;
size_
t
hid
=
(
h
<
inImgH
-
1
)
?
1
:
0
;
real
hlambda
=
ratioH
*
i
-
h
;
for
(
in
t
j
=
0
;
j
<
outImgW
;
++
j
)
{
in
t
w
=
ratioW
*
j
;
in
t
wid
=
(
w
<
inImgW
-
1
)
?
1
:
0
;
for
(
size_
t
j
=
0
;
j
<
outImgW
;
++
j
)
{
size_
t
w
=
ratioW
*
j
;
size_
t
wid
=
(
w
<
inImgW
-
1
)
?
1
:
0
;
real
wlambda
=
ratioW
*
j
-
w
;
// calculate four position for bilinear interpolation
const
real
*
inPos
=
&
inData
[
k
*
inputW
+
h
*
inImgW
+
w
];
real
*
outPos
=
&
outData
[
k
*
outputW
+
i
*
outImgW
+
j
];
for
(
in
t
c
=
0
;
c
<
numChannels
;
++
c
)
{
// loop for channels
for
(
size_
t
c
=
0
;
c
<
numChannels
;
++
c
)
{
// loop for channels
// bilinear interpolation
outPos
[
0
]
=
(
1.
f
-
hlambda
)
*
((
1.
f
-
wlambda
)
*
inPos
[
0
]
+
wlambda
*
inPos
[
wid
])
+
...
...
@@ -3838,6 +3839,7 @@ void CpuMatrix::bilinearBackward(const Matrix& out,
size_t
inputH
=
getHeight
();
size_t
outputW
=
out
.
getWidth
();
size_t
outputH
=
out
.
getHeight
();
(
void
)(
inputH
);
real
*
inGrad
=
getData
();
const
real
*
outGrad
=
out
.
getData
();
...
...
@@ -3850,20 +3852,20 @@ void CpuMatrix::bilinearBackward(const Matrix& out,
if
(
inImgH
==
outImgH
&&
inImgW
==
outImgW
)
{
this
->
copyFrom
(
out
);
}
else
{
for
(
in
t
k
=
0
;
k
<
outputH
;
++
k
)
{
// loop for batches
for
(
in
t
i
=
0
;
i
<
outImgH
;
++
i
)
{
// loop for images
in
t
h
=
ratioH
*
i
;
in
t
hid
=
(
h
<
inImgH
-
1
)
?
1
:
0
;
for
(
size_
t
k
=
0
;
k
<
outputH
;
++
k
)
{
// loop for batches
for
(
size_
t
i
=
0
;
i
<
outImgH
;
++
i
)
{
// loop for images
size_
t
h
=
ratioH
*
i
;
size_
t
hid
=
(
h
<
inImgH
-
1
)
?
1
:
0
;
real
hlambda
=
ratioH
*
i
-
h
;
for
(
in
t
j
=
0
;
j
<
outImgW
;
++
j
)
{
in
t
w
=
ratioW
*
j
;
in
t
wid
=
(
w
<
inImgW
-
1
)
?
1
:
0
;
for
(
size_
t
j
=
0
;
j
<
outImgW
;
++
j
)
{
size_
t
w
=
ratioW
*
j
;
size_
t
wid
=
(
w
<
inImgW
-
1
)
?
1
:
0
;
real
wlambda
=
ratioW
*
j
-
w
;
real
*
inPos
=
&
inGrad
[
k
*
inputW
+
h
*
inImgW
+
w
];
const
real
*
outPos
=
&
outGrad
[
k
*
outputW
+
i
*
outImgW
+
j
];
for
(
in
t
c
=
0
;
c
<
numChannels
;
++
c
)
{
// loop for channels
for
(
size_
t
c
=
0
;
c
<
numChannels
;
++
c
)
{
// loop for channels
inPos
[
0
]
+=
(
1.
f
-
hlambda
)
*
(
1.
f
-
wlambda
)
*
outPos
[
0
];
inPos
[
wid
]
+=
(
1.
f
-
hlambda
)
*
wlambda
*
outPos
[
0
];
inPos
[
hid
*
inImgW
]
+=
hlambda
*
(
1.
f
-
wlambda
)
*
outPos
[
0
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录