Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wzpei9
Paddle
提交
9b17c3ff
P
Paddle
项目概览
wzpei9
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9b17c3ff
编写于
1月 25, 2017
作者:
X
xutianbing
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rewrite unit test using Daoyuan's new FunctionTest.
上级
877decdc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
47 addition
and
106 deletion
+47
-106
paddle/function/CosSimOp.cpp
paddle/function/CosSimOp.cpp
+7
-7
paddle/function/CosSimOpTest.cpp
paddle/function/CosSimOpTest.cpp
+24
-98
paddle/function/FunctionTest.h
paddle/function/FunctionTest.h
+16
-1
未找到文件。
paddle/function/CosSimOp.cpp
浏览文件 @
9b17c3ff
...
...
@@ -76,12 +76,12 @@ class CosSimForwardFunc : public FunctionBase {
}
void
calc
(
const
BufferArgs
&
inputs
,
const
BufferArgs
&
outputs
)
override
{
CHECK_EQ
(
inputs
.
size
(),
2
);
CHECK_EQ
(
outputs
.
size
(),
1
);
CHECK_EQ
(
inputs
.
size
(),
2
UL
);
CHECK_EQ
(
outputs
.
size
(),
1
UL
);
CHECK_EQ
(
inputs
[
0
].
shape
().
ndims
(),
(
size_t
)
2
);
CHECK_EQ
(
inputs
[
1
].
shape
().
ndims
(),
(
size_t
)
2
);
CHECK_EQ
(
outputs
[
0
].
shape
().
ndims
(),
(
size_t
)
2
);
CHECK_EQ
(
inputs
[
0
].
shape
().
ndims
(),
2UL
);
CHECK_EQ
(
inputs
[
1
].
shape
().
ndims
(),
2UL
);
CHECK_EQ
(
outputs
[
0
].
shape
().
ndims
(),
2UL
);
CHECK_EQ
(
inputs
[
0
].
shape
()[
0
],
outputs
[
0
].
shape
()[
0
]);
CHECK_EQ
(
inputs
[
0
].
shape
()[
1
],
inputs
[
1
].
shape
()[
1
]);
...
...
@@ -196,8 +196,8 @@ class CosSimBackwardFunc : public FunctionBase {
}
void
calc
(
const
BufferArgs
&
inputs
,
const
BufferArgs
&
outputs
)
override
{
CHECK_EQ
(
inputs
.
size
(),
4
);
CHECK_EQ
(
outputs
.
size
(),
2
);
CHECK_EQ
(
inputs
.
size
(),
4
UL
);
CHECK_EQ
(
outputs
.
size
(),
2
UL
);
/// dim of out_grad and out_val == 1, column vector
CHECK_EQ
(
inputs
[
0
].
shape
()[
1
],
1UL
);
CHECK_EQ
(
inputs
[
1
].
shape
()[
1
],
1UL
);
...
...
paddle/function/CosSimOpTest.cpp
浏览文件 @
9b17c3ff
...
...
@@ -22,114 +22,40 @@ void testCosSimForward(size_t height_x,
size_t
height_y
,
size_t
width
,
real
scale
)
{
FunctionCompare
compare
(
"CosSimForward"
,
FuncConfig
().
set
(
"scale"
,
scale
));
CpuMatrix
cpu_arg1
(
height_x
,
width
);
CpuMatrix
gpu_arg1
(
height_x
,
width
);
CpuMatrix
cpu_arg2
(
height_y
,
width
);
CpuMatrix
gpu_arg2
(
height_y
,
width
);
cpu_arg1
.
randomizeUniform
();
gpu_arg1
.
copyFrom
(
cpu_arg1
);
cpu_arg2
.
randomizeUniform
();
cpu_arg2
.
add
(
-
0.5
);
gpu_arg2
.
copyFrom
(
cpu_arg2
);
CpuMatrix
cpu_out
(
height_x
,
1
);
GpuMatrix
gpu_out
(
height_x
,
1
);
BufferArgs
cpu_inputs
;
BufferArgs
cpu_outputs
;
cpu_inputs
.
addArg
(
cpu_arg1
);
cpu_inputs
.
addArg
(
cpu_arg2
);
cpu_outputs
.
addArg
(
cpu_out
,
ASSIGN_TO
);
BufferArgs
gpu_inputs
;
BufferArgs
gpu_outputs
;
gpu_inputs
.
addArg
(
gpu_arg1
);
gpu_inputs
.
addArg
(
gpu_arg2
);
gpu_outputs
.
addArg
(
gpu_out
,
ASSIGN_TO
);
compare
.
getCpuFunction
()
->
calc
(
cpu_inputs
,
cpu_outputs
);
compare
.
getGpuFunction
()
->
calc
(
gpu_inputs
,
gpu_outputs
);
autotest
::
TensorCheckErr
(
cpu_out
,
gpu_out
);
}
TEST
(
Matrix
,
cosSimForward
)
{
for
(
auto
height_x
:
{
10
,
100
,
1000
})
{
for
(
auto
height_y
:
{
1
,
height_x
})
{
for
(
auto
width
:
{
10
,
100
,
1000
})
{
for
(
auto
scale
:
{
1.0
,
2.0
})
{
testCosSimForward
(
height_x
,
height_y
,
width
,
scale
);
}
}
}
}
FunctionCompare
test
(
"CosSimForward"
,
FuncConfig
().
set
(
"scale"
,
scale
));
// prepare input arguments
test
.
addInputs
(
BufferArg
(
VALUE_TYPE_FLOAT
,
TensorShape
{
height_x
,
width
}));
test
.
addInputs
(
BufferArg
(
VALUE_TYPE_FLOAT
,
TensorShape
{
height_y
,
width
}));
test
.
addOutputs
(
BufferArg
(
VALUE_TYPE_FLOAT
,
TensorShape
{
height_x
,
1
}),
ASSIGN_TO
);
// run Function
test
.
run
();
}
void
testCosSimBackward
(
size_t
height_x
,
size_t
height_y
,
size_t
width
,
real
scale
)
{
FunctionCompare
compare
(
"CosSimBackward"
,
FuncConfig
().
set
(
"scale"
,
scale
));
CpuMatrix
cpu_out_grad
(
height_x
,
1
);
CpuMatrix
cpu_out_val
(
height_x
,
1
);
CpuMatrix
cpu_in1_val
(
height_x
,
width
);
CpuMatrix
cpu_in2_val
(
height_x
,
width
);
CpuMatrix
cpu_in1_grad
(
height_x
,
width
);
CpuMatrix
cpu_in2_grad
(
height_x
,
width
);
cpu_out_grad
.
randomizeUniform
();
cpu_out_val
.
randomizeUniform
();
cpu_in1_val
.
randomizeUniform
();
cpu_in2_val
.
randomizeUniform
();
cpu_in1_grad
.
randomizeUniform
();
cpu_in2_grad
.
randomizeUniform
();
GpuMatrix
gpu_out_grad
(
height_x
,
1
);
GpuMatrix
gpu_out_val
(
height_x
,
1
);
GpuMatrix
gpu_in1_val
(
height_x
,
width
);
GpuMatrix
gpu_in2_val
(
height_x
,
width
);
GpuMatrix
gpu_in1_grad
(
height_x
,
width
);
GpuMatrix
gpu_in2_grad
(
height_x
,
width
);
gpu_out_grad
.
copyFrom
(
cpu_out_grad
);
gpu_out_val
.
copyFrom
(
cpu_out_val
);
gpu_in1_val
.
copyFrom
(
cpu_in1_val
);
gpu_in2_val
.
copyFrom
(
cpu_in2_val
);
gpu_in1_grad
.
copyFrom
(
cpu_in1_grad
);
gpu_in2_grad
.
copyFrom
(
cpu_in2_grad
);
BufferArgs
cpu_inputs
;
BufferArgs
cpu_outputs
;
cpu_inputs
.
addArg
(
cpu_out_grad
);
cpu_inputs
.
addArg
(
cpu_out_val
);
cpu_inputs
.
addArg
(
cpu_in1_val
);
cpu_inputs
.
addArg
(
cpu_in2_val
);
cpu_outputs
.
addArg
(
cpu_in1_grad
,
ADD_TO
);
cpu_outputs
.
addArg
(
cpu_in2_grad
,
ADD_TO
);
BufferArgs
gpu_inputs
;
BufferArgs
gpu_outputs
;
gpu_inputs
.
addArg
(
gpu_out_grad
);
gpu_inputs
.
addArg
(
gpu_out_val
);
gpu_inputs
.
addArg
(
gpu_in1_val
);
gpu_inputs
.
addArg
(
gpu_in2_val
);
gpu_outputs
.
addArg
(
gpu_in1_grad
,
ADD_TO
);
gpu_outputs
.
addArg
(
gpu_in2_grad
,
ADD_TO
);
compare
.
getCpuFunction
()
->
calc
(
cpu_inputs
,
cpu_outputs
);
compare
.
getGpuFunction
()
->
calc
(
gpu_inputs
,
gpu_outputs
);
autotest
::
TensorCheckErr
(
cpu_in1_grad
,
gpu_in1_grad
);
autotest
::
TensorCheckErr
(
cpu_in2_grad
,
gpu_in2_grad
);
FunctionCompare
test
(
"CosSimBackward"
,
FuncConfig
().
set
(
"scale"
,
scale
));
// prepare input arguments
test
.
addInputs
(
BufferArg
(
VALUE_TYPE_FLOAT
,
TensorShape
{
height_x
,
1
}));
test
.
addInputs
(
BufferArg
(
VALUE_TYPE_FLOAT
,
TensorShape
{
height_x
,
1
}));
test
.
addInputs
(
BufferArg
(
VALUE_TYPE_FLOAT
,
TensorShape
{
height_x
,
width
}));
test
.
addInputs
(
BufferArg
(
VALUE_TYPE_FLOAT
,
TensorShape
{
height_y
,
width
}));
test
.
addOutputs
(
BufferArg
(
VALUE_TYPE_FLOAT
,
TensorShape
{
height_x
,
width
}),
ADD_TO
);
test
.
addOutputs
(
BufferArg
(
VALUE_TYPE_FLOAT
,
TensorShape
{
height_y
,
width
}),
ADD_TO
);
// run Function
test
.
run
();
}
TEST
(
Matrix
,
cosSim
Backward
)
{
for
(
auto
height_x
:
{
1
,
10
,
1
00
})
{
TEST
(
Matrix
,
cosSim
)
{
for
(
auto
height_x
:
{
1
0
,
100
,
10
00
})
{
for
(
auto
height_y
:
{
1
,
height_x
})
{
for
(
auto
width
:
{
1
,
10
,
1
00
})
{
for
(
auto
width
:
{
1
0
,
100
,
10
00
})
{
for
(
auto
scale
:
{
1.0
,
2.0
})
{
testCosSimForward
(
height_x
,
height_y
,
width
,
scale
);
testCosSimBackward
(
height_x
,
height_y
,
width
,
scale
);
}
}
...
...
paddle/function/FunctionTest.h
浏览文件 @
9b17c3ff
...
...
@@ -157,6 +157,7 @@ public:
cpuSparse_
->
randomizeUniform
();
gpuSparse_
->
copyFrom
(
*
cpuSparse_
,
stream
);
hl_stream_synchronize
(
stream
);
void
addInputs
(
const
SequenceArg
&
input
)
{
size_t
batchSize
=
input
.
shape
()[
0
];
size_t
numSeqs
=
batchSize
/
10
+
1
;
...
...
@@ -300,6 +301,21 @@ protected:
}
void
initOutputs
()
{
for
(
size_t
i
=
0
;
i
<
cpuOutputs_
.
size
();
i
++
)
{
initArg
(
*
cpuOutputs_
[
i
]);
// TODO: Need a BufferCopy used to copy from one BufferArg to another.
CpuVector
cpuVector
(
cpuOutputs_
[
i
]
->
shape
().
getElements
(),
(
real
*
)
cpuOutputs_
[
i
]
->
data
());
GpuVector
gpuVector
(
gpuOutputs_
[
i
]
->
shape
().
getElements
(),
(
real
*
)
gpuOutputs_
[
i
]
->
data
());
gpuVector
.
copyFrom
(
cpuVector
);
}
}
void
compareOutputs
()
{
>>>>>>>
rewrite
unit
test
using
Daoyuan
'
s
new
FunctionTest
.
for
(
size_t
i
=
0
;
i
<
cpuOutputs_
.
size
();
i
++
)
{
if
(
cpuOutputs_
[
i
]
->
isSparseArg
())
{
continue
;
/// sparse matrix already init
...
...
@@ -334,7 +350,6 @@ protected:
}
protected:
<<<<<<<
HEAD
std
::
shared_ptr
<
FunctionBase
>
cpuFunc_
;
std
::
shared_ptr
<
FunctionBase
>
gpuFunc_
;
std
::
vector
<
CpuMemHandlePtr
>
cpuMemory_
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录