From 3c915be52527a8cded21e15a425b95f8bdbc35b3 Mon Sep 17 00:00:00 2001 From: tangwei Date: Mon, 18 May 2020 18:09:34 +0800 Subject: [PATCH] windows path adapt --- core/utils/envs.py | 13 ++++++++++--- run.py | 6 +++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/core/utils/envs.py b/core/utils/envs.py index 9f20321c..084cec0b 100755 --- a/core/utils/envs.py +++ b/core/utils/envs.py @@ -89,7 +89,7 @@ def get_global_envs(): return global_envs -def windows_path_adapter(path): +def path_adapter(path): def adapt(l_p): if get_platform() == "WINDOWS": adapted_p = l_p.split("paddlerec.")[1].replace(".", "\\") @@ -104,16 +104,23 @@ def windows_path_adapter(path): return adapt(path) +def windows_path_converter(path): + if get_platform() == "WINDOWS": + return path.replace("/", "\\") + else: + return path.replace("\\", "/") + + def update_workspace(): workspace = global_envs.get("train.workspace", None) if not workspace: return - workspace = windows_path_adapter(workspace) + workspace = path_adapter(workspace) for name, value in global_envs.items(): if isinstance(value, str): value = value.replace("{workspace}", workspace) - value = windows_path_adapter(value) + value = windows_path_converter(value) global_envs[name] = value diff --git a/run.py b/run.py index d4b343e1..6c0e06f7 100755 --- a/run.py +++ b/run.py @@ -132,11 +132,11 @@ def cluster_engine(args): if not workspace: return - path = envs.windows_path_adapter(workspace) + path = envs.path_adapter(workspace) for name, value in cluster_envs.items(): if isinstance(value, str): value = value.replace("{workspace}", path) - value = envs.windows_path_adapter(value) + value = envs.windows_path_converter(value) cluster_envs[name] = value def master(): @@ -240,7 +240,7 @@ def local_mpi_engine(args): def get_abs_model(model): if model.startswith("paddlerec."): - dir = envs.windows_path_adapter(model) + dir = envs.path_adapter(model) path = os.path.join(dir, "config.yaml") else: if not os.path.isfile(model): -- GitLab