Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
ccf0b1bb
P
Paddle
项目概览
PaddlePaddle
/
Paddle
11 个月 前同步成功
通知
2292
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ccf0b1bb
编写于
1月 05, 2017
作者:
H
hedaoyuan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add FunctionTest.cpp
上级
f3fdfd94
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
73 addition
and
51 deletion
+73
-51
paddle/function/BufferArg.cpp
paddle/function/BufferArg.cpp
+0
-12
paddle/function/BufferArgTest.cpp
paddle/function/BufferArgTest.cpp
+1
-39
paddle/function/CMakeLists.txt
paddle/function/CMakeLists.txt
+1
-0
paddle/function/Function.cpp
paddle/function/Function.cpp
+12
-0
paddle/function/FunctionTest.cpp
paddle/function/FunctionTest.cpp
+59
-0
未找到文件。
paddle/function/BufferArg.cpp
浏览文件 @
ccf0b1bb
...
...
@@ -28,16 +28,4 @@ const SparseMatrixArg& BufferArg::sparse() const {
return
dynamic_cast
<
const
SparseMatrixArg
&>
(
*
this
);
}
void
BufferArgs
::
addArg
(
const
Matrix
&
arg
,
const
TensorShape
&
shape
)
{
args_
.
push_back
(
std
::
make_shared
<
BufferArg
>
(
arg
,
shape
));
}
void
BufferArgs
::
addArg
(
const
CpuSparseMatrix
&
arg
)
{
args_
.
push_back
(
std
::
make_shared
<
SparseMatrixArg
>
(
arg
));
}
void
BufferArgs
::
addArg
(
const
GpuSparseMatrix
&
arg
)
{
args_
.
push_back
(
std
::
make_shared
<
SparseMatrixArg
>
(
arg
));
}
}
// namespace paddle
paddle/function/BufferArgTest.cpp
浏览文件 @
ccf0b1bb
...
...
@@ -14,6 +14,7 @@ limitations under the License. */
#include "BufferArg.h"
#include <gtest/gtest.h>
#include "Function.h"
#include "paddle/math/MemoryHandle.h"
namespace
paddle
{
...
...
@@ -86,43 +87,4 @@ TEST(BufferTest, asArgument) {
function
(
argments
);
}
template
<
DeviceType
DType
>
void
FunctionApi
(
typename
Tensor
<
real
,
DType
>::
Matrix
&
output
,
const
typename
Tensor
<
real
,
DType
>::
Matrix
&
input
);
template
<
>
void
FunctionApi
<
DEVICE_TYPE_CPU
>
(
CpuMatrix
&
output
,
const
CpuMatrix
&
input
)
{
EXPECT_EQ
(
output
.
getHeight
(),
100
);
EXPECT_EQ
(
output
.
getWidth
(),
200
);
}
template
<
>
void
FunctionApi
<
DEVICE_TYPE_GPU
>
(
GpuMatrix
&
output
,
const
GpuMatrix
&
input
)
{
EXPECT_EQ
(
output
.
getHeight
(),
10
);
EXPECT_EQ
(
output
.
getWidth
(),
20
);
}
template
<
DeviceType
DType
>
void
Function
(
const
BufferArgs
&
arguments
)
{
auto
input
=
arguments
[
0
].
matrix
<
DType
>
();
auto
output
=
arguments
[
1
].
matrix
<
DType
>
();
FunctionApi
<
DType
>
(
output
,
input
);
}
TEST
(
BufferTest
,
Function
)
{
CpuMatrix
cpuInput
=
CpuMatrix
(
100
,
200
);
CpuMatrix
cpuOutput
=
CpuMatrix
(
100
,
200
);
BufferArgs
cpuArgments
;
cpuArgments
.
addArg
(
cpuInput
);
cpuArgments
.
addArg
(
cpuOutput
);
Function
<
DEVICE_TYPE_CPU
>
(
cpuArgments
);
GpuMatrix
gpuInput
=
GpuMatrix
(
10
,
20
);
GpuMatrix
gpuOutput
=
GpuMatrix
(
10
,
20
);
BufferArgs
gpuArgments
;
gpuArgments
.
addArg
(
gpuInput
);
gpuArgments
.
addArg
(
gpuOutput
);
Function
<
DEVICE_TYPE_GPU
>
(
gpuArgments
);
}
}
// namespace paddle
paddle/function/CMakeLists.txt
浏览文件 @
ccf0b1bb
...
...
@@ -21,6 +21,7 @@ if(WITH_TESTING)
add_simple_unittest
(
TensorShapeTest
)
add_simple_unittest
(
TensorTypeTest
)
add_simple_unittest
(
BufferArgTest
)
add_simple_unittest
(
FunctionTest
)
# add_unittest(ContextProjectionOpTest
# ContextProjectionOpTest.cpp
# ../gserver/tests/TestUtil.cpp)
...
...
paddle/function/Function.cpp
浏览文件 @
ccf0b1bb
...
...
@@ -72,6 +72,18 @@ FuncConfig& FuncConfig::set<bool>(const std::string& key, bool v) {
return
*
this
;
}
void
BufferArgs
::
addArg
(
const
Matrix
&
arg
,
const
TensorShape
&
shape
)
{
args_
.
push_back
(
std
::
make_shared
<
BufferArg
>
(
arg
,
shape
));
}
void
BufferArgs
::
addArg
(
const
CpuSparseMatrix
&
arg
)
{
args_
.
push_back
(
std
::
make_shared
<
SparseMatrixArg
>
(
arg
));
}
void
BufferArgs
::
addArg
(
const
GpuSparseMatrix
&
arg
)
{
args_
.
push_back
(
std
::
make_shared
<
SparseMatrixArg
>
(
arg
));
}
ClassRegistrar
<
FunctionBase
>
FunctionBase
::
funcRegistrar_
;
}
// namespace paddle
paddle/function/FunctionTest.cpp
0 → 100644
浏览文件 @
ccf0b1bb
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#include "Function.h"
#include <gtest/gtest.h>
namespace
paddle
{
template
<
DeviceType
DType
>
void
FunctionApi
(
typename
Tensor
<
real
,
DType
>::
Matrix
&
output
,
const
typename
Tensor
<
real
,
DType
>::
Matrix
&
input
);
template
<
>
void
FunctionApi
<
DEVICE_TYPE_CPU
>
(
CpuMatrix
&
output
,
const
CpuMatrix
&
input
)
{
EXPECT_EQ
(
output
.
getHeight
(),
100
);
EXPECT_EQ
(
output
.
getWidth
(),
200
);
}
template
<
>
void
FunctionApi
<
DEVICE_TYPE_GPU
>
(
GpuMatrix
&
output
,
const
GpuMatrix
&
input
)
{
EXPECT_EQ
(
output
.
getHeight
(),
10
);
EXPECT_EQ
(
output
.
getWidth
(),
20
);
}
template
<
DeviceType
DType
>
void
Function
(
const
BufferArgs
&
arguments
)
{
auto
input
=
arguments
[
0
].
matrix
<
DType
>
();
auto
output
=
arguments
[
1
].
matrix
<
DType
>
();
FunctionApi
<
DType
>
(
output
,
input
);
}
TEST
(
Function
,
BufferArgs
)
{
CpuMatrix
cpuInput
=
CpuMatrix
(
100
,
200
);
CpuMatrix
cpuOutput
=
CpuMatrix
(
100
,
200
);
BufferArgs
cpuArgments
;
cpuArgments
.
addArg
(
cpuInput
);
cpuArgments
.
addArg
(
cpuOutput
);
Function
<
DEVICE_TYPE_CPU
>
(
cpuArgments
);
GpuMatrix
gpuInput
=
GpuMatrix
(
10
,
20
);
GpuMatrix
gpuOutput
=
GpuMatrix
(
10
,
20
);
BufferArgs
gpuArgments
;
gpuArgments
.
addArg
(
gpuInput
);
gpuArgments
.
addArg
(
gpuOutput
);
Function
<
DEVICE_TYPE_GPU
>
(
gpuArgments
);
}
}
// namespace paddle
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录