WIP: Dev/support multi modes feature

client/launcher.py

@@ -159,7 +159,7 @@ def confirm(prompt=None, resp=False):
                          "help": 'options selected to run the service'}],
     ['-r', '--resource',
      {"help": "alternatively to `options`, resource name to use"}],
-    ['-g', '--gpus', {"type": int, "default": 1, "help": 'number of gpus'}],
+    ['-g', '--gpus', {"type": int, "help": 'number of gpus'}],
     ['-c', '--cpus', {"type": int,
                       "help": 'number of cpus - if not provided, will be obtained '
                               'from pool config'}],
@@ -187,6 +187,8 @@ def confirm(prompt=None, resp=False):
 for arg in exec_arguments:
     parser_exec.add_argument(*arg[:-1], **arg[-1])
 parser_exec.add_argument('docker_command', type=str, nargs='*', help='Docker command')
+parser_exec.add_argument('-e', '--entity_owner', help='entity owner')
+parser_exec.add_argument('--dependency', help='dependency task (will launch after this task is terminated)')
 
 parser_launch = subparsers.add_parser('launch',
                                       help='launch a task on the service associated'
@@ -208,8 +210,7 @@ def confirm(prompt=None, resp=False):
                            help='options selected to run the service')
 parser_launch.add_argument('-r', '--resource',
                            help="alternatively to `options`, resource name to use")
-parser_launch.add_argument('-g', '--gpus', type=int, default=1,
-                           help='number of gpus')
+parser_launch.add_argument('-g', '--gpus', type=int, help='number of gpus')
 parser_launch.add_argument('-c', '--cpus', type=int, help='number of cpus - if not provided, '
                                                           'will be obtained from pool config')
 parser_launch.add_argument('-w', '--wait_after_launch', default=2, type=int,
@@ -236,6 +237,8 @@ def confirm(prompt=None, resp=False):
 parser_launch.add_argument('--notransasrelease', action='store_true',
                            help='don\'t run translate as release (image >= 1.8.0)')
 parser_launch.add_argument('docker_command', type=str, nargs='*', help='Docker command')
+parser_launch.add_argument('--tags', nargs='*', help='model tags')
+parser_launch.add_argument('--dependency', help='dependency task (will launch after this task is terminated)')
 
 parser_list_tasks = subparsers_tasks.add_parser('list',
                                                 help='{lt} list tasks matching prefix pattern')
@@ -465,6 +468,12 @@ def process_request(service_list, cmd, subcmd, is_json, args, auth=None):
         if args.service not in service_list:
             raise ValueError("ERROR: service '%s' not defined" % args.service)
 
+        if args.gpus is None:
+            if "train" in args.docker_command:
+                args.gpus = 1
+            else:
+                args.gpus = 0
+
         if args.gpus < 0:
             raise ValueError("ERROR: ngpus must be >= 0")
 
@@ -493,6 +502,8 @@ def process_request(service_list, cmd, subcmd, is_json, args, auth=None):
             content["name"] = args.name
         if args.priority:
             content["priority"] = args.priority
+        if args.dependency:
+            content["dependency"] = args.dependency
 
         if cmd == "task" and subcmd == "launch":
             if args.iterations:
@@ -516,6 +527,15 @@ def process_request(service_list, cmd, subcmd, is_json, args, auth=None):
                 content["totuminer"] = [(_parse_local_filename(i, files),
                                          o) for (i, o) in ARGS.totuminer]
 
+            if args.tags:
+                content['tags'] = []
+                for tag in args.tags:
+                    tmp = {'tag': tag}
+                    if ':' in tag:
+                        entity, tag_name = tag.split(':')
+                        tmp = {'entity': entity, 'tag': tag_name}
+                    content['tags'].append(tmp)
+
         LOGGER.debug("sending request: %s", json.dumps(content))
 
         launch_url = os.path.join(args.url, "task/launch", args.service)