Add warning for non-cpp protobuf (#1570)

* Add fixes for python protobuf

Signed-off-by: Tom Wildenhain <[email protected]>

* Add warning for non-cpp protobuf

Signed-off-by: Tom Wildenhain <[email protected]>

Author: TomWildenhain-Microsoft

tests/test_optimizers.py

@@ -59,7 +59,7 @@ def _make_onnx_const(np_val, output_name):
                 name=output_name,
                 data_type=utils.map_numpy_to_onnx_dtype(np_val.dtype),
                 dims=np_val.shape,
-                vals=np_val.flatten().astype(np_val.dtype),
+                vals=np_val.flatten().astype(np_val.dtype).tolist(),
             ),
         )
         return node
@@ -1514,7 +1514,7 @@ def test_identity_in_subgraph_non_graph_output(self):
                 name='iterate_num_value',
                 data_type=TensorProto.INT64,
                 dims=iter_num_value.shape,
-                vals=iter_num_value.flatten().astype(np.int64),
+                vals=iter_num_value.flatten().astype(np.int64).tolist(),
             ),
         )
 
@@ -1527,7 +1527,7 @@ def test_identity_in_subgraph_non_graph_output(self):
                 name='cond_value',
                 data_type=TensorProto.BOOL,
                 dims=iter_num_value.shape,
-                vals=cond_value.flatten().astype(np.bool),
+                vals=cond_value.flatten().astype(np.bool).tolist(),
             ),
         )
 

tf2onnx/convert.py

@@ -202,6 +202,10 @@ def main():
     outputs = None
     model_path = None
 
+    if not utils.is_cpp_protobuf():
+        logger.warning("***IMPORTANT*** Installed protobuf is not cpp accelerated. Conversion will be extremely slow. "
+                       "See https://github.com/onnx/tensorflow-onnx/issues/1557")
+
     if args.load_op_libraries:
         for op_path in args.load_op_libraries:
             tf.load_op_library(op_path)

tf2onnx/onnx_opset/reduction.py

@@ -277,7 +277,7 @@ def any_version(cls, opset, ctx, node, **kwargs):
         max_int64 = int(utils.get_max_value(np.int64))
         identity_shape = GraphBuilder(ctx).make_slice(
             {'data': data_shape, 'starts': [1], 'ends': [max_int64], 'axes': [0]})
-        id_tensor = helper.make_tensor("value", ctx.get_dtype(data_inp), dims=[1], vals=[identity_value])
+        id_tensor = helper.make_tensor("value", ctx.get_dtype(data_inp), dims=[1], vals=[identity_value.tolist()])
         identity = ctx.make_node("ConstantOfShape", [identity_shape], {'value': id_tensor}).output[0]
         id_unsq = GraphBuilder(ctx).make_unsqueeze({'data': identity, 'axes': [0]})
         data_with_id = ctx.make_node("Concat", [data_inp, id_unsq], attr={'axis': 0}).output[0]

tf2onnx/utils.py

@@ -9,6 +9,7 @@
 import re
 import shutil
 import tempfile
+import types
 import zipfile
 import logging
 
@@ -230,6 +231,10 @@ def make_sure(bool_val, error_msg, *args):
         raise ValueError("make_sure failure: " + error_msg % args)
 
 
+def is_cpp_protobuf():
+    return isinstance(ModelProto().ParseFromString, types.BuiltinFunctionType)
+
+
 def construct_graph_from_nodes(parent_g, nodes, outputs, shapes, dtypes):
     """Construct Graph from nodes and outputs with specified shapes and dtypes."""
     # pylint: disable=protected-access