update sky runner

run-house · Aug 20, 2024 · a011ffd · a011ffd
1 parent bf31898
commit a011ffd
Show file tree

Hide file tree

Showing 6 changed files with 366 additions and 187 deletions.
diff --git a/runhouse/resources/hardware/cluster.py b/runhouse/resources/hardware/cluster.py
@@ -1197,10 +1197,9 @@ def rsync(
         )
 
         runner = SkySSHRunner(
-            node,
+            (node, self.ssh_port),
             **ssh_credentials,
             ssh_control_name=ssh_control_name,
-            port=self.ssh_port,
             docker_user=self.docker_user,
         )
         if not pwd:
@@ -1416,10 +1415,9 @@ def _run_commands_with_ssh(
         )
 
         runner = SkySSHRunner(
-            host,
+            (host, self.ssh_port),
             **ssh_credentials,
             ssh_control_name=ssh_control_name,
-            port=self.ssh_port,
             docker_user=self.docker_user,
         )
 

diff --git a/runhouse/resources/hardware/on_demand_cluster.py b/runhouse/resources/hardware/on_demand_cluster.py
@@ -666,9 +666,8 @@ def ssh(self, node: str = None):
                 raise FileNotFoundError(f"Expected default sky key in path: {sky_key}")
 
             runner = SkySSHRunner(
-                ip=node or self.address,
+                (node or self.address, self.ssh_port),
                 ssh_user=ssh_user,
-                port=self.ssh_port,
                 ssh_private_key=str(sky_key),
                 docker_user=self.docker_user,
             )

diff --git a/runhouse/resources/hardware/sagemaker/sagemaker_cluster.py b/runhouse/resources/hardware/sagemaker/sagemaker_cluster.py
@@ -705,8 +705,7 @@ def _run_commands_with_ssh(
                 from runhouse.resources.hardware.sky_ssh_runner import SkySSHRunner
 
                 runner = SkySSHRunner(
-                    self.name,
-                    port=self.ssh_port,
+                    (self.name, self.ssh_port),
                     ssh_user=self.DEFAULT_USER,
                     ssh_private_key=self._abs_ssh_key_path,
                     ssh_control_name=f"{self.name}:{self.ssh_port}",