Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wmsofts
Paddle
提交
1a968b4f
P
Paddle
项目概览
wmsofts
/
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,发现更多精彩内容 >>
提交
1a968b4f
编写于
7月 10, 2017
作者:
Q
qijun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
init
上级
1038bc46
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
124 addition
and
4 deletion
+124
-4
paddle/framework/ddim.h
paddle/framework/ddim.h
+10
-0
paddle/framework/tensor.h
paddle/framework/tensor.h
+23
-4
paddle/framework/tensor_types.h
paddle/framework/tensor_types.h
+91
-0
未找到文件。
paddle/framework/ddim.h
浏览文件 @
1a968b4f
...
...
@@ -6,6 +6,7 @@
#include <vector>
#include "paddle/framework/dim.h"
#include "unsupported/Eigen/CXX11/Tensor"
namespace
paddle
{
namespace
framework
{
...
...
@@ -91,6 +92,15 @@ int arity(const DDim& ddim);
std
::
ostream
&
operator
<<
(
std
::
ostream
&
,
const
DDim
&
);
template
<
int
NDIMS
>
Eigen
::
DSizes
<
Eigen
::
DenseIndex
,
NDIMS
>
ToEigenDSizes
(
DDim
dims
)
const
{
Eigen
::
DSizes
<
Eigen
::
DenseIndex
,
NDIMS
>
dsizes
;
for
(
int
d
=
0
;
d
<
paddle
::
framework
::
arity
(
dims
);
d
++
)
{
dsizes
[
d
]
=
dims
[
d
];
}
return
dsizes
;
}
}
// namespace framework
}
// namespace paddle
...
...
paddle/framework/tensor.h
浏览文件 @
1a968b4f
...
...
@@ -18,8 +18,10 @@ limitations under the License. */
#include <type_traits>
#include "paddle/framework/ddim.h"
#include "paddle/framework/enforce.h"
#include "paddle/framework/tensor_types.h"
#include "paddle/memory/memory.h"
#include "paddle/platform/place.h"
#include "unsupported/Eigen/CXX11/Tensor"
namespace
paddle
{
namespace
framework
{
...
...
@@ -33,6 +35,13 @@ class Tensor {
return
static_cast
<
const
T
*>
(
holder_
->
Ptr
());
}
template
<
typename
T
>
T
*
data
()
const
{
PADDLE_ENFORCE
(
holder_
!=
nullptr
,
"Tensor::data must be called after Tensor::mutable_data."
);
return
static_cast
<
T
*>
(
holder_
->
Ptr
());
}
template
<
typename
T
,
// must be POD types
typename
std
::
enable_if
<
std
::
is_pod
<
T
>
::
value
>::
type
*
=
nullptr
>
T
*
mutable_data
(
DDim
dims
,
paddle
::
platform
::
Place
place
)
{
...
...
@@ -41,14 +50,23 @@ class Tensor {
place
)
/* some versions of boost::variant don't have operator!= */
||
holder_
->
Size
()
<
product
(
dims
)
*
sizeof
(
T
))
{
holder_
.
reset
(
new
PlaceholderImpl
<
T
>
(
place
,
product
(
dims
)
*
sizeof
(
T
)));
dims_
=
dims
;
}
return
static_cast
<
T
*>
(
holder_
->
Ptr
());
}
template
<
typename
T
,
// must be POD types
typename
std
::
enable_if
<
std
::
is_pod
<
T
>
::
value
>::
type
*
=
nullptr
>
T
*
mutable_data
(
DDim
dims
)
{
return
mutable_data
<
T
>
(
dims
,
paddle
::
platform
::
get_place
());
DDim
dim
()
const
{
return
dims_
;
}
template
<
typename
T
,
size_t
NDIMS
>
typename
TTypes
<
T
,
NDIMS
>::
ConstantTensor
Tensor
::
tensor
()
{
return
typename
TTypes
<
T
,
NDIMS
>::
Tensor
(
data
<
T
>
(),
paddle
::
framework
::
ToEigenDSizes
<
NDIMS
>
(
dims_
));
}
template
<
typename
T
,
size_t
NDIMS
>
typename
TTypes
<
T
,
NDIMS
>::
Tensor
Tensor
::
tensor
()
{
return
typename
TTypes
<
T
,
NDIMS
>::
Tensor
(
data
<
T
>
(),
paddle
::
framework
::
ToEigenDSizes
<
NDIMS
>
(
dims_
));
}
private:
...
...
@@ -92,6 +110,7 @@ class Tensor {
};
std
::
shared_ptr
<
Placeholder
>
holder_
;
// holds the memory block if allocated.
DDim
dims_
;
};
}
// namespace framework
...
...
paddle/framework/tensor_types.h
0 → 100644
浏览文件 @
1a968b4f
#pragma once
#include "unsupported/Eigen/CXX11/Tensor"
namespace
paddle
{
namespace
framework
{
// Helper to define Tensor types given that the scalar is of type T.
template
<
typename
T
,
int
NDIMS
=
1
,
typename
IndexType
=
Eigen
::
DenseIndex
>
struct
TTypes
{
// Rank-<NDIMS> tensor of scalar type T.
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
T
,
NDIMS
,
Eigen
::
RowMajor
,
IndexType
>
,
Eigen
::
Aligned
>
Tensor
;
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
const
T
,
NDIMS
,
Eigen
::
RowMajor
,
IndexType
>
,
Eigen
::
Aligned
>
ConstTensor
;
// Unaligned Rank-<NDIMS> tensor of scalar type T.
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
T
,
NDIMS
,
Eigen
::
RowMajor
,
IndexType
>>
UnalignedTensor
;
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
const
T
,
NDIMS
,
Eigen
::
RowMajor
,
IndexType
>>
UnalignedConstTensor
;
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
T
,
NDIMS
,
Eigen
::
RowMajor
,
int
>
,
Eigen
::
Aligned
>
Tensor32Bit
;
// Scalar tensor (implemented as a rank-0 tensor) of scalar type T.
typedef
Eigen
::
TensorMap
<
Eigen
::
TensorFixedSize
<
T
,
Eigen
::
Sizes
<>
,
Eigen
::
RowMajor
,
IndexType
>
,
Eigen
::
Aligned
>
Scalar
;
typedef
Eigen
::
TensorMap
<
Eigen
::
TensorFixedSize
<
const
T
,
Eigen
::
Sizes
<>
,
Eigen
::
RowMajor
,
IndexType
>
,
Eigen
::
Aligned
>
ConstScalar
;
// Unaligned Scalar tensor of scalar type T.
typedef
Eigen
::
TensorMap
<
Eigen
::
TensorFixedSize
<
T
,
Eigen
::
Sizes
<>
,
Eigen
::
RowMajor
,
IndexType
>>
UnalignedScalar
;
typedef
Eigen
::
TensorMap
<
Eigen
::
TensorFixedSize
<
const
T
,
Eigen
::
Sizes
<>
,
Eigen
::
RowMajor
,
IndexType
>>
UnalignedConstScalar
;
// Rank-1 tensor (vector) of scalar type T.
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
T
,
1
,
Eigen
::
RowMajor
,
IndexType
>
,
Eigen
::
Aligned
>
Flat
;
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
const
T
,
1
,
Eigen
::
RowMajor
,
IndexType
>
,
Eigen
::
Aligned
>
ConstFlat
;
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
T
,
1
,
Eigen
::
RowMajor
,
IndexType
>
,
Eigen
::
Aligned
>
Vec
;
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
const
T
,
1
,
Eigen
::
RowMajor
,
IndexType
>
,
Eigen
::
Aligned
>
ConstVec
;
// Unaligned Rank-1 tensor (vector) of scalar type T.
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
T
,
1
,
Eigen
::
RowMajor
,
IndexType
>>
UnalignedFlat
;
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
const
T
,
1
,
Eigen
::
RowMajor
,
IndexType
>>
UnalignedConstFlat
;
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
T
,
1
,
Eigen
::
RowMajor
,
IndexType
>>
UnalignedVec
;
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
const
T
,
1
,
Eigen
::
RowMajor
,
IndexType
>>
UnalignedConstVec
;
// Rank-2 tensor (matrix) of scalar type T.
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
T
,
2
,
Eigen
::
RowMajor
,
IndexType
>
,
Eigen
::
Aligned
>
Matrix
;
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
const
T
,
2
,
Eigen
::
RowMajor
,
IndexType
>
,
Eigen
::
Aligned
>
ConstMatrix
;
// Unaligned Rank-2 tensor (matrix) of scalar type T.
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
T
,
2
,
Eigen
::
RowMajor
,
IndexType
>>
UnalignedMatrix
;
typedef
Eigen
::
TensorMap
<
Eigen
::
Tensor
<
const
T
,
2
,
Eigen
::
RowMajor
,
IndexType
>>
UnalignedConstMatrix
;
};
}
// namespace framework
}
// namespace paddle
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录