Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
713c05dd
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2303
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看板
未验证
提交
713c05dd
编写于
5年前
作者:
Z
Zeng Jinle
提交者:
GitHub
5年前
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refine tensor.mutable_data, test=develop (#19680)
上级
c78a4781
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
3 deletion
+16
-3
paddle/fluid/framework/tensor.cc
paddle/fluid/framework/tensor.cc
+2
-0
paddle/fluid/framework/tensor_test.cc
paddle/fluid/framework/tensor_test.cc
+14
-3
未找到文件。
paddle/fluid/framework/tensor.cc
浏览文件 @
713c05dd
...
...
@@ -51,6 +51,8 @@ void* Tensor::mutable_data(platform::Place place, proto::VarType::Type type,
/* some versions of boost::variant don't have operator!= */
if
(
holder_
==
nullptr
||
!
(
holder_
->
place
()
==
place
)
||
holder_
->
size
()
<
size
+
offset_
)
{
// Reset holder first before re-allocate to save memory
holder_
.
reset
();
holder_
=
memory
::
AllocShared
(
place
,
size
);
offset_
=
0
;
}
...
...
This diff is collapsed.
Click to expand it.
paddle/fluid/framework/tensor_test.cc
浏览文件 @
713c05dd
...
...
@@ -57,23 +57,28 @@ TEST(Tensor, MutableData) {
// initialization
p1
=
src_tensor
.
mutable_data
<
float
>
(
framework
::
make_ddim
({
1
,
2
,
3
}),
platform
::
CPUPlace
());
auto
p1_holder
=
src_tensor
.
Holder
();
EXPECT_NE
(
p1
,
nullptr
);
// set src_tensor a new dim with large size
// momery is supposed to be re-allocated
p2
=
src_tensor
.
mutable_data
<
float
>
(
framework
::
make_ddim
({
3
,
4
}),
platform
::
CPUPlace
());
EXPECT_NE
(
p2
,
nullptr
);
EXPECT_NE
(
p1
,
p2
);
auto
p2_holder1
=
src_tensor
.
Holder
();
EXPECT_NE
(
p1_holder
.
get
(),
p2_holder1
.
get
());
// set src_tensor a new dim with same size
// momery block is supposed to be unchanged
p1
=
src_tensor
.
mutable_data
<
float
>
(
framework
::
make_ddim
({
2
,
2
,
3
}),
platform
::
CPUPlace
());
EXPECT_EQ
(
p1
,
p2
);
auto
p2_holder2
=
src_tensor
.
Holder
();
EXPECT_EQ
(
p2_holder1
.
get
(),
p2_holder2
.
get
());
// set src_tensor a new dim with smaller size
// momery block is supposed to be unchanged
p2
=
src_tensor
.
mutable_data
<
float
>
(
framework
::
make_ddim
({
2
,
2
}),
platform
::
CPUPlace
());
auto
p2_holder3
=
src_tensor
.
Holder
();
EXPECT_EQ
(
p1
,
p2
);
EXPECT_EQ
(
p2_holder2
.
get
(),
p2_holder3
.
get
());
float
*
p3
=
nullptr
;
float
*
p4
=
nullptr
;
...
...
@@ -82,14 +87,18 @@ TEST(Tensor, MutableData) {
auto
*
tmp
=
src_tensor
.
mutable_data
<
uint8_t
>
(
framework
::
make_ddim
({
2
,
2
}),
platform
::
CPUPlace
());
p3
=
reinterpret_cast
<
float
*>
(
tmp
);
auto
p3_holder1
=
src_tensor
.
Holder
();
EXPECT_EQ
(
p1
,
p3
);
EXPECT_EQ
(
p2_holder3
.
get
(),
p3_holder1
.
get
());
// set src_tensor a different type but bigger size.
// memory block is supposed to be changed.
auto
*
tmp2
=
src_tensor
.
mutable_data
<
double
>
(
framework
::
make_ddim
({
2
,
2
,
3
}),
platform
::
CPUPlace
());
auto
p3_holder2
=
src_tensor
.
Holder
();
p4
=
reinterpret_cast
<
float
*>
(
tmp2
);
EXPECT_NE
(
p1
,
p4
);
EXPECT_NE
(
p3_holder1
.
get
(),
p3_holder2
.
get
());
}
// Not sure if it's desired, but currently, Tensor type can be changed.
{
...
...
@@ -113,13 +122,15 @@ TEST(Tensor, MutableData) {
// initialization
p1
=
src_tensor
.
mutable_data
<
float
>
(
framework
::
make_ddim
({
1
,
2
,
3
}),
platform
::
CUDAPlace
());
auto
p1_holder
=
src_tensor
.
Holder
();
EXPECT_NE
(
p1
,
nullptr
);
// set src_tensor a new dim with large size
// momery is supposed to be re-allocated
p2
=
src_tensor
.
mutable_data
<
float
>
(
framework
::
make_ddim
({
3
,
1024
}),
platform
::
CUDAPlace
());
auto
p2_holder
=
src_tensor
.
Holder
();
EXPECT_NE
(
p2
,
nullptr
);
EXPECT_NE
(
p1
,
p2
);
EXPECT_NE
(
p1
_holder
.
get
(),
p2_holder
.
get
()
);
// set src_tensor a new dim with same size
// momery block is supposed to be unchanged
p1
=
src_tensor
.
mutable_data
<
float
>
(
framework
::
make_ddim
({
2
,
2
,
3
}),
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部