update sky runner

run-house · Aug 23, 2024 · 7f76f7e · 7f76f7e
1 parent ca58d4c
commit 7f76f7e
Show file tree

Hide file tree

Showing 6 changed files with 366 additions and 190 deletions.
diff --git a/runhouse/resources/hardware/cluster.py b/runhouse/resources/hardware/cluster.py
@@ -1204,10 +1204,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:
@@ -1423,10 +1422,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}",