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.

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

Add a runner for MosaicML cloud #44

Merged
merged 24 commits into from
Feb 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions deepspeed/launcher/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

OPENMPI_LAUNCHER = 'openmpi'
SLURM_LAUNCHER = 'slurm'
MOSAICML_LAUNCHER = 'mosaicml'

MVAPICH_LAUNCHER = 'mvapich'
MVAPICH_TMP_HOSTFILE = '/tmp/deepspeed_mvapich_hostfile'
38 changes: 38 additions & 0 deletions deepspeed/launcher/multinode_runner.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import base64
import json
import os
import sys
Expand Down Expand Up @@ -252,3 +253,40 @@ def get_cmd(self, environment, active_resources):

return mpirun_cmd + export_cmd + python_exec + [self.user_script
] + self.user_arguments
class MosaicMLRunner(MultiNodeRunner):
def __init__(self, args, world_info_base64):
super().__init__(args, world_info_base64)

def backend_exists(self):
return True

def parse_user_args(self):
user_args = []
for arg in self.args.user_args:
if arg.startswith('{') and arg.endswith('}'):
try:
arg_dict = json.loads(arg)
if 'config_files' in arg_dict:
config_files = {}
for k, v in arg_dict.get('config_files', {}).items():
config_files[k] = json.loads(v)
arg_dict['config_files'] = config_files
except json.JSONDecodeError as jde:
raise ValueError('Please use plain json for your configs. Check for comments and lowercase trues') from jde
arg = json.dumps(arg_dict, separators=(',', ':'))
user_args.append(arg)
return user_args

def get_cmd(self, environment, active_resources):
deepspeed_launch = [
sys.executable,
"-u",
"-m",
"deepspeed.launcher.launch",
'--world_info={}'.format(self.world_info_base64),
"--node_rank={}".format(os.environ['NODE_RANK']),
"--master_addr={}".format(os.environ['MASTER_ADDR']),
"--master_port={}".format(os.environ['MASTER_PORT']),
]

return deepspeed_launch + [self.user_script] + self.user_arguments
9 changes: 5 additions & 4 deletions deepspeed/launcher/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

import torch.cuda

from .multinode_runner import PDSHRunner, OpenMPIRunner, MVAPICHRunner, SlurmRunner
from .constants import PDSH_LAUNCHER, OPENMPI_LAUNCHER, MVAPICH_LAUNCHER, SLURM_LAUNCHER
from .multinode_runner import PDSHRunner, OpenMPIRunner, MVAPICHRunner, SlurmRunner, MosaicMLRunner
from .constants import PDSH_LAUNCHER, OPENMPI_LAUNCHER, MVAPICH_LAUNCHER, SLURM_LAUNCHER, MOSAICML_LAUNCHER
from ..constants import TORCH_DISTRIBUTED_DEFAULT_PORT
from ..utils import logger

Expand Down Expand Up @@ -343,6 +343,8 @@ def main(args=None):
runner = MVAPICHRunner(args, world_info_base64, resource_pool)
elif args.launcher == SLURM_LAUNCHER:
runner = SlurmRunner(args, world_info_base64, resource_pool)
elif args.launcher == MOSAICML_LAUNCHER:
runner = MosaicMLRunner(args, world_info_base64)
else:
raise NotImplementedError(f"Unknown launcher {args.launcher}")

Expand All @@ -367,11 +369,10 @@ def main(args=None):
for var in fd.readlines():
key, val = var.split('=')
runner.add_export(key, val)

cmd = runner.get_cmd(env, active_resources)

logger.info("cmd = {}".format(' '.join(cmd)))
result = subprocess.Popen(cmd, env=env)
result = subprocess.Popen(cmd, env=dict(env, **runner.exports))
result.wait()

# In case of failure must propagate the error-condition back to the caller (usually shell). The
Expand Down