diff --git a/runhouse/resources/hardware/cluster.py b/runhouse/resources/hardware/cluster.py index 0033e8a9e..9cb623621 100644 --- a/runhouse/resources/hardware/cluster.py +++ b/runhouse/resources/hardware/cluster.py @@ -431,7 +431,7 @@ def is_shared(self) -> bool: return f"{self._creds.name}/" in ssh_creds.get("ssh_private_key", "") def _command_runner(self, node: Optional[str] = None) -> "CommandRunner": - from runhouse.resources.hardware.sky_ssh_runner import ( + from runhouse.resources.hardware.sky_command_runner import ( SkyKubernetesRunner, SkySSHRunner, ) @@ -1214,7 +1214,7 @@ def rsync( ) return - from runhouse.resources.hardware.sky_ssh_runner import SshMode + from runhouse.resources.hardware.sky_command_runner import SshMode # If no address provided explicitly use the head node address node = node or self.address @@ -1449,7 +1449,7 @@ def _run_commands_with_runner( require_outputs: bool = True, _ssh_mode: str = "interactive", # Note, this only applies for non-password SSH ): - from runhouse.resources.hardware.sky_ssh_runner import SshMode + from runhouse.resources.hardware.sky_command_runner import SshMode if isinstance(commands, str): commands = [commands] diff --git a/runhouse/resources/hardware/on_demand_cluster.py b/runhouse/resources/hardware/on_demand_cluster.py index febc0652c..0a8ff6d84 100644 --- a/runhouse/resources/hardware/on_demand_cluster.py +++ b/runhouse/resources/hardware/on_demand_cluster.py @@ -158,7 +158,7 @@ def docker_user(self) -> str: if self.launched_properties["cloud"] == "kubernetes": return "root" - from runhouse.resources.hardware.sky_ssh_runner import get_docker_user + from runhouse.resources.hardware.sky_command_runner import get_docker_user if not self._creds: return @@ -664,7 +664,7 @@ def ssh(self, node: str = None): else: # If SSHing onto a specific node, which requires the default sky public key for verification - from runhouse.resources.hardware.sky_ssh_runner import SshMode + from runhouse.resources.hardware.sky_command_runner import SshMode sky_key = Path( self.creds_values.get("ssh_private_key", self.DEFAULT_KEYFILE) diff --git a/runhouse/resources/hardware/sagemaker/sagemaker_cluster.py b/runhouse/resources/hardware/sagemaker/sagemaker_cluster.py index 973432f68..2486373b0 100644 --- a/runhouse/resources/hardware/sagemaker/sagemaker_cluster.py +++ b/runhouse/resources/hardware/sagemaker/sagemaker_cluster.py @@ -706,7 +706,7 @@ def _run_commands_with_runner( return_codes.append((255, "", str(e))) else: # Host can be replaced with name (as reflected in the ~/.ssh/config file) - from runhouse.resources.hardware.sky_ssh_runner import SkySSHRunner + from runhouse.resources.hardware.sky_command_runner import SkySSHRunner runner = SkySSHRunner( (self.name, self.ssh_port), diff --git a/runhouse/resources/hardware/sky_ssh_runner.py b/runhouse/resources/hardware/sky_command_runner.py similarity index 100% rename from runhouse/resources/hardware/sky_ssh_runner.py rename to runhouse/resources/hardware/sky_command_runner.py diff --git a/runhouse/resources/hardware/utils.py b/runhouse/resources/hardware/utils.py index 1c193f87d..91128d75e 100644 --- a/runhouse/resources/hardware/utils.py +++ b/runhouse/resources/hardware/utils.py @@ -150,7 +150,7 @@ def _run_ssh_command( ssh_private_key: str, docker_user: str, ): - from runhouse.resources.hardware.sky_ssh_runner import SkySSHRunner + from runhouse.resources.hardware.sky_command_runner import SkySSHRunner runner = SkySSHRunner( ip=(address, ssh_port),