Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
11bcf0e2
P
Paddle
项目概览
机器未来
/
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看板
未验证
提交
11bcf0e2
编写于
9月 16, 2020
作者:
G
gongweibao
提交者:
GitHub
9月 16, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cleanup redundant code files (#27319)
上级
54b81fa3
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
4 addition
and
208 deletion
+4
-208
python/paddle/distributed/fleet/utils/fs.py
python/paddle/distributed/fleet/utils/fs.py
+0
-20
python/paddle/fluid/incubate/fleet/utils/fleet_util.py
python/paddle/fluid/incubate/fleet/utils/fleet_util.py
+1
-2
python/paddle/fluid/incubate/fleet/utils/fs.py
python/paddle/fluid/incubate/fleet/utils/fs.py
+0
-180
python/paddle/fluid/tests/unittests/auto_checkpoint_utils.py
python/paddle/fluid/tests/unittests/auto_checkpoint_utils.py
+1
-2
python/paddle/fluid/tests/unittests/test_checkpoint_saver.py
python/paddle/fluid/tests/unittests/test_checkpoint_saver.py
+1
-2
python/paddle/fluid/tests/unittests/test_fleet_checkpoint.py
python/paddle/fluid/tests/unittests/test_fleet_checkpoint.py
+1
-2
未找到文件。
python/paddle/distributed/fleet/utils/fs.py
浏览文件 @
11bcf0e2
...
...
@@ -200,26 +200,6 @@ class LocalFS(FS):
return
dirs
"""HDFS Utils."""
def
_handle_errors
(
f
):
def
handler
(
*
args
,
**
kwargs
):
start
=
time
.
time
()
while
True
:
try
:
return
f
(
*
args
,
**
kwargs
)
except
ExecuteError
as
e
:
o
=
args
[
0
]
time_out
=
float
(
o
.
_time_out
)
/
1000.0
inter
=
float
(
o
.
_sleep_inter
)
/
1000.0
if
time
.
time
()
-
start
>=
time_out
:
raise
FSTimeOut
time
.
sleep
(
inter
)
return
functools
.
wraps
(
f
)(
handler
)
def
_handle_errors
(
max_time_out
=
None
):
def
decorator
(
f
):
@
functools
.
wraps
(
f
)
...
...
python/paddle/fluid/incubate/fleet/utils/fleet_util.py
浏览文件 @
11bcf0e2
...
...
@@ -26,8 +26,7 @@ import paddle.fluid as fluid
from
paddle.fluid.log_helper
import
get_logger
from
paddle.fluid.incubate.fleet.parameter_server.distribute_transpiler
import
fleet
as
fleet_pslib
from
paddle.fluid.incubate.fleet.parameter_server.distribute_transpiler
import
fleet
as
fleet_transpiler
from
.
import
hdfs
from
.hdfs
import
*
from
paddle.distributed.fleet.utils.fs
import
LocalFS
,
HDFSClient
from
.
import
utils
__all__
=
[
"FleetUtil"
]
...
...
python/paddle/fluid/incubate/fleet/utils/fs.py
已删除
100644 → 0
浏览文件 @
54b81fa3
# Copyright (c) 2018 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.
import
os
import
sys
import
subprocess
import
multiprocessing
from
datetime
import
datetime
import
re
import
copy
import
errno
import
time
import
logging
import
abc
from
pathlib
import
PurePosixPath
,
Path
import
shutil
__all__
=
[
'FS'
,
'LocalFS'
]
class
ExecuteError
(
Exception
):
pass
class
FSFileExistsError
(
Exception
):
pass
class
FSFileNotExistsError
(
Exception
):
pass
class
FSTimeOut
(
Exception
):
pass
class
FSShellCmdAborted
(
ExecuteError
):
pass
class
FS
(
object
):
@
abc
.
abstractmethod
def
ls_dir
(
self
,
fs_path
):
raise
NotImplementedError
@
abc
.
abstractmethod
def
is_file
(
self
,
fs_path
):
raise
NotImplementedError
@
abc
.
abstractmethod
def
is_dir
(
self
,
fs_path
):
raise
NotImplementedError
@
abc
.
abstractmethod
def
is_exist
(
self
,
fs_path
):
raise
NotImplementedError
@
abc
.
abstractmethod
def
upload
(
self
,
local_path
,
fs_path
):
raise
NotImplementedError
@
abc
.
abstractmethod
def
download
(
self
,
fs_path
,
local_path
):
raise
NotImplementedError
@
abc
.
abstractmethod
def
mkdirs
(
self
,
fs_path
):
raise
NotImplementedError
@
abc
.
abstractmethod
def
delete
(
self
,
fs_path
):
raise
NotImplementedError
@
abc
.
abstractmethod
def
need_upload_download
(
self
):
raise
NotImplementedError
@
abc
.
abstractmethod
def
rename
(
self
,
fs_src_path
,
fs_dst_path
):
raise
NotImplementedError
@
abc
.
abstractmethod
def
mv
(
self
,
fs_src_path
,
fs_dst_path
,
overwrite
=
False
,
test_exists
=
False
):
raise
NotImplementedError
@
abc
.
abstractmethod
def
upload_dir
(
self
,
local_dir
,
dest_dir
):
raise
NotImplementedError
@
abc
.
abstractmethod
def
list_dirs
(
self
,
fs_path
):
raise
NotImplementedError
@
abc
.
abstractmethod
def
touch
(
self
,
fs_path
,
exist_ok
=
True
):
raise
NotImplementedError
class
LocalFS
(
FS
):
def
ls_dir
(
self
,
fs_path
):
return
[
f
for
f
in
os
.
listdir
(
fs_path
)]
def
mkdirs
(
self
,
fs_path
):
assert
not
os
.
path
.
isfile
(
fs_path
),
"{} is already a file"
.
format
(
fs_path
)
os
.
system
(
"mkdir -p {}"
.
format
(
fs_path
))
def
rename
(
self
,
fs_src_path
,
fs_dst_path
):
os
.
rename
(
fs_src_path
,
fs_dst_path
)
def
_rmr
(
self
,
fs_path
):
shutil
.
rmtree
(
fs_path
)
def
_rm
(
self
,
fs_path
):
os
.
remove
(
fs_path
)
def
delete
(
self
,
fs_path
):
if
not
self
.
is_exist
(
fs_path
):
return
if
os
.
path
.
isfile
(
fs_path
):
return
self
.
_rm
(
fs_path
)
return
self
.
_rmr
(
fs_path
)
def
need_upload_download
(
self
):
return
False
def
is_file
(
self
,
fs_path
):
return
os
.
path
.
isfile
(
fs_path
)
def
is_dir
(
self
,
fs_path
):
return
os
.
path
.
isdir
(
fs_path
)
def
is_exist
(
self
,
fs_path
):
return
os
.
path
.
exists
(
fs_path
)
def
touch
(
self
,
fs_path
,
exist_ok
=
True
):
if
self
.
is_exist
(
fs_path
):
if
exist_ok
:
return
raise
FSFileExistsError
return
Path
(
fs_path
).
touch
(
exist_ok
=
True
)
def
mv
(
self
,
src_path
,
dst_path
,
overwrite
=
False
,
test_exists
=
False
):
if
not
self
.
is_exist
(
src_path
):
raise
FSFileNotExistsError
if
overwrite
and
self
.
is_exist
(
dst_path
):
self
.
delete
(
dst_path
)
if
self
.
is_exist
(
dst_path
):
raise
FSFileExistsError
return
self
.
rename
(
src_path
,
dst_path
)
def
list_dirs
(
self
,
fs_path
):
"""
list directory under fs_path, and only give the pure name, not include the fs_path
"""
if
not
self
.
is_exist
(
fs_path
):
return
[]
dirs
=
[
f
for
f
in
os
.
listdir
(
fs_path
)
if
os
.
path
.
isdir
(
fs_path
+
"/"
+
f
)
]
return
dirs
python/paddle/fluid/tests/unittests/auto_checkpoint_utils.py
浏览文件 @
11bcf0e2
...
...
@@ -20,8 +20,7 @@ from paddle.fluid.incubate.fleet.collective import CollectiveOptimizer, fleet
import
os
import
sys
from
paddle.fluid.incubate.fleet.utils.fs
import
LocalFS
from
paddle.fluid.incubate.fleet.utils.hdfs
import
HDFSClient
from
paddle.distributed.fleet.utils.fs
import
LocalFS
,
HDFSClient
import
paddle.fluid.incubate.checkpoint.auto_checkpoint
as
acp
from
paddle.fluid.incubate.checkpoint.checkpoint_saver
import
PaddleModel
from
paddle.fluid.framework
import
program_guard
...
...
python/paddle/fluid/tests/unittests/test_checkpoint_saver.py
浏览文件 @
11bcf0e2
...
...
@@ -21,8 +21,7 @@ from paddle.fluid.incubate.checkpoint.checkpoint_saver import CheckpointSaver
import
os
import
sys
from
paddle.fluid.incubate.fleet.utils.fs
import
LocalFS
from
paddle.fluid.incubate.fleet.utils.hdfs
import
HDFSClient
from
paddle.distributed.fleet.utils.fs
import
LocalFS
,
HDFSClient
from
paddle.fluid.incubate.checkpoint.checkpoint_saver
import
CheckpointSaver
...
...
python/paddle/fluid/tests/unittests/test_fleet_checkpoint.py
浏览文件 @
11bcf0e2
...
...
@@ -21,8 +21,7 @@ from paddle.fluid.incubate.checkpoint.checkpoint_saver import CheckpointSaver
import
os
import
sys
from
paddle.fluid.incubate.fleet.utils.fs
import
LocalFS
from
paddle.fluid.incubate.fleet.utils.hdfs
import
HDFSClient
from
paddle.distributed.fleet.utils.fs
import
LocalFS
,
HDFSClient
from
paddle.fluid.incubate.checkpoint.checkpoint_saver
import
CheckpointSaver
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录