downloader: remove the --config option

It's been deprecated for two releases now; time to get rid of it.

Author: Roman Donchenko

tools/downloader/README.md

@@ -425,18 +425,6 @@ face-detection-retail-0005
 
 Either `--print_all` or one of the filter options must be specified.
 
-Deprecated options
-------------------
-
-In earlier releases, the tools used a single configuration file instead of
-per-model configuration files. For compatibility, loading such a file is still
-supported. However, this feature is deprecated and will be removed in a future release.
-
-To load a configuration file in the old format, use the `-c`/`--config` option:
-
-```sh
-./TOOL.py --all --config my-config.yml
-```
 __________
 
 OpenVINO is a trademark of Intel Corporation or its subsidiaries in the U.S.

tools/downloader/common.py

@@ -400,45 +400,26 @@ def load_models(args):
     models = []
     model_names = set()
 
-    def add_model(model):
-        models.append(model)
+    model_root = (Path(__file__).resolve().parent / '../../models').resolve()
 
-        if models[-1].name in model_names:
-            raise DeserializationError(
-                'Duplicate model name "{}"'.format(models[-1].name))
-        model_names.add(models[-1].name)
+    for config_path in sorted(model_root.glob('**/model.yml')):
+        subdirectory = config_path.parent.relative_to(model_root)
 
-    if args.config is None: # per-model configs
-        model_root = (Path(__file__).resolve().parent / '../../models').resolve()
+        with config_path.open('rb') as config_file, \
+                deserialization_context('In config "{}"'.format(config_path)):
 
-        for config_path in sorted(model_root.glob('**/model.yml')):
-            subdirectory = config_path.parent.relative_to(model_root)
+            model = yaml.safe_load(config_file)
 
-            with config_path.open('rb') as config_file, \
-                    deserialization_context('In config "{}"'.format(config_path)):
+            for bad_key in ['name', 'subdirectory']:
+                if bad_key in model:
+                    raise DeserializationError('Unsupported key "{}"'.format(bad_key))
 
-                model = yaml.safe_load(config_file)
+            models.append(Model.deserialize(model, subdirectory.name, subdirectory))
 
-                for bad_key in ['name', 'subdirectory']:
-                    if bad_key in model:
-                        raise DeserializationError('Unsupported key "{}"'.format(bad_key))
-
-                add_model(Model.deserialize(model, subdirectory.name, subdirectory))
-
-    else: # monolithic config
-        print('########## Warning: the --config option is deprecated and will be removed in a future release',
-            file=sys.stderr)
-        with args.config.open('rb') as config_file, \
-                deserialization_context('In config "{}"'.format(args.config)):
-            for i, model in enumerate(yaml.safe_load(config_file)['topologies']):
-                with deserialization_context('In model #{}'.format(i)):
-                    name = validate_string('"name"', model['name'])
-                    if not name: raise DeserializationError('"name": must not be empty')
-
-                with deserialization_context('In model "{}"'.format(name)):
-                    subdirectory = validate_relative_path('"output"', model['output'])
-
-                add_model(Model.deserialize(model, name, subdirectory))
+            if models[-1].name in model_names:
+                raise DeserializationError(
+                    'Duplicate model name "{}"'.format(models[-1].name))
+            model_names.add(models[-1].name)
 
     return models
 

tools/downloader/converter.py

@@ -119,8 +119,6 @@ def num_jobs_arg(value_str):
 
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument('-c', '--config', type=Path, metavar='CONFIG.YML',
-        help='model configuration file (deprecated)')
     parser.add_argument('-d', '--download_dir', type=Path, metavar='DIR',
         default=Path.cwd(), help='root of the directory tree with downloaded model files')
     parser.add_argument('-o', '--output_dir', type=Path, metavar='DIR',

tools/downloader/downloader.py

@@ -200,8 +200,6 @@ def positive_int_arg(value_str):
 
 def main():
     parser = DownloaderArgumentParser()
-    parser.add_argument('-c', '--config', type=Path, metavar='CONFIG.YML',
-        help='model configuration file (deprecated)')
     parser.add_argument('--name', metavar='PAT[,PAT...]',
         help='download only models whose names match at least one of the specified patterns')
     parser.add_argument('--list', type=Path, metavar='FILE.LST',

tools/downloader/info_dumper.py

@@ -36,8 +36,6 @@ def to_info(model):
 
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument('-c', '--config', type=Path, metavar='CONFIG.YML',
-        help='model configuration file (deprecated)')
     parser.add_argument('--name', metavar='PAT[,PAT...]',
         help='only dump info for models whose names match at least one of the specified patterns')
     parser.add_argument('--list', type=Path, metavar='FILE.LST',