Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
s920243400
PaddleDetection
提交
2328bee1
P
PaddleDetection
项目概览
s920243400
/
PaddleDetection
与 Fork 源项目一致
Fork自
PaddlePaddle / PaddleDetection
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
2328bee1
编写于
12月 13, 2018
作者:
S
sneaxiy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix Windows compile bug
test=develop
上级
e82772f4
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
10 addition
and
8 deletion
+10
-8
paddle/fluid/framework/details/eager_deletion_op_handle.cc
paddle/fluid/framework/details/eager_deletion_op_handle.cc
+3
-3
paddle/fluid/framework/executor.cc
paddle/fluid/framework/executor.cc
+6
-4
paddle/fluid/framework/tensor.h
paddle/fluid/framework/tensor.h
+1
-1
未找到文件。
paddle/fluid/framework/details/eager_deletion_op_handle.cc
浏览文件 @
2328bee1
...
@@ -77,14 +77,14 @@ void EagerDeletionOpHandle::RunImpl() {
...
@@ -77,14 +77,14 @@ void EagerDeletionOpHandle::RunImpl() {
VLOG
(
2
)
<<
"Erase variable "
<<
name
;
VLOG
(
2
)
<<
"Erase variable "
<<
name
;
if
(
var
->
IsType
<
LoDTensor
>
())
{
if
(
var
->
IsType
<
LoDTensor
>
())
{
garbages
.
emplace_back
(
var
->
GetMutable
<
LoDTensor
>
()
->
MoveMemory
());
garbages
.
emplace_back
(
var
->
GetMutable
<
LoDTensor
>
()
->
MoveMemory
Holder
());
}
else
if
(
var
->
IsType
<
SelectedRows
>
())
{
}
else
if
(
var
->
IsType
<
SelectedRows
>
())
{
garbages
.
emplace_back
(
garbages
.
emplace_back
(
var
->
GetMutable
<
SelectedRows
>
()
->
mutable_value
()
->
MoveMemory
());
var
->
GetMutable
<
SelectedRows
>
()
->
mutable_value
()
->
MoveMemory
Holder
());
}
else
if
(
var
->
IsType
<
LoDTensorArray
>
())
{
}
else
if
(
var
->
IsType
<
LoDTensorArray
>
())
{
auto
*
tensor_arr
=
var
->
GetMutable
<
LoDTensorArray
>
();
auto
*
tensor_arr
=
var
->
GetMutable
<
LoDTensorArray
>
();
for
(
auto
&
t
:
*
tensor_arr
)
{
for
(
auto
&
t
:
*
tensor_arr
)
{
garbages
.
emplace_back
(
t
.
MoveMemory
());
garbages
.
emplace_back
(
t
.
MoveMemory
Holder
());
}
}
}
else
{
}
else
{
PADDLE_THROW
(
"Type %s of %s is not supported eager deletion"
,
PADDLE_THROW
(
"Type %s of %s is not supported eager deletion"
,
...
...
paddle/fluid/framework/executor.cc
浏览文件 @
2328bee1
...
@@ -106,14 +106,16 @@ static void DeleteUnusedTensors(
...
@@ -106,14 +106,16 @@ static void DeleteUnusedTensors(
VLOG
(
2
)
<<
"Erase variable "
<<
name
;
VLOG
(
2
)
<<
"Erase variable "
<<
name
;
if
(
var
->
IsType
<
LoDTensor
>
())
{
if
(
var
->
IsType
<
LoDTensor
>
())
{
garbages
.
emplace_back
(
var
->
GetMutable
<
LoDTensor
>
()
->
MoveMemory
());
}
else
if
(
var
->
IsType
<
SelectedRows
>
())
{
garbages
.
emplace_back
(
garbages
.
emplace_back
(
var
->
GetMutable
<
SelectedRows
>
()
->
mutable_value
()
->
MoveMemory
());
var
->
GetMutable
<
LoDTensor
>
()
->
MoveMemoryHolder
());
}
else
if
(
var
->
IsType
<
SelectedRows
>
())
{
garbages
.
emplace_back
(
var
->
GetMutable
<
SelectedRows
>
()
->
mutable_value
()
->
MoveMemoryHolder
());
}
else
if
(
var
->
IsType
<
LoDTensorArray
>
())
{
}
else
if
(
var
->
IsType
<
LoDTensorArray
>
())
{
auto
*
lod_tensor_arr
=
var
->
GetMutable
<
LoDTensorArray
>
();
auto
*
lod_tensor_arr
=
var
->
GetMutable
<
LoDTensorArray
>
();
for
(
auto
&
t
:
*
lod_tensor_arr
)
{
for
(
auto
&
t
:
*
lod_tensor_arr
)
{
garbages
.
emplace_back
(
t
.
MoveMemory
());
garbages
.
emplace_back
(
t
.
MoveMemory
Holder
());
}
}
}
else
{
}
else
{
PADDLE_THROW
(
"Type %s of %s is not supported eager deletion"
,
PADDLE_THROW
(
"Type %s of %s is not supported eager deletion"
,
...
...
paddle/fluid/framework/tensor.h
浏览文件 @
2328bee1
...
@@ -158,7 +158,7 @@ class Tensor {
...
@@ -158,7 +158,7 @@ class Tensor {
const
std
::
shared_ptr
<
memory
::
Allocation
>&
Holder
()
const
{
return
holder_
;
}
const
std
::
shared_ptr
<
memory
::
Allocation
>&
Holder
()
const
{
return
holder_
;
}
size_t
offset
()
const
{
return
offset_
;
}
size_t
offset
()
const
{
return
offset_
;
}
std
::
shared_ptr
<
memory
::
Allocation
>
MoveMemory
()
{
std
::
shared_ptr
<
memory
::
Allocation
>
MoveMemory
Holder
()
{
return
std
::
move
(
holder_
);
return
std
::
move
(
holder_
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录