Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
1bd1056f
P
Paddle
项目概览
BaiXuePrincess
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
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看板
提交
1bd1056f
编写于
9月 23, 2020
作者:
myq406450149
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
format fix. test=develop
上级
7432c040
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
18 addition
and
14 deletion
+18
-14
paddle/fluid/operators/array_to_lod_tensor_op.cc
paddle/fluid/operators/array_to_lod_tensor_op.cc
+15
-11
paddle/fluid/operators/lod_tensor_to_array_op.cc
paddle/fluid/operators/lod_tensor_to_array_op.cc
+3
-3
未找到文件。
paddle/fluid/operators/array_to_lod_tensor_op.cc
浏览文件 @
1bd1056f
...
@@ -49,7 +49,7 @@ struct ArrayToLoDFunctor : public boost::static_visitor<void> {
...
@@ -49,7 +49,7 @@ struct ArrayToLoDFunctor : public boost::static_visitor<void> {
Apply
(
static_cast
<
platform
::
CUDADeviceContext
*>
(
pool
.
Get
(
place
)));
Apply
(
static_cast
<
platform
::
CUDADeviceContext
*>
(
pool
.
Get
(
place
)));
#else
#else
PADDLE_THROW
(
PADDLE_THROW
(
platform
::
errors
::
Unavailable
(
"
Fluid
is not compiled with CUDA"
));
platform
::
errors
::
Unavailable
(
"
Paddle
is not compiled with CUDA"
));
#endif
#endif
}
}
}
}
...
@@ -106,20 +106,23 @@ class ArrayToLoDTensorOp : public framework::OperatorBase {
...
@@ -106,20 +106,23 @@ class ArrayToLoDTensorOp : public framework::OperatorBase {
ins_i_dims
,
ins_dims
,
ins_i_dims
,
ins_dims
,
platform
::
errors
::
InvalidArgument
(
platform
::
errors
::
InvalidArgument
(
"The dimension of the %zu'th element in LoDTensorArray "
"The dimension of the %zu'th element in LoDTensorArray "
"differs from previous ones."
,
"differs from previous ones."
i
));
"The current dimension is %d, and the previous dimesion is %d."
,
i
,
ins_i_dims
,
ins_dims
));
PADDLE_ENFORCE_EQ
(
PADDLE_ENFORCE_EQ
(
x
[
i
].
place
(),
place
,
x
[
i
].
place
(),
place
,
platform
::
errors
::
InvalidArgument
(
platform
::
errors
::
InvalidArgument
(
"The place class of the %zu'th element in LoDTensorArray "
"The place class of the %zu'th element in LoDTensorArray "
"differs from previous ones."
,
"differs from previous ones."
i
));
"The current place is %d, and the previous place is %d."
,
i
,
x
[
i
].
place
(),
place
));
PADDLE_ENFORCE_EQ
(
PADDLE_ENFORCE_EQ
(
x
[
i
].
type
(),
data_type
,
x
[
i
].
type
(),
data_type
,
platform
::
errors
::
InvalidArgument
(
platform
::
errors
::
InvalidArgument
(
"The date type of the %zu'th element in LoDTensorArray "
"The date type of the %zu'th element in LoDTensorArray "
"differs from previous ones."
,
"differs from previous ones."
i
));
"The current data type is %d, and the previous data type is %d."
,
i
,
x
[
i
].
type
(),
data_type
));
batch_size
+=
x
[
i
].
dims
()[
0
];
batch_size
+=
x
[
i
].
dims
()[
0
];
}
}
auto
ins_dim_vec
=
framework
::
vectorize
(
ins_dims
);
auto
ins_dim_vec
=
framework
::
vectorize
(
ins_dims
);
...
@@ -150,7 +153,7 @@ class ArrayToLoDTensorOp : public framework::OperatorBase {
...
@@ -150,7 +153,7 @@ class ArrayToLoDTensorOp : public framework::OperatorBase {
PADDLE_ENFORCE_LE
(
table_items
[
idx
].
length
,
x
.
size
(),
PADDLE_ENFORCE_LE
(
table_items
[
idx
].
length
,
x
.
size
(),
platform
::
errors
::
InvalidArgument
(
platform
::
errors
::
InvalidArgument
(
"The RankTable items length should less than or "
"The RankTable items length should less than or "
"equal Input(X) size,"
"equal
to
Input(X) size,"
"but receive TankTable items length is %d , longer "
"but receive TankTable items length is %d , longer "
"than Input(X) size %d."
,
"than Input(X) size %d."
,
table_items
[
idx
].
length
,
x
.
size
()));
table_items
[
idx
].
length
,
x
.
size
()));
...
@@ -169,7 +172,8 @@ class ArrayToLoDTensorOp : public framework::OperatorBase {
...
@@ -169,7 +172,8 @@ class ArrayToLoDTensorOp : public framework::OperatorBase {
PADDLE_ENFORCE_GE
(
PADDLE_ENFORCE_GE
(
end_offset
,
start_offset
,
end_offset
,
start_offset
,
platform
::
errors
::
InvalidArgument
(
platform
::
errors
::
InvalidArgument
(
"The lod data start offset should smaller or equal end offset,"
"The lod data start offset should smaller or equal to the end "
"offset,"
"but the start offset is %d, larger than end offset %d."
,
"but the start offset is %d, larger than end offset %d."
,
start_offset
,
end_offset
));
start_offset
,
end_offset
));
size_t
len
=
end_offset
-
start_offset
;
size_t
len
=
end_offset
-
start_offset
;
...
@@ -210,10 +214,10 @@ class ArrayToLoDTensorInferShape : public framework::InferShapeBase {
...
@@ -210,10 +214,10 @@ class ArrayToLoDTensorInferShape : public framework::InferShapeBase {
void
operator
()(
framework
::
InferShapeContext
*
context
)
const
override
{
void
operator
()(
framework
::
InferShapeContext
*
context
)
const
override
{
PADDLE_ENFORCE_EQ
(
PADDLE_ENFORCE_EQ
(
context
->
HasInput
(
"X"
),
true
,
context
->
HasInput
(
"X"
),
true
,
platform
::
errors
::
NotFound
(
"Input(X) of BmmOp should not be null"
));
platform
::
errors
::
NotFound
(
"Input(X) of BmmOp should not be null
.
"
));
PADDLE_ENFORCE_EQ
(
context
->
HasInput
(
"RankTable"
),
true
,
PADDLE_ENFORCE_EQ
(
context
->
HasInput
(
"RankTable"
),
true
,
platform
::
errors
::
NotFound
(
platform
::
errors
::
NotFound
(
"Input(RankTable) of BmmOp should not be null"
));
"Input(RankTable) of BmmOp should not be null
.
"
));
// For compile-time, the first dim of input X and output Out should be -1.
// For compile-time, the first dim of input X and output Out should be -1.
// For runtime, the first dim of output Out should be the sum of all
// For runtime, the first dim of output Out should be the sum of all
// elements's first dim in input X. The output's dims will be re-computed in
// elements's first dim in input X. The output's dims will be re-computed in
...
...
paddle/fluid/operators/lod_tensor_to_array_op.cc
浏览文件 @
1bd1056f
...
@@ -62,7 +62,7 @@ struct LoDTensorToArrayFunctor : public boost::static_visitor<void> {
...
@@ -62,7 +62,7 @@ struct LoDTensorToArrayFunctor : public boost::static_visitor<void> {
Apply
(
static_cast
<
platform
::
CUDADeviceContext
*>
(
dev_ctx
));
Apply
(
static_cast
<
platform
::
CUDADeviceContext
*>
(
dev_ctx
));
#else
#else
PADDLE_THROW
(
PADDLE_THROW
(
platform
::
errors
::
Unavailable
(
"
Fluid
is not compiled with CUDA"
));
platform
::
errors
::
Unavailable
(
"
Place
is not compiled with CUDA"
));
#endif
#endif
}
}
}
}
...
@@ -112,8 +112,8 @@ class LoDTensorToArrayOp : public framework::OperatorBase {
...
@@ -112,8 +112,8 @@ class LoDTensorToArrayOp : public framework::OperatorBase {
rank_level
,
x
.
lod
().
size
(),
rank_level
,
x
.
lod
().
size
(),
platform
::
errors
::
InvalidArgument
(
platform
::
errors
::
InvalidArgument
(
"Input should be a LoDTensor, and its lod_level should be at "
"Input should be a LoDTensor, and its lod_level should be at "
"least %d"
,
"least %d
, but given is %d.
"
,
rank_level
+
1
));
rank_level
+
1
,
x
.
lod
().
size
()
));
out
.
resize
(
max_seq_len
);
out
.
resize
(
max_seq_len
);
std
::
vector
<
std
::
vector
<
CopyRange
>>
copy_ranges
(
max_seq_len
);
std
::
vector
<
std
::
vector
<
CopyRange
>>
copy_ranges
(
max_seq_len
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录