Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wzpei9
Paddle
提交
2a05b3d5
P
Paddle
项目概览
wzpei9
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2a05b3d5
编写于
5月 11, 2018
作者:
T
tangwei12
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
delete checkpoint function
上级
e21a72d1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
1 addition
and
101 deletion
+1
-101
paddle/fluid/operators/detail/checkpoint.cc
paddle/fluid/operators/detail/checkpoint.cc
+0
-54
paddle/fluid/operators/detail/checkpoint.h
paddle/fluid/operators/detail/checkpoint.h
+0
-33
paddle/fluid/operators/listen_and_serv_op.cc
paddle/fluid/operators/listen_and_serv_op.cc
+0
-12
python/paddle/fluid/transpiler/distribute_transpiler.py
python/paddle/fluid/transpiler/distribute_transpiler.py
+1
-2
未找到文件。
paddle/fluid/operators/detail/checkpoint.cc
已删除
100644 → 0
浏览文件 @
e21a72d1
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
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. */
#pragma once
#include "paddle/fluid/operators/detail/checkpoint.h"
#include <string>
namespace
paddle
{
namespace
framework
{
namespace
details
{
Checkpoint
::
Save
(
const
framework
::
Scope
&
scope
,
const
platform
::
Place
&
place
,
const
std
::
string
&
save_dir
,
const
std
::
string
&
var_name
,
const
bool
&
overwrite
)
{
auto
*
var
=
scope
.
FindVar
(
var_name
);
PADDLE_ENFORCE
(
var
!=
nullptr
,
"Cannot find variable %s for save_op"
,
var_name
);
PADDLE_ENFORCE
(
var
->
IsType
<
framework
::
LoDTensor
>
(),
"Checkpoint only supports LoDTensor, %s has wrong type"
,
var_name
);
bool
is_present
=
FileExists
(
save_dir
);
if
(
is_present
&&
!
overwrite
)
{
PADDLE_THROW
(
"%s exists!, checkpoint cannot write it when overwrite=false"
,
save_dir
,
overwrite
);
}
MkDirRecursively
(
DirName
(
save_dir
).
c_str
());
std
::
ofstream
fout
(
save_dir
);
PADDLE_ENFORCE
(
static_cast
<
bool
>
(
fout
),
"Cannot open %s to write"
,
save_dir
);
// get device context from pool
platform
::
DeviceContextPool
&
pool
=
platform
::
DeviceContextPool
::
Instance
();
auto
&
dev_ctx
=
*
pool
.
Get
(
place
);
auto
&
tensor
=
var
->
Get
<
framework
::
LoDTensor
>
();
// Serialize tensor
framework
::
SerializeToStream
(
fout
,
tensor
,
dev_ctx
);
fout
.
close
();
}
}
// namespace details
}
// namespace framework
}
// namespace paddle
paddle/fluid/operators/detail/checkpoint.h
已删除
100644 → 0
浏览文件 @
e21a72d1
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
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. */
#pragma once
#include <string>
#include "paddle/fluid/framework/scope.h"
namespace
paddle
{
namespace
framework
{
namespace
details
{
class
Checkpoint
{
public:
static
void
Save
(
const
framework
::
Scope
&
scope
,
const
platform
::
Place
&
place
,
const
std
::
string
&
save_dir
,
const
std
::
string
&
var_name
,
const
bool
&
overwrite
);
static
void
Load
();
}
}
// namespace details
}
// namespace framework
}
// namespace paddle
paddle/fluid/operators/listen_and_serv_op.cc
浏览文件 @
2a05b3d5
...
...
@@ -101,7 +101,6 @@ void ListenAndServOp::RunSyncLoop(framework::Executor *executor,
framework
::
Scope
*
recv_scope
,
framework
::
BlockDesc
*
prefetch_block
)
const
{
auto
fan_in
=
Attr
<
int
>
(
"Fanin"
);
auto
checkpoint
=
Attr
<
std
::
string
>
(
"Checkpoint"
);
size_t
num_blocks
=
program
->
Size
();
PADDLE_ENFORCE_GE
(
num_blocks
,
2
,
...
...
@@ -190,17 +189,6 @@ void ListenAndServOp::RunSyncLoop(framework::Executor *executor,
var
->
GetMutable
<
framework
::
SelectedRows
>
()
->
mutable_rows
()
->
clear
();
}
/******************** CHECK POINT ***********************/
std
::
vector
<
std
::
string
>
all_vars
=
recv_scope
.
LocalVarNames
();
std
::
vector
<
std
::
string
>::
iterator
it
;
for
(
it
=
all_vars
.
begin
();
it
!=
all_vars
.
end
();
it
++
)
{
VLOG
(
2
)
<<
"Checkpoint Var: "
<<
*
it
;
break
;
}
/******************** CHECK POINT ***********************/
rpc_service_
->
SetCond
(
1
);
// FIXME(typhoonzero): use another condition to sync wait clients get.
rpc_service_
->
WaitClientGet
(
fan_in
);
...
...
python/paddle/fluid/transpiler/distribute_transpiler.py
浏览文件 @
2a05b3d5
...
...
@@ -483,8 +483,7 @@ class DistributeTranspiler:
"Fanin"
:
self
.
trainer_num
,
"PrefetchBlock"
:
prefetch_block
,
"sync_mode"
:
self
.
sync_mode
,
"grad_to_block_id"
:
grad_to_block_id
,
"Checkpoint"
:
"/tmp/tangwei_ckpt/"
"grad_to_block_id"
:
grad_to_block_id
})
pserver_program
.
sync_with_cpp
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录