Merge remote-tracking branch 'upstream/master' into jignparm/optimize_transpose_multiply

jignparm · jignparm · commit c53936893a6c · 2020-03-17T11:59:40.000Z
diff --git a/tf2onnx/constants.py b/tf2onnx/constants.py
@@ -41,5 +41,5 @@
 # Mapping opset to IR version.
 # When adding here, make sure that the IR changes don't impact that we do.
 OPSET_TO_IR_VERSION = {
-    1: 3, 2:3, 3: 3, 4: 4, 5: 3, 6:3, 7:3, 8:4, 9:4, 10:5, 11:6, 12:7
+    1: 3, 2: 3, 3: 3, 4: 4, 5: 3, 6: 3, 7: 3, 8: 4, 9: 4, 10: 5, 11: 6, 12: 7
 }
diff --git a/tf2onnx/graph.py b/tf2onnx/graph.py
@@ -1042,7 +1042,7 @@ def make_model(self, graph_doc, optimize=False, graph_name="tf2onnx", **kwargs):
         # set the IR version based on opset
         try:
             model_proto.ir_version = constants.OPSET_TO_IR_VERSION.get(self.opset, model_proto.ir_version)
-        except:
+        except: # pylint: disable=bare-except
             logger.error("ir_version override failed - install the latest onnx version")
 
         # optimize the model proto.
diff --git a/tutorials/ConvertingSSDMobilenetToONNX.ipynb b/tutorials/ConvertingSSDMobilenetToONNX.ipynb
@@ -503,4 +503,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
+}
diff --git a/tutorials/efficientnet-lite.ipynb b/tutorials/efficientnet-lite.ipynb

Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,5 @@`
`41`	`41`	`# Mapping opset to IR version.`
`42`	`42`	`# When adding here, make sure that the IR changes don't impact that we do.`
`43`	`43`	`OPSET_TO_IR_VERSION = {`
`44`		`- 1: 3, 2:3, 3: 3, 4: 4, 5: 3, 6:3, 7:3, 8:4, 9:4, 10:5, 11:6, 12:7`
	`44`	`+ 1: 3, 2: 3, 3: 3, 4: 4, 5: 3, 6: 3, 7: 3, 8: 4, 9: 4, 10: 5, 11: 6, 12: 7`
`45`	`45`	`}`