From a44996a84b24c43cca40c685a009fd59275755ab Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Thu, 3 May 2018 02:45:29 +0200 Subject: [PATCH] Add go_package to proto definition files (#17262) * Add go_package to proto definition files This fix tries to address the issue raised in 16282 by add go_package to proto files, so that generated go files have correct path. This fix fixes 16282. Signed-off-by: Yong Tang * Add go_package to proto definition in tensorflow/core/framework Signed-off-by: Yong Tang * Add go_package to proto definition in tensorflow/core/example Signed-off-by: Yong Tang * Add go_package to proto definition in tensorflow/core/example Signed-off-by: Yong Tang --- tensorflow/core/example/example.proto | 2 +- tensorflow/core/example/example_parser_configuration.proto | 1 + tensorflow/core/example/feature.proto | 2 +- tensorflow/core/framework/allocation_description.proto | 1 + tensorflow/core/framework/api_def.proto | 1 + tensorflow/core/framework/attr_value.proto | 2 +- tensorflow/core/framework/cost_graph.proto | 2 +- tensorflow/core/framework/device_attributes.proto | 1 + tensorflow/core/framework/function.proto | 2 +- tensorflow/core/framework/graph.proto | 2 +- tensorflow/core/framework/graph_transfer_info.proto | 2 +- tensorflow/core/framework/iterator.proto | 1 + tensorflow/core/framework/kernel_def.proto | 2 +- tensorflow/core/framework/log_memory.proto | 2 +- tensorflow/core/framework/node_def.proto | 2 +- tensorflow/core/framework/op_def.proto | 2 +- tensorflow/core/framework/reader_base.proto | 1 + tensorflow/core/framework/remote_fused_graph_execute_info.proto | 2 +- tensorflow/core/framework/resource_handle.proto | 1 + tensorflow/core/framework/step_stats.proto | 2 +- tensorflow/core/framework/summary.proto | 2 +- tensorflow/core/framework/tensor.proto | 2 +- tensorflow/core/framework/tensor_description.proto | 2 +- tensorflow/core/framework/tensor_shape.proto | 1 + tensorflow/core/framework/tensor_slice.proto | 1 + tensorflow/core/framework/types.proto | 1 + tensorflow/core/framework/variable.proto | 1 + tensorflow/core/framework/versions.proto | 1 + tensorflow/core/lib/core/error_codes.proto | 1 + tensorflow/core/protobuf/cluster.proto | 1 + tensorflow/core/protobuf/config.proto | 2 +- tensorflow/core/protobuf/control_flow.proto | 1 + tensorflow/core/protobuf/critical_section.proto | 1 + tensorflow/core/protobuf/debug.proto | 1 + tensorflow/core/protobuf/device_properties.proto | 1 + tensorflow/core/protobuf/master.proto | 2 +- tensorflow/core/protobuf/master_service.proto | 2 +- tensorflow/core/protobuf/meta_graph.proto | 2 +- tensorflow/core/protobuf/named_tensor.proto | 2 +- tensorflow/core/protobuf/queue_runner.proto | 2 +- tensorflow/core/protobuf/rewriter_config.proto | 1 + tensorflow/core/protobuf/saved_model.proto | 2 +- tensorflow/core/protobuf/saver.proto | 1 + tensorflow/core/protobuf/tensor_bundle.proto | 2 +- tensorflow/core/protobuf/tensorflow_server.proto | 2 +- tensorflow/core/protobuf/worker.proto | 2 +- tensorflow/core/protobuf/worker_service.proto | 2 +- 47 files changed, 47 insertions(+), 27 deletions(-) diff --git a/tensorflow/core/example/example.proto b/tensorflow/core/example/example.proto index b2b7232..e7142a4 100644 --- a/tensorflow/core/example/example.proto +++ b/tensorflow/core/example/example.proto @@ -7,7 +7,7 @@ option cc_enable_arenas = true; option java_outer_classname = "ExampleProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.example"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/example"; package tensorflow; // An Example is a mostly-normalized data format for storing data for diff --git a/tensorflow/core/example/example_parser_configuration.proto b/tensorflow/core/example/example_parser_configuration.proto index 15846c0..b2c115d 100644 --- a/tensorflow/core/example/example_parser_configuration.proto +++ b/tensorflow/core/example/example_parser_configuration.proto @@ -6,6 +6,7 @@ option cc_enable_arenas = true; option java_outer_classname = "ExampleParserConfigurationProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.example"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/example"; package tensorflow; import "tensorflow/core/framework/tensor_shape.proto"; diff --git a/tensorflow/core/example/feature.proto b/tensorflow/core/example/feature.proto index da3dc59..6d81974 100644 --- a/tensorflow/core/example/feature.proto +++ b/tensorflow/core/example/feature.proto @@ -58,7 +58,7 @@ option cc_enable_arenas = true; option java_outer_classname = "FeatureProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.example"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/example"; package tensorflow; // Containers to hold repeated fundamental values. diff --git a/tensorflow/core/framework/allocation_description.proto b/tensorflow/core/framework/allocation_description.proto index bb1037c..64133b0 100644 --- a/tensorflow/core/framework/allocation_description.proto +++ b/tensorflow/core/framework/allocation_description.proto @@ -5,6 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "AllocationDescriptionProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; message AllocationDescription { // Total number of bytes requested diff --git a/tensorflow/core/framework/api_def.proto b/tensorflow/core/framework/api_def.proto index 98c38ef..cce02d8 100644 --- a/tensorflow/core/framework/api_def.proto +++ b/tensorflow/core/framework/api_def.proto @@ -8,6 +8,7 @@ option cc_enable_arenas = true; option java_outer_classname = "ApiDefProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; import "tensorflow/core/framework/attr_value.proto"; // Used to specify and override the default API & behavior in the diff --git a/tensorflow/core/framework/attr_value.proto b/tensorflow/core/framework/attr_value.proto index 62f0a905..054e3ec 100644 --- a/tensorflow/core/framework/attr_value.proto +++ b/tensorflow/core/framework/attr_value.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "AttrValueProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; import "tensorflow/core/framework/tensor.proto"; import "tensorflow/core/framework/tensor_shape.proto"; import "tensorflow/core/framework/types.proto"; diff --git a/tensorflow/core/framework/cost_graph.proto b/tensorflow/core/framework/cost_graph.proto index 7885b01..19d765c 100644 --- a/tensorflow/core/framework/cost_graph.proto +++ b/tensorflow/core/framework/cost_graph.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "CostGraphProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; import "tensorflow/core/framework/tensor_shape.proto"; import "tensorflow/core/framework/types.proto"; diff --git a/tensorflow/core/framework/device_attributes.proto b/tensorflow/core/framework/device_attributes.proto index 0b3c0d5..44236ca 100644 --- a/tensorflow/core/framework/device_attributes.proto +++ b/tensorflow/core/framework/device_attributes.proto @@ -5,6 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "DeviceAttributesProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; message InterconnectLink { int32 device_id = 1; diff --git a/tensorflow/core/framework/function.proto b/tensorflow/core/framework/function.proto index 72e3c43..e69d393 100644 --- a/tensorflow/core/framework/function.proto +++ b/tensorflow/core/framework/function.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "FunctionProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; import "tensorflow/core/framework/attr_value.proto"; import "tensorflow/core/framework/node_def.proto"; import "tensorflow/core/framework/op_def.proto"; diff --git a/tensorflow/core/framework/graph.proto b/tensorflow/core/framework/graph.proto index 7d6e16d..76d3589 100644 --- a/tensorflow/core/framework/graph.proto +++ b/tensorflow/core/framework/graph.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "GraphProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; import "tensorflow/core/framework/node_def.proto"; import "tensorflow/core/framework/function.proto"; import "tensorflow/core/framework/versions.proto"; diff --git a/tensorflow/core/framework/graph_transfer_info.proto b/tensorflow/core/framework/graph_transfer_info.proto index 41dd54d..232297d 100644 --- a/tensorflow/core/framework/graph_transfer_info.proto +++ b/tensorflow/core/framework/graph_transfer_info.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "GraphTransferInfoProto"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; import "tensorflow/core/framework/types.proto"; message GraphTransferNodeInput { diff --git a/tensorflow/core/framework/iterator.proto b/tensorflow/core/framework/iterator.proto index 7e5f5ea..f015342 100644 --- a/tensorflow/core/framework/iterator.proto +++ b/tensorflow/core/framework/iterator.proto @@ -5,6 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "IteratorProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.util"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; // Protocol buffer representing the metadata for an iterator's state stored // as a Variant tensor. diff --git a/tensorflow/core/framework/kernel_def.proto b/tensorflow/core/framework/kernel_def.proto index 65e9ef0..a17b9c8 100644 --- a/tensorflow/core/framework/kernel_def.proto +++ b/tensorflow/core/framework/kernel_def.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "KernelDefProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; import "tensorflow/core/framework/attr_value.proto"; message KernelDef { diff --git a/tensorflow/core/framework/log_memory.proto b/tensorflow/core/framework/log_memory.proto index d1e1263..7f37ead 100644 --- a/tensorflow/core/framework/log_memory.proto +++ b/tensorflow/core/framework/log_memory.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "LogMemoryProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; import "tensorflow/core/framework/tensor_description.proto"; message MemoryLogStep { diff --git a/tensorflow/core/framework/node_def.proto b/tensorflow/core/framework/node_def.proto index 8fcee32..0a095f9 100644 --- a/tensorflow/core/framework/node_def.proto +++ b/tensorflow/core/framework/node_def.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "NodeProto"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; import "tensorflow/core/framework/attr_value.proto"; message NodeDef { diff --git a/tensorflow/core/framework/op_def.proto b/tensorflow/core/framework/op_def.proto index ca0e5e7..aea2d2b 100644 --- a/tensorflow/core/framework/op_def.proto +++ b/tensorflow/core/framework/op_def.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "OpDefProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; import "tensorflow/core/framework/attr_value.proto"; import "tensorflow/core/framework/types.proto"; diff --git a/tensorflow/core/framework/reader_base.proto b/tensorflow/core/framework/reader_base.proto index 1b8b965..9e187cf 100644 --- a/tensorflow/core/framework/reader_base.proto +++ b/tensorflow/core/framework/reader_base.proto @@ -5,6 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "ReaderBaseProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; // For serializing and restoring the state of ReaderBase, see // reader_base.h for details. diff --git a/tensorflow/core/framework/remote_fused_graph_execute_info.proto b/tensorflow/core/framework/remote_fused_graph_execute_info.proto index 946da40..1007272 100644 --- a/tensorflow/core/framework/remote_fused_graph_execute_info.proto +++ b/tensorflow/core/framework/remote_fused_graph_execute_info.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "RemoteFusedGraphExecuteInfoProto"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; import "tensorflow/core/framework/graph.proto"; import "tensorflow/core/framework/tensor_shape.proto"; import "tensorflow/core/framework/types.proto"; diff --git a/tensorflow/core/framework/resource_handle.proto b/tensorflow/core/framework/resource_handle.proto index b192133..a54d3d9 100644 --- a/tensorflow/core/framework/resource_handle.proto +++ b/tensorflow/core/framework/resource_handle.proto @@ -5,6 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "ResourceHandle"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; // Protocol buffer representing a handle to a tensorflow resource. Handles are // not valid across executions, but can be serialized back and forth from within diff --git a/tensorflow/core/framework/step_stats.proto b/tensorflow/core/framework/step_stats.proto index 65c8089..d98999c 100644 --- a/tensorflow/core/framework/step_stats.proto +++ b/tensorflow/core/framework/step_stats.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "StepStatsProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; import "tensorflow/core/framework/allocation_description.proto"; import "tensorflow/core/framework/tensor_description.proto"; diff --git a/tensorflow/core/framework/summary.proto b/tensorflow/core/framework/summary.proto index 55879f8..532e4fc 100644 --- a/tensorflow/core/framework/summary.proto +++ b/tensorflow/core/framework/summary.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "SummaryProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; import "tensorflow/core/framework/tensor.proto"; // Metadata associated with a series of Summary data diff --git a/tensorflow/core/framework/tensor.proto b/tensorflow/core/framework/tensor.proto index abbf16e..55921af 100644 --- a/tensorflow/core/framework/tensor.proto +++ b/tensorflow/core/framework/tensor.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "TensorProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; import "tensorflow/core/framework/resource_handle.proto"; import "tensorflow/core/framework/tensor_shape.proto"; import "tensorflow/core/framework/types.proto"; diff --git a/tensorflow/core/framework/tensor_description.proto b/tensorflow/core/framework/tensor_description.proto index 6ac3c1b..4c23c7e 100644 --- a/tensorflow/core/framework/tensor_description.proto +++ b/tensorflow/core/framework/tensor_description.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "TensorDescriptionProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; import "tensorflow/core/framework/types.proto"; import "tensorflow/core/framework/tensor_shape.proto"; import "tensorflow/core/framework/allocation_description.proto"; diff --git a/tensorflow/core/framework/tensor_shape.proto b/tensorflow/core/framework/tensor_shape.proto index 1ec3c53..286156a 100644 --- a/tensorflow/core/framework/tensor_shape.proto +++ b/tensorflow/core/framework/tensor_shape.proto @@ -5,6 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "TensorShapeProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; package tensorflow; diff --git a/tensorflow/core/framework/tensor_slice.proto b/tensorflow/core/framework/tensor_slice.proto index 24b0166..a5c366e 100644 --- a/tensorflow/core/framework/tensor_slice.proto +++ b/tensorflow/core/framework/tensor_slice.proto @@ -5,6 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "TensorSliceProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; package tensorflow; diff --git a/tensorflow/core/framework/types.proto b/tensorflow/core/framework/types.proto index e003fd0..03835d1 100644 --- a/tensorflow/core/framework/types.proto +++ b/tensorflow/core/framework/types.proto @@ -5,6 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "TypesProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; // LINT.IfChange enum DataType { diff --git a/tensorflow/core/framework/variable.proto b/tensorflow/core/framework/variable.proto index e0df01c..93ae423 100644 --- a/tensorflow/core/framework/variable.proto +++ b/tensorflow/core/framework/variable.proto @@ -5,6 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "VariableProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; // Protocol buffer representing a Variable. message VariableDef { diff --git a/tensorflow/core/framework/versions.proto b/tensorflow/core/framework/versions.proto index 7d5e58a..dd2ec55 100644 --- a/tensorflow/core/framework/versions.proto +++ b/tensorflow/core/framework/versions.proto @@ -5,6 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "VersionsProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework"; // Version information for a piece of serialized data // diff --git a/tensorflow/core/lib/core/error_codes.proto b/tensorflow/core/lib/core/error_codes.proto index b82d389..5ced65a 100644 --- a/tensorflow/core/lib/core/error_codes.proto +++ b/tensorflow/core/lib/core/error_codes.proto @@ -5,6 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "ErrorCodesProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/lib/core"; // The canonical error codes for TensorFlow APIs. // diff --git a/tensorflow/core/protobuf/cluster.proto b/tensorflow/core/protobuf/cluster.proto index 33c87ee..c696d34 100644 --- a/tensorflow/core/protobuf/cluster.proto +++ b/tensorflow/core/protobuf/cluster.proto @@ -20,6 +20,7 @@ option cc_enable_arenas = true; option java_outer_classname = "ClusterProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.distruntime"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; // This file contains protos to be used when defining a TensorFlow // cluster. diff --git a/tensorflow/core/protobuf/config.proto b/tensorflow/core/protobuf/config.proto index c1a0075..078e76e 100644 --- a/tensorflow/core/protobuf/config.proto +++ b/tensorflow/core/protobuf/config.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "ConfigProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; import "tensorflow/core/framework/cost_graph.proto"; import "tensorflow/core/framework/graph.proto"; import "tensorflow/core/framework/step_stats.proto"; diff --git a/tensorflow/core/protobuf/control_flow.proto b/tensorflow/core/protobuf/control_flow.proto index 3c05b4f..5f44878 100644 --- a/tensorflow/core/protobuf/control_flow.proto +++ b/tensorflow/core/protobuf/control_flow.proto @@ -5,6 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "ControlFlowProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; // Control flow context related protocol buffers. diff --git a/tensorflow/core/protobuf/critical_section.proto b/tensorflow/core/protobuf/critical_section.proto index 0b3f531..7954e7b 100644 --- a/tensorflow/core/protobuf/critical_section.proto +++ b/tensorflow/core/protobuf/critical_section.proto @@ -5,6 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "CriticalSectionProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; // Protocol buffer representing a CriticalSection. message CriticalSectionDef { diff --git a/tensorflow/core/protobuf/debug.proto b/tensorflow/core/protobuf/debug.proto index 56983f3..499900f 100644 --- a/tensorflow/core/protobuf/debug.proto +++ b/tensorflow/core/protobuf/debug.proto @@ -5,6 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "DebugProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; // EXPERIMENTAL. Option for watching a node. message DebugTensorWatch { diff --git a/tensorflow/core/protobuf/device_properties.proto b/tensorflow/core/protobuf/device_properties.proto index 3bd3015..11e1258 100644 --- a/tensorflow/core/protobuf/device_properties.proto +++ b/tensorflow/core/protobuf/device_properties.proto @@ -18,6 +18,7 @@ syntax = "proto3"; package tensorflow; option cc_enable_arenas = true; option java_outer_classname = "DevicePropertiesProtos"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; message DeviceProperties { // Device type (CPU, GPU, ...) diff --git a/tensorflow/core/protobuf/master.proto b/tensorflow/core/protobuf/master.proto index 96c9153..0302287 100644 --- a/tensorflow/core/protobuf/master.proto +++ b/tensorflow/core/protobuf/master.proto @@ -20,7 +20,7 @@ option cc_enable_arenas = true; option java_outer_classname = "DistributedRuntimeProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.distruntime"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; import "tensorflow/core/framework/device_attributes.proto"; import "tensorflow/core/framework/graph.proto"; import "tensorflow/core/framework/tensor.proto"; diff --git a/tensorflow/core/protobuf/master_service.proto b/tensorflow/core/protobuf/master_service.proto index 1170611..ce0e4f6 100644 --- a/tensorflow/core/protobuf/master_service.proto +++ b/tensorflow/core/protobuf/master_service.proto @@ -19,7 +19,7 @@ package tensorflow.grpc; option java_outer_classname = "MasterServiceProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.distruntime"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; import "tensorflow/core/protobuf/master.proto"; //////////////////////////////////////////////////////////////////////////////// diff --git a/tensorflow/core/protobuf/meta_graph.proto b/tensorflow/core/protobuf/meta_graph.proto index fd86c0d..75a2a88 100644 --- a/tensorflow/core/protobuf/meta_graph.proto +++ b/tensorflow/core/protobuf/meta_graph.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "MetaGraphProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; import "google/protobuf/any.proto"; import "tensorflow/core/framework/graph.proto"; diff --git a/tensorflow/core/protobuf/named_tensor.proto b/tensorflow/core/protobuf/named_tensor.proto index dd4976e..6e2f7fe 100644 --- a/tensorflow/core/protobuf/named_tensor.proto +++ b/tensorflow/core/protobuf/named_tensor.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "NamedTensorProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; import "tensorflow/core/framework/tensor.proto"; // A pair of tensor name and tensor values. diff --git a/tensorflow/core/protobuf/queue_runner.proto b/tensorflow/core/protobuf/queue_runner.proto index 05a48d0..f4df649 100644 --- a/tensorflow/core/protobuf/queue_runner.proto +++ b/tensorflow/core/protobuf/queue_runner.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "QueueRunnerProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; import "tensorflow/core/lib/core/error_codes.proto"; // Protocol buffer representing a QueueRunner. diff --git a/tensorflow/core/protobuf/rewriter_config.proto b/tensorflow/core/protobuf/rewriter_config.proto index 029b27c..a15ccdf 100644 --- a/tensorflow/core/protobuf/rewriter_config.proto +++ b/tensorflow/core/protobuf/rewriter_config.proto @@ -5,6 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "RewriterConfigProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; import "tensorflow/core/framework/attr_value.proto"; diff --git a/tensorflow/core/protobuf/saved_model.proto b/tensorflow/core/protobuf/saved_model.proto index c2595dd..03789d3 100644 --- a/tensorflow/core/protobuf/saved_model.proto +++ b/tensorflow/core/protobuf/saved_model.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "SavedModelProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.framework"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; import "tensorflow/core/protobuf/meta_graph.proto"; // SavedModel is the high level serialization format for TensorFlow Models. diff --git a/tensorflow/core/protobuf/saver.proto b/tensorflow/core/protobuf/saver.proto index a757d3f..4245386 100644 --- a/tensorflow/core/protobuf/saver.proto +++ b/tensorflow/core/protobuf/saver.proto @@ -5,6 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "SaverProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.util"; +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; // Protocol buffer representing the configuration of a Saver. message SaverDef { diff --git a/tensorflow/core/protobuf/tensor_bundle.proto b/tensorflow/core/protobuf/tensor_bundle.proto index 80e87f1..681c01b 100644 --- a/tensorflow/core/protobuf/tensor_bundle.proto +++ b/tensorflow/core/protobuf/tensor_bundle.proto @@ -5,7 +5,7 @@ option cc_enable_arenas = true; option java_outer_classname = "TensorBundleProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.util"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; import "tensorflow/core/framework/tensor_shape.proto"; import "tensorflow/core/framework/tensor_slice.proto"; import "tensorflow/core/framework/types.proto"; diff --git a/tensorflow/core/protobuf/tensorflow_server.proto b/tensorflow/core/protobuf/tensorflow_server.proto index 6199e70..be25804 100644 --- a/tensorflow/core/protobuf/tensorflow_server.proto +++ b/tensorflow/core/protobuf/tensorflow_server.proto @@ -23,7 +23,7 @@ option cc_enable_arenas = true; option java_outer_classname = "ServerProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.distruntime"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; // Defines the configuration of a single TensorFlow server. message ServerDef { // The cluster of which this server is a member. diff --git a/tensorflow/core/protobuf/worker.proto b/tensorflow/core/protobuf/worker.proto index 602f6a1..d714d85 100644 --- a/tensorflow/core/protobuf/worker.proto +++ b/tensorflow/core/protobuf/worker.proto @@ -20,7 +20,7 @@ option cc_enable_arenas = true; option java_outer_classname = "WorkerProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.distruntime"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; import "google/protobuf/any.proto"; import "tensorflow/core/framework/cost_graph.proto"; import "tensorflow/core/framework/step_stats.proto"; diff --git a/tensorflow/core/protobuf/worker_service.proto b/tensorflow/core/protobuf/worker_service.proto index 01c76c0..025fa7c 100644 --- a/tensorflow/core/protobuf/worker_service.proto +++ b/tensorflow/core/protobuf/worker_service.proto @@ -19,7 +19,7 @@ package tensorflow.grpc; option java_outer_classname = "WorkerServiceProtos"; option java_multiple_files = true; option java_package = "org.tensorflow.distruntime"; - +option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf"; import "tensorflow/core/protobuf/worker.proto"; //////////////////////////////////////////////////////////////////////////////// -- 2.7.4