Enable deserializing protos > 64MB in length.

Update protobuf commit
Change: 114990608

Author: keveman

google/protobuf

@@ -251,6 +251,17 @@ py_test(
     ],
 )
 
+py_test(
+    name = "proto_test",
+    srcs = ["framework/proto_test.py"],
+    main = "framework/proto_test.py",
+    srcs_version = "PY2AND3",
+    deps = [
+        ":framework_test_lib",
+        "//tensorflow:tensorflow_py",
+    ],
+)
+
 tf_gen_op_wrapper_py(
     name = "functional_ops",
     out = "ops/gen_functional_ops.py",

tensorflow/python/BUILD

@@ -0,0 +1,40 @@
+# Copyright 2015 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Protobuf related tests."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+import tensorflow as tf
+
+class ProtoTest(tf.test.TestCase):
+
+  def testLargeProto(self):
+    # create a constant of size > 64MB.
+    a = tf.constant(np.zeros([1024, 1024, 17]))
+    # Serialize the resulting graph def.
+    gdef = a.op.graph.as_graph_def()
+    serialized = gdef.SerializeToString()
+    unserialized = tf.Graph().as_graph_def()
+    # Deserialize back. Protobuf python library should support
+    # protos larger than 64MB.
+    unserialized.ParseFromString(serialized)
+    self.assertProtoEquals(unserialized, gdef)
+
+
+if __name__ == "__main__":
+  tf.test.main()

tensorflow/python/framework/proto_test.py

@@ -3,6 +3,7 @@ build:cuda --crosstool_top=//third_party/gpus/crosstool
 build --force_python=py$PYTHON_MAJOR_VERSION
 build --python$PYTHON_MAJOR_VERSION_path=$PYTHON_BINARY
 build --define=use_fast_cpp_protos=true
+build --define=allow_oversize_protos=true
 
 build --spawn_strategy=standalone
 test --spawn_strategy=standalone