Merge pull request #1 from PaddlePaddle/develop

更新数据

x2paddle/onnx_infer.py

-import onnxruntime as rt
 import os
 import sys
 import numpy as np
@@ -19,6 +18,17 @@ def arg_parser():
 
 
 def main():
+    try:
+        import onnxruntime as rt
+        version = rt.__version__
+        if version != '0.4.0':
+            print("onnxruntime==0.4.0 is required")
+            return
+    except:
+        print(
+            "onnxruntime is not installed, use \"pip install onnxruntime==0.4.0\"."
+        )
+        return
     parser = arg_parser()
     args = parser.parse_args()
 

x2paddle/op_mapper/tf_op_mapper.py

@@ -591,7 +591,7 @@ class TFOpMapper(OpMapper):
         # to change [192, -1]->[-1, 192], allways put -1 in the first dimension
         # optimization for Paddle-Lite
         in_shape = input.out_shapes[0]
-        if is_variable and in_shape.count(-1) < 1:
+        if not is_variable and in_shape.count(-1) < 1:
             total_size = 1
             for i in range(len(in_shape)):
                 total_size *= in_shape[i]