Merge pull request #24294 from alexlyulkov:al/remove-torch7-from-dnn

Remove torch (old torch7) from dnn in 5.x #24294

Merge with https://github.com/opencv/opencv_extra/pull/1097

Completely removed torch (old torch7) from dnn:
- removed modules/dnn/src/torch directory that contained torch7 model parser
- removed readNetFromTorch() and readTorchBlob() public functions
- removed torch7 references from comments and help texts
- replaced links to t7 models by links to similar onnx models in js_style_transfer turtorial (similar to https://github.com/opencv/opencv/pull/24245/files)

samples/dnn/classification.py

@@ -16,7 +16,7 @@ def get_args_parser(func_args):
                         help='An optional path to file with preprocessing parameters.')
     parser.add_argument('--input',
                         help='Path to input image or video file. Skip this argument to capture frames from a camera.')
-    parser.add_argument('--framework', choices=['caffe', 'tensorflow', 'torch', 'darknet'],
+    parser.add_argument('--framework', choices=['caffe', 'tensorflow', 'darknet'],
                         help='Optional name of an origin framework of the model. '
                              'Detect it automatically if it does not set.')
     parser.add_argument('--std', nargs='*', type=float,

samples/dnn/common.hpp

@@ -77,7 +77,7 @@ std::string genPreprocArguments(const std::string& modelName, const std::string&
 {
     return genArgument("model", "Path to a binary file of model contains trained weights. "
                                 "It could be a file with extensions .caffemodel (Caffe), "
-                                ".pb (TensorFlow), .t7 or .net (Torch), .weights (Darknet), .bin (OpenVINO).",
+                                ".pb (TensorFlow), .weights (Darknet), .bin (OpenVINO).",
                        modelName, zooFile, 'm') +
            genArgument("config", "Path to a text file of model contains network configuration. "
                                  "It could be a file with extensions .prototxt (Caffe), .pbtxt (TensorFlow), .cfg (Darknet), .xml (OpenVINO).",

samples/dnn/common.py

@@ -62,7 +62,7 @@ def add_preproc_args(zoo, parser, sample):
     add_argument(zoo, parser, 'model', required=True,
                  help='Path to a binary file of model contains trained weights. '
                       'It could be a file with extensions .caffemodel (Caffe), '
-                      '.pb (TensorFlow), .t7 or .net (Torch), .weights (Darknet), .bin (OpenVINO)')
+                      '.pb (TensorFlow), .weights (Darknet), .bin (OpenVINO)')
     add_argument(zoo, parser, 'config',
                  help='Path to a text file of model contains network configuration. '
                       'It could be a file with extensions .prototxt (Caffe), .pbtxt or .config (TensorFlow), .cfg (Darknet), .xml (OpenVINO)')

samples/dnn/models.yml

@@ -151,21 +151,6 @@ googlenet:
 # Semantic segmentation models.
 ################################################################################
 
-# ENet road scene segmentation network from https://github.com/e-lab/ENet-training
-# Works fine for different input sizes.
-enet:
-  load_info:
-    url: "https://www.dropbox.com/s/tdde0mawbi5dugq/Enet-model-best.net?dl=1"
-    sha1: "b4123a73bf464b9ebe9cfc4ab9c2d5c72b161315"
-  model: "Enet-model-best.net"
-  mean: [0, 0, 0]
-  scale: 0.00392
-  width: 512
-  height: 256
-  rgb: true
-  classes: "enet-classes.txt"
-  sample: "segmentation"
-
 fcn8s:
   load_info:
     url: "http://dl.caffe.berkeleyvision.org/fcn8s-heavy-pascal.caffemodel"

samples/dnn/object_detection.py

@@ -24,7 +24,7 @@ parser.add_argument('--out_tf_graph', default='graph.pbtxt',
                     help='For models from TensorFlow Object Detection API, you may '
                          'pass a .config file which was used for training through --config '
                          'argument. This way an additional .pbtxt file with TensorFlow graph will be created.')
-parser.add_argument('--framework', choices=['caffe', 'tensorflow', 'torch', 'darknet', 'dldt'],
+parser.add_argument('--framework', choices=['caffe', 'tensorflow', 'darknet', 'dldt'],
                     help='Optional name of an origin framework of the model. '
                          'Detect it automatically if it does not set.')
 parser.add_argument('--thr', type=float, default=0.5, help='Confidence threshold')

samples/dnn/segmentation.py

@@ -14,7 +14,7 @@ parser = argparse.ArgumentParser(add_help=False)
 parser.add_argument('--zoo', default=os.path.join(os.path.dirname(os.path.abspath(__file__)), 'models.yml'),
                     help='An optional path to file with preprocessing parameters.')
 parser.add_argument('--input', help='Path to input image or video file. Skip this argument to capture frames from a camera.')
-parser.add_argument('--framework', choices=['caffe', 'tensorflow', 'torch', 'darknet'],
+parser.add_argument('--framework', choices=['caffe', 'tensorflow', 'darknet'],
                     help='Optional name of an origin framework of the model. '
                          'Detect it automatically if it does not set.')
 parser.add_argument('--colors', help='Optional path to a text file with colors for an every class. '