Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update existing sky runner class #1172

Merged
merged 3 commits into from
Aug 29, 2024
Merged

Update existing sky runner class #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acd3a4c
move helper functions to hardware utils
carolineechen Aug 19, 2024
ee68265
Create separate ssh tunnel class
carolineechen Aug 29, 2024
f37c82b
update sky runner
carolineechen Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions runhouse/resources/hardware/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,10 +1215,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:
Expand Down Expand Up @@ -1432,10 +1431,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,
)

Expand Down
3 changes: 1 addition & 2 deletions runhouse/resources/hardware/on_demand_cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,9 +660,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,
)
Expand Down
3 changes: 1 addition & 2 deletions runhouse/resources/hardware/sagemaker/sagemaker_cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,8 +709,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}",
Expand Down
Loading
Loading