Merge pull request #4153 from terryykoo/master

Export @195097388.

research/syntaxnet/dragnn/protos/runtime.proto

@@ -16,7 +16,7 @@ message MasterPerformanceSettings {
 
   // Maximum size of the free list in the SessionStatePool.  NB: The default
   // value may occasionally change.
-  optional uint64 session_state_pool_max_free_states = 1 [default = 4];
+  optional uint64 session_state_pool_max_free_states = 1 [default = 16];
 }
 
 // As above, but for component-specific performance tuning settings.

research/syntaxnet/dragnn/protos/trace.proto

@@ -53,6 +53,8 @@ message ComponentStepTrace {
   // Set to true once the step is finished. (This allows us to open a step after
   // each transition, without having to know if it will be used.)
   optional bool step_finished = 6 [default = false];
+
+  extensions 1000 to max;
 }
 
 // The traces for all steps for a single Component.

research/syntaxnet/dragnn/python/dragnn_model_saver_lib.py

@@ -164,6 +164,7 @@ def export_to_graph(master_spec,
                     export_path,
                     external_graph,
                     export_moving_averages,
+                    build_runtime_graph,
                     signature_name='model'):
   """Restores a model and exports it in SavedModel form.
 
@@ -177,6 +178,7 @@ def export_to_graph(master_spec,
     export_path: Path to export the SavedModel to.
     external_graph: A tf.Graph() object to build the graph inside.
     export_moving_averages: Whether to export the moving average parameters.
+    build_runtime_graph: Whether to build a graph for use by the runtime.
     signature_name: Name of the signature to insert.
   """
   tf.logging.info(
@@ -189,7 +191,7 @@ def export_to_graph(master_spec,
     hyperparam_config.use_moving_average = export_moving_averages
     builder = graph_builder.MasterBuilder(master_spec, hyperparam_config)
     post_restore_hook = builder.build_post_restore_hook()
-    annotation = builder.add_annotation()
+    annotation = builder.add_annotation(build_runtime_graph=build_runtime_graph)
     builder.add_saver()
 
   # Resets session.