Move the data/experimental proto files into the proto top level directory. This effort is a part of the build file and package cleanup.

PiperOrigin-RevId: 342975430
Change-Id: I009ef3bc1d963a8cd29e456e32b97127e545d32b
This commit is contained in:
Amit Patankar 2020-11-17 16:56:50 -08:00 committed by TensorFlower Gardener
parent 042f6923fe
commit cdae1a1ee0
16 changed files with 20 additions and 17 deletions

View File

@ -42,7 +42,7 @@ limitations under the License.
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/platform/errors.h"
#include "tensorflow/core/platform/path.h"
#include "tensorflow/core/protobuf/data/experimental/service_config.pb.h"
#include "tensorflow/core/protobuf/service_config.pb.h"
#include "tensorflow/core/public/session_options.h"
namespace tensorflow {

View File

@ -25,7 +25,7 @@ limitations under the License.
#include "tensorflow/core/data/service/worker.grpc.pb.h"
#include "tensorflow/core/lib/core/status.h"
#include "tensorflow/core/platform/mutex.h"
#include "tensorflow/core/protobuf/data/experimental/service_config.pb.h"
#include "tensorflow/core/protobuf/service_config.pb.h"
#include "tensorflow/core/public/session.h"
namespace tensorflow {

View File

@ -17,7 +17,7 @@ limitations under the License.
#include "grpcpp/server_context.h"
#include "tensorflow/core/distributed_runtime/rpc/grpc_util.h"
#include "tensorflow/core/protobuf/data/experimental/service_config.pb.h"
#include "tensorflow/core/protobuf/service_config.pb.h"
namespace tensorflow {
namespace data {

View File

@ -19,7 +19,7 @@ limitations under the License.
#include "grpcpp/server_builder.h"
#include "tensorflow/core/data/service/dispatcher.grpc.pb.h"
#include "tensorflow/core/data/service/dispatcher_impl.h"
#include "tensorflow/core/protobuf/data/experimental/service_config.pb.h"
#include "tensorflow/core/protobuf/service_config.pb.h"
namespace tensorflow {
namespace data {

View File

@ -19,7 +19,7 @@ limitations under the License.
#include "grpcpp/server_builder.h"
#include "tensorflow/core/data/service/worker.grpc.pb.h"
#include "tensorflow/core/data/service/worker_impl.h"
#include "tensorflow/core/protobuf/data/experimental/service_config.pb.h"
#include "tensorflow/core/protobuf/service_config.pb.h"
namespace tensorflow {
namespace data {

View File

@ -20,7 +20,7 @@ limitations under the License.
#include "grpcpp/server_builder.h"
#include "tensorflow/core/lib/core/status.h"
#include "tensorflow/core/profiler/rpc/profiler_service_impl.h"
#include "tensorflow/core/protobuf/data/experimental/service_config.pb.h"
#include "tensorflow/core/protobuf/service_config.pb.h"
namespace tensorflow {
namespace data {

View File

@ -18,7 +18,7 @@ limitations under the License.
#include "absl/strings/str_split.h"
#include "tensorflow/core/data/service/server_lib.h"
#include "tensorflow/core/platform/errors.h"
#include "tensorflow/core/protobuf/data/experimental/service_config.pb.h"
#include "tensorflow/core/protobuf/service_config.pb.h"
namespace tensorflow {
namespace data {

View File

@ -22,7 +22,7 @@ limitations under the License.
#include "tensorflow/core/data/service/worker.pb.h"
#include "tensorflow/core/data/standalone.h"
#include "tensorflow/core/lib/core/status.h"
#include "tensorflow/core/protobuf/data/experimental/service_config.pb.h"
#include "tensorflow/core/protobuf/service_config.pb.h"
#include "tensorflow/core/public/session.h"
namespace tensorflow {

View File

@ -22,7 +22,7 @@ limitations under the License.
#include "tensorflow/core/platform/cpu_info.h"
#include "tensorflow/core/platform/errors.h"
#include "tensorflow/core/platform/stringprintf.h"
#include "tensorflow/core/protobuf/data/experimental/snapshot.pb.h"
#include "tensorflow/core/protobuf/snapshot.pb.h"
namespace tensorflow {
namespace data {

View File

@ -56,7 +56,7 @@ limitations under the License.
#include "tensorflow/core/platform/macros.h"
#include "tensorflow/core/platform/stringprintf.h"
#include "tensorflow/core/profiler/lib/traceme.h"
#include "tensorflow/core/protobuf/data/experimental/snapshot.pb.h"
#include "tensorflow/core/protobuf/snapshot.pb.h"
#include "tensorflow/core/util/batch_util.h"
#include "tensorflow/core/util/ptr_util.h"

View File

@ -38,7 +38,7 @@ limitations under the License.
#include "tensorflow/core/platform/random.h"
#include "tensorflow/core/platform/stringprintf.h"
#include "tensorflow/core/profiler/lib/traceme.h"
#include "tensorflow/core/protobuf/data/experimental/snapshot.pb.h"
#include "tensorflow/core/protobuf/snapshot.pb.h"
namespace tensorflow {
namespace data {

View File

@ -138,8 +138,8 @@ exports_files(
"control_flow.proto",
# TODO(ebrevdo): Re-enable once CriticalSection is in core.
# "critical_section.proto",
"data/experimental/snapshot.proto",
"data/experimental/service_config.proto",
"snapshot.proto",
"service_config.proto",
"debug_event.proto",
"meta_graph.proto",
"named_tensor.proto",
@ -164,8 +164,11 @@ tf_proto_library(
"control_flow.proto",
# TODO(ebrevdo): Re-enable once CriticalSection is in core.
# "critical_section.proto",
"data/experimental/snapshot.proto",
"data/experimental/service_config.proto",
# TODO: Move snapshot.proto and service_config.proto to a separate package.
# NOTE: Creating an alias and adding the files does not work in OSS.
# NOTE: tf_proto_library requires files to be in the same package.
"snapshot.proto",
"service_config.proto",
"debug_event.proto",
"meta_graph.proto",
"named_tensor.proto",

View File

@ -21,7 +21,7 @@ from __future__ import print_function
import collections
# pylint: disable=invalid-import-order,g-bad-import-order, unused-import
from tensorflow.core.protobuf.data.experimental import service_config_pb2
from tensorflow.core.protobuf import service_config_pb2
from tensorflow.python import pywrap_tensorflow
from tensorflow.python.data.experimental.service import _pywrap_server_lib
from tensorflow.python.util.tf_export import tf_export

View File

@ -23,7 +23,7 @@ limitations under the License.
#include "pybind11/stl.h"
#include "tensorflow/core/data/service/server_lib.h"
#include "tensorflow/core/platform/errors.h"
#include "tensorflow/core/protobuf/data/experimental/service_config.pb.h"
#include "tensorflow/core/protobuf/service_config.pb.h"
#include "tensorflow/python/lib/core/pybind11_lib.h"
#include "tensorflow/python/lib/core/pybind11_status.h"