diff --git a/paddle/scripts/conda_build.py b/paddle/scripts/conda_build.py index 5102472e5236b924c5e0a527c685626f39c1cd7b..e9153583f133771650cf115369dae231e6f1a3f0 100644 --- a/paddle/scripts/conda_build.py +++ b/paddle/scripts/conda_build.py @@ -61,7 +61,6 @@ requirements: - graphviz - protobuf - py-cpuinfo==5.0.0 - - pathlib - astor - gast>=0.3.3 - matplotlib @@ -79,7 +78,6 @@ requirements: - graphviz - protobuf - astor - - pathlib - gast>=0.3.3 - py-cpuinfo==5.0.0 """ diff --git a/python/paddle/distributed/fleet/utils/fs.py b/python/paddle/distributed/fleet/utils/fs.py index 0a0c783c37d720152ed5228d45cb4feb75692598..221f09a796a6f388429fb75367c330abffb4c8b0 100644 --- a/python/paddle/distributed/fleet/utils/fs.py +++ b/python/paddle/distributed/fleet/utils/fs.py @@ -29,7 +29,6 @@ import paddle.fluid as fluid from paddle.fluid import core import functools -from pathlib import PurePosixPath, Path import shutil __all__ = ['LocalFS', 'HDFSClient'] @@ -322,7 +321,7 @@ class LocalFS(FS): return raise FSFileExistsError - return Path(fs_path).touch(exist_ok=True) + os.system("touch {}".format(fs_path)) def mv(self, src_path, dst_path, overwrite=False, test_exists=False): """ @@ -554,11 +553,11 @@ class HDFSClient(FS): if len(arr) != 8: continue - p = PurePosixPath(arr[7]) + p = os.path.basename(arr[7]) if arr[0][0] == 'd': - dirs.append(p.name) + dirs.append(p) else: - files.append(p.name) + files.append(p) return dirs, files diff --git a/python/paddle/fluid/incubate/fleet/utils/hdfs.py b/python/paddle/fluid/incubate/fleet/utils/hdfs.py index 4d343ffaf146a67db68ed644085395cde356060f..94a371ae3fb5bb57836701a02f64f9ad01a49d7e 100644 --- a/python/paddle/fluid/incubate/fleet/utils/hdfs.py +++ b/python/paddle/fluid/incubate/fleet/utils/hdfs.py @@ -30,7 +30,6 @@ from .fs import FS, LocalFS, FSFileExistsError, FSFileNotExistsError, ExecuteErr from paddle.fluid import core import functools -from pathlib import PurePosixPath, Path import shutil __all__ = ["HDFSClient"] @@ -137,11 +136,11 @@ class HDFSClient(FS): if len(arr) != 8: continue - p = PurePosixPath(arr[7]) + p = os.path.basename(arr[7]) if arr[0][0] == 'd': - dirs.append(p.name) + dirs.append(p) else: - files.append(p.name) + files.append(p) return dirs, files diff --git a/python/requirements.txt b/python/requirements.txt index a879ead685fcbc163803918884e10a40b3bd00bf..b56bdd5695e9530239f4a06401ef515928d895bc 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -12,4 +12,3 @@ Pillow six decorator astor -pathlib