Skip to content

small fix to launch_shell for LocalDocker mode #11

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

Open
kylehkhsu wants to merge 4 commits into
base: master
Choose a base branch
from
Open

small fix to launch_shell for LocalDocker mode #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a61f83
small update to launch_shell
kylehkhsu Jun 22, 2018
2ff5e47
add ability to restrict gpu available to local docker image
kylehkhsu Jun 29, 2018
3ade980
gitignore
kylehkhsu Aug 2, 2018
281da60
Merge remote-tracking branch 'upstream/master'
kylehkhsu Oct 24, 2018
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,6 @@ ENV/

# mypy
.mypy_cache/

# PyCharm
.idea/
3 changes: 2 additions & 1 deletion doodad/launch_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ def launch_shell(
mode=LOCAL,
dry=False,
mount_points=None,
verbose=False
):
if mount_points is None:
mount_points = []
mode.launch_command(command, dry=dry)
mode.launch_command(command, dry=dry, mount_points=mount_points, verbose=verbose)


def launch_python(
Expand Down
20 changes: 13 additions & 7 deletions doodad/mode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,12 @@ def launch_command(self, cmd, mount_points=None, dry=False, verbose=False):


class DockerMode(LaunchMode):
def __init__(self, image='ubuntu:16.04', gpu=False):
def __init__(self, image='ubuntu:16.04', gpu=False, gpu_id=-1):
super(DockerMode, self).__init__()
self.docker_image = image
self.docker_name = uuid.uuid4()
self.gpu = gpu
self.gpu_id = gpu_id # default of -1 results in all local gpus made available

def get_docker_cmd(self, main_cmd, extra_args='', use_tty=True, verbose=True, pythonpath=None, pre_cmd=None, post_cmd=None,
checkpoint=False, no_root=False):
Expand All @@ -83,6 +84,8 @@ def get_docker_cmd(self, main_cmd, extra_args='', use_tty=True, verbose=True, py
if verbose:
if self.gpu:
cmd_list.append('echo \"Running in docker (gpu)\"')
if self.gpu_id > -1:
cmd_list.append('echo \"Restricting to gpu_id=%d\"' % self.gpu_id)
else:
cmd_list.append('echo \"Running in docker\"')
if pythonpath:
Expand All @@ -108,12 +111,15 @@ def get_docker_cmd(self, main_cmd, extra_args='', use_tty=True, verbose=True, py
use_tty = False
extra_args += ' -d ' # detach is optional

docker_prefix = 'docker run'
if self.gpu:
docker_prefix = 'nvidia-' + docker_prefix
if self.gpu_id > -1:
docker_prefix = '%s -e NVIDIA_VISIBLE_DEVICES=%d' % (docker_prefix, self.gpu_id)
if use_tty:
docker_prefix = 'docker run %s -ti %s /bin/bash -c ' % (extra_args, self.docker_image)
docker_prefix = '%s %s -ti %s /bin/bash -c ' % (docker_prefix, extra_args, self.docker_image)
else:
docker_prefix = 'docker run %s %s /bin/bash -c ' % (extra_args, self.docker_image)
if self.gpu:
docker_prefix = 'nvidia-'+docker_prefix
docker_prefix = '%s %s %s /bin/bash -c ' % (docker_prefix, extra_args, self.docker_image)
main_cmd = cmd_list.to_string()
full_cmd = docker_prefix + ("\'%s\'" % main_cmd)
return full_cmd
Expand All @@ -124,7 +130,7 @@ def __init__(self, checkpoints=None, **kwargs):
super(LocalDocker, self).__init__(**kwargs)
self.checkpoints = checkpoints

def launch_command(self, cmd, mount_points=None, dry=False, verbose=False):
def launch_command(self, cmd, mount_points=None, dry=False, verbose=False, extra_args=''):
mnt_args = ''
py_path = []
for mount in mount_points:
Expand All @@ -138,7 +144,7 @@ def launch_command(self, cmd, mount_points=None, dry=False, verbose=False):
else:
raise NotImplementedError(type(mount))

full_cmd = self.get_docker_cmd(cmd, extra_args=mnt_args, pythonpath=py_path,
full_cmd = self.get_docker_cmd(cmd, extra_args=extra_args + mnt_args, pythonpath=py_path,
checkpoint=self.checkpoints)
if verbose:
print(full_cmd)
Expand Down