Merge with master

ICRAR · Oct 10, 2024 · 12855cb · 12855cb
1 parent 9d5c35e
commit 12855cb
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 24 deletions.
diff --git a/daliuge-engine/dlg/deploy/create_dlg_job.py b/daliuge-engine/dlg/deploy/create_dlg_job.py
@@ -650,13 +650,9 @@ def main():
             # you can specify:
             # either a single directory
             if opts.log_root is None:
-<<<<<<< HEAD
                 config = ConfigFactory.create_config(
                     facility=opts.facility, user=opts.username
                 )
-=======
-                config = ConfigFactory.create_config(facility=opts.facility)
->>>>>>> master
                 log_root = config.getpar("log_root")
             else:
                 log_root = opts.log_root

diff --git a/daliuge-engine/dlg/deploy/slurm_client.py b/daliuge-engine/dlg/deploy/slurm_client.py
@@ -35,10 +35,7 @@
 from dlg.deploy.configs import ConfigFactory, init_tpl
 from dlg.deploy.configs import DEFAULT_MON_PORT, DEFAULT_MON_HOST
 from dlg.deploy.deployment_utils import find_numislands, label_job_dur
-<<<<<<< HEAD
 from paramiko.ssh_exception import SSHException
-=======
->>>>>>> master
 
 
 class SlurmClient:
@@ -82,26 +79,17 @@ def __init__(
         pip_name=None,
         username=None,
     ):
-<<<<<<< HEAD
         self._config = ConfigFactory.create_config(facility=facility, user=username)
         self.host = self._config.getpar("host") if host is None else host
         self._acc = self._config.getpar("account") if (acc is None) else acc
         self._user = self._config.getpar("user") if (username is None) else username
-=======
-        self._config = ConfigFactory.create_config(facility=facility)
-        self.host = self._config.getpar("host") if host is None else host
-        self._acc = self._config.getpar("account") if (acc is None) else acc
->>>>>>> master
         self.dlg_root = self._config.getpar("dlg_root") if not dlg_root else dlg_root
         self._log_root = (
             self._config.getpar("log_root") if (log_root is None) else log_root
         )
         self.modules = self._config.getpar("modules")
         self.venv = self._config.getpar("venv")
-<<<<<<< HEAD
         self.exec_prefix = self._config.getpar("exec_prefix")
-=======
->>>>>>> master
         if num_nodes is None:
             self._num_nodes = 1
         else:
@@ -187,10 +175,7 @@ def create_job_desc(self, physical_graph_file):
         )
         pardict["MODULES"] = self.modules
         pardict["DLG_ROOT"] = self.dlg_root
-<<<<<<< HEAD
         pardict["EXEC_PREFIX"] = self.exec_prefix
-=======
->>>>>>> master
 
         job_desc = init_tpl.safe_substitute(pardict)
         return job_desc
@@ -219,7 +204,6 @@ def mk_session_dir(self, dlg_root: str = ""):
             os.makedirs(session_dir)
         if self._remote:
             command = f"mkdir -p {session_dir}"
-<<<<<<< HEAD
             print(
                 f"Creating remote session directory on {self.username}@{self.host}: {command}"
             )
@@ -230,10 +214,6 @@ def mk_session_dir(self, dlg_root: str = ""):
                     f"ERROR: Unable to create {session_dir} on {self.username}@{self.host}"
                 )
                 sys.exit()
-=======
-            print(f"Creating remote session directory on {self.host}: {command}")
-            remote.execRemote(self.host, command, username=self.username)
->>>>>>> master
 
         return session_dir