From 8ad6d38143b25fe38634e2608435a5c8ba251628 Mon Sep 17 00:00:00 2001 From: Danny McCormick Date: Mon, 23 Sep 2024 07:59:24 -0400 Subject: [PATCH 1/3] Remove quotes from dataflow command --- axlearn/cloud/gcp/jobs/dataflow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/axlearn/cloud/gcp/jobs/dataflow.py b/axlearn/cloud/gcp/jobs/dataflow.py index 054022d68..bf116a1d7 100644 --- a/axlearn/cloud/gcp/jobs/dataflow.py +++ b/axlearn/cloud/gcp/jobs/dataflow.py @@ -177,7 +177,7 @@ def from_flags(cls, fv: flags.FlagValues, **kwargs): sorted(flags.flag_dict_to_args(dataflow_spec, multi_flags=multi_flags)) ) cfg.setup_command = f"{docker_setup_cmd} && {docker_auth_cmd} && {bundle_cmd}" - cfg.command = f"{cfg.command} {dataflow_flags}" + cfg.command = f"{cfg.command.strip('\'\"')} {dataflow_flags}" return cfg @classmethod From 94a53671beefcf0d70f8701e4d11dd81788a6a46 Mon Sep 17 00:00:00 2001 From: Danny McCormick Date: Tue, 24 Sep 2024 16:49:27 -0400 Subject: [PATCH 2/3] Backslash fix --- axlearn/cloud/gcp/jobs/dataflow.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/axlearn/cloud/gcp/jobs/dataflow.py b/axlearn/cloud/gcp/jobs/dataflow.py index bf116a1d7..1f7fd53ea 100644 --- a/axlearn/cloud/gcp/jobs/dataflow.py +++ b/axlearn/cloud/gcp/jobs/dataflow.py @@ -177,7 +177,8 @@ def from_flags(cls, fv: flags.FlagValues, **kwargs): sorted(flags.flag_dict_to_args(dataflow_spec, multi_flags=multi_flags)) ) cfg.setup_command = f"{docker_setup_cmd} && {docker_auth_cmd} && {bundle_cmd}" - cfg.command = f"{cfg.command.strip('\'\"')} {dataflow_flags}" + cfg.command = cfg.command.strip('\'\"') + cfg.command = f"{cfg.command} {dataflow_flags}" return cfg @classmethod From 3d38dfb692491e43b25b07b71466062d26bf8214 Mon Sep 17 00:00:00 2001 From: Danny McCormick Date: Mon, 30 Sep 2024 12:58:04 +0000 Subject: [PATCH 3/3] Format --- axlearn/cloud/gcp/jobs/dataflow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/axlearn/cloud/gcp/jobs/dataflow.py b/axlearn/cloud/gcp/jobs/dataflow.py index 1f7fd53ea..840492aa2 100644 --- a/axlearn/cloud/gcp/jobs/dataflow.py +++ b/axlearn/cloud/gcp/jobs/dataflow.py @@ -177,7 +177,7 @@ def from_flags(cls, fv: flags.FlagValues, **kwargs): sorted(flags.flag_dict_to_args(dataflow_spec, multi_flags=multi_flags)) ) cfg.setup_command = f"{docker_setup_cmd} && {docker_auth_cmd} && {bundle_cmd}" - cfg.command = cfg.command.strip('\'\"') + cfg.command = cfg.command.strip("'\"") cfg.command = f"{cfg.command} {dataflow_flags}" return cfg