Merge pull request #3580 from eaidova/ea/torch_version

omz: update torch dependency

Author: Wovchena

models/public/detr-resnet50/model.yml

@@ -68,6 +68,11 @@ postprocessing:
     file: models/backbone.py
     pattern: 'pretrained=is_main_process\(\)'
     replacement: 'pretrained=False'
+  - $type: regex_replace
+    file: util/misc.py
+    pattern: 'if float\(torchvision\.__version__\[\:3\]\) < 0\.7\:'
+    replacement: |
+        if float(torchvision.__version__.rsplit('.', 2)[1]) < 7:
 conversion_to_onnx_args:
   - --model-path=$config_dir
   - --model-path=$dl_dir

models/public/fastseg-large/model.yml

@@ -60,6 +60,10 @@ postprocessing:
     pattern: 'from .efficientnet'
     replacement: '# \g<0>'
     file: model/fastseg/model/utils.py
+  - $type: regex_replace
+    pattern: 'from torch._six import container_abcs'
+    replacement: 'import collections.abc as container_abcs'
+    file: model/fastseg/model/utils.py
 
   # disable unnecessary downloads of pretrained MobileNet weights
   - $type: regex_replace

models/public/fastseg-small/model.yml

@@ -60,7 +60,11 @@ postprocessing:
     pattern: 'from .efficientnet'
     replacement: '# \g<0>'
     file: model/fastseg/model/utils.py
-
+  # replace outdated interface usage
+  - $type: regex_replace
+    pattern: 'from torch._six import container_abcs'
+    replacement: 'import collections.abc as container_abcs'
+    file: model/geffnet/conv2d_layers.py
   # disable unnecessary downloads of pretrained MobileNet weights
   - $type: regex_replace
     pattern: '\(pretrained=True\)'

models/public/pspnet-pytorch/model.yml

@@ -108,6 +108,26 @@ postprocessing:
     pattern: 'import regex as re'
     replacement: 'import re'
     file: models/mmcv-1.2.0/mmcv/utils/config.py
+  - $type: regex_replace
+    pattern: 'from torch\.onnx\.symbolic_registry import register_op'
+    replacement: 'from torch.onnx import register_custom_op_symbolic'
+    file: models/mmcv-1.2.0/mmcv/onnx/symbolic.py
+  - $type: regex_replace
+    pattern: 'register_op\('
+    replacement: "register_custom_op_symbolic('::' + "
+    file: models/mmcv-1.2.0/mmcv/onnx/symbolic.py
+  - $type: regex_replace
+    pattern: "'', opset"
+    replacement: 'opset'
+    file: models/mmcv-1.2.0/mmcv/onnx/symbolic.py
+  - $type: regex_replace
+    pattern: "if layer_type == 'SyncBN':"
+    replacement: "if layer_type == 'SyncBN' and hasattr(layer, '_specify_ddp_gpu_num'):"
+    file: models/mmcv-1.2.0/mmcv/cnn/bricks/norm.py
+  - $type: regex_replace
+    pattern: 'super\(\)\._specify_ddp_gpu_num\(gpu_size\)'
+    replacement: 'pass'
+    file: models/mmcv-1.2.0/mmcv/utils/parrots_wrapper.py
 conversion_to_onnx_args:
   - --model-path=$config_dir
   - --model-path=$dl_dir/models

models/public/swin-tiny-patch4-window7-224/model.py

@@ -19,7 +19,10 @@
 
 
 def create_model(weights):
-    torch.onnx.symbolic_registry.register_op('roll', roll, '', version=11)
+    try:
+        torch.onnx.symbolic_registry.register_op('roll', roll, '', version=11)
+    except AttributeError:
+        torch.onnx.register_custom_op_symbolic('::roll', roll, 11)
     model = swin_tiny_patch4_window7_224()
 
     checkpoint = torch.load(weights, map_location='cpu')['model']

tools/model_tools/requirements-pytorch.in

@@ -1,5 +1,5 @@
 onnx<=1.12,>=1.8.1
 scipy~=1.5.4           # via torchvision
-torch==1.8.1
-torchvision==0.9.1
+torch>=1.8.1,<=1.13.0
+torchvision>=0.9.1,<=0.14.0
 yacs>=0.1.8