Move core/logging.proto -> apis/logging.proto

PiperOrigin-RevId: 374459486
tensorflow · May 18, 2021 · 37c64b8 · 37c64b8
1 parent e846c66
commit 37c64b8
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 51 deletions.
diff --git a/tensorflow_serving/apis/BUILD b/tensorflow_serving/apis/BUILD
@@ -129,17 +129,37 @@ tf_jspb_proto_library(
     deps = [":predict_proto"],
 )
 
+serving_proto_library(
+    name = "logging_proto",
+    srcs = ["logging.proto"],
+    cc_api_version = 2,
+    deps = [
+        ":model_proto",
+        "//tensorflow_serving/config:logging_config_proto",
+    ],
+)
+
+serving_proto_library_py(
+    name = "logging_proto_py_pb2",
+    srcs = ["logging.proto"],
+    proto_library = "logging_proto",
+    deps = [
+        ":model_proto_py_pb2",
+        "//tensorflow_serving/config:logging_config_proto_py_pb2",
+    ],
+)
+
 serving_proto_library(
     name = "prediction_log_proto",
     srcs = ["prediction_log.proto"],
     cc_api_version = 2,
     deps = [
         ":classification_proto",
         ":inference_proto",
+        ":logging_proto",
         ":predict_proto",
         ":regression_proto",
         ":session_service_proto",
-        "//tensorflow_serving/core:logging_proto",
     ],
 )
 
@@ -153,7 +173,7 @@ serving_proto_library_py(
         ":predict_proto_py_pb2",
         ":regression_proto_py_pb2",
         ":session_service_proto_py_pb2",
-        "//tensorflow_serving/core:logging_proto_py_pb2",
+        "//tensorflow_serving/apis:logging_proto_py_pb2",
     ],
 )
 

diff --git a/tensorflow_serving/core/logging.proto → tensorflow_serving/apis/logging.proto b/tensorflow_serving/core/logging.proto → tensorflow_serving/apis/logging.proto
diff --git a/tensorflow_serving/apis/prediction_log.proto b/tensorflow_serving/apis/prediction_log.proto
@@ -1,15 +1,15 @@
 syntax = "proto3";
 
-option cc_enable_arenas = true;
+package tensorflow.serving;
 
 import "tensorflow_serving/apis/classification.proto";
 import "tensorflow_serving/apis/inference.proto";
+import "tensorflow_serving/apis/logging.proto";
 import "tensorflow_serving/apis/predict.proto";
 import "tensorflow_serving/apis/regression.proto";
 import "tensorflow_serving/apis/session_service.proto";
-import "tensorflow_serving/core/logging.proto";
 
-package tensorflow.serving;
+option cc_enable_arenas = true;
 
 message ClassifyLog {
   ClassificationRequest request = 1;

diff --git a/tensorflow_serving/core/BUILD b/tensorflow_serving/core/BUILD
@@ -1,7 +1,5 @@
 # Description: Tensorflow Serving core.
 
-load("//tensorflow_serving:serving.bzl", "serving_proto_library", "serving_proto_library_py")
-
 package(
     default_visibility = [
         "//tensorflow_serving:internal",
@@ -765,32 +763,6 @@ cc_test(
     ],
 )
 
-serving_proto_library(
-    name = "logging_proto",
-    srcs = ["logging.proto"],
-    cc_api_version = 2,
-    visibility = [
-        "//visibility:public",
-    ],
-    deps = [
-        "//tensorflow_serving/apis:model_proto",
-        "//tensorflow_serving/config:logging_config_proto",
-    ],
-)
-
-serving_proto_library_py(
-    name = "logging_proto_py_pb2",
-    srcs = ["logging.proto"],
-    proto_library = "logging_proto",
-    visibility = [
-        "//visibility:public",
-    ],
-    deps = [
-        "//tensorflow_serving/apis:model_proto_py_pb2",
-        "//tensorflow_serving/config:logging_config_proto_py_pb2",
-    ],
-)
-
 cc_library(
     name = "request_logger",
     srcs = ["request_logger.cc"],
@@ -800,7 +772,7 @@ cc_library(
     ],
     deps = [
         ":log_collector",
-        ":logging_cc_proto",
+        "//tensorflow_serving/apis:logging_cc_proto",
         "//tensorflow_serving/config:logging_config_cc_proto",
         "@com_google_protobuf//:protobuf",
         "@org_tensorflow//tensorflow/core:lib",
@@ -813,8 +785,8 @@ cc_test(
     srcs = ["request_logger_test.cc"],
     deps = [
         ":log_collector",
-        ":logging_cc_proto",
         ":request_logger",
+        "//tensorflow_serving/apis:logging_cc_proto",
         "//tensorflow_serving/apis:model_cc_proto",
         "//tensorflow_serving/apis:predict_cc_proto",
         "//tensorflow_serving/config:logging_config_cc_proto",
@@ -837,9 +809,9 @@ cc_library(
     ],
     deps = [
         ":request_logger",
+        "//tensorflow_serving/apis:logging_cc_proto",
         "//tensorflow_serving/apis:model_cc_proto",
         "//tensorflow_serving/config:logging_config_cc_proto",
-        "//tensorflow_serving/core:logging_cc_proto",
         "//tensorflow_serving/util:fast_read_dynamic_ptr",
         "@com_google_protobuf//:protobuf",
         "@org_tensorflow//tensorflow/core:lib",
@@ -852,8 +824,8 @@ cc_test(
     srcs = ["server_request_logger_test.cc"],
     deps = [
         ":log_collector",
-        ":logging_cc_proto",
         ":server_request_logger",
+        "//tensorflow_serving/apis:logging_cc_proto",
         "//tensorflow_serving/apis:model_cc_proto",
         "//tensorflow_serving/apis:predict_cc_proto",
         "//tensorflow_serving/config:log_collector_config_cc_proto",

diff --git a/tensorflow_serving/core/request_logger.h b/tensorflow_serving/core/request_logger.h
@@ -21,9 +21,9 @@ limitations under the License.
 
 #include "google/protobuf/message.h"
 #include "tensorflow/core/lib/core/status.h"
+#include "tensorflow_serving/apis/logging.pb.h"
 #include "tensorflow_serving/config/logging_config.pb.h"
 #include "tensorflow_serving/core/log_collector.h"
-#include "tensorflow_serving/core/logging.pb.h"
 
 namespace tensorflow {
 namespace serving {

diff --git a/tensorflow_serving/core/request_logger_test.cc b/tensorflow_serving/core/request_logger_test.cc
@@ -27,11 +27,11 @@ limitations under the License.
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow_serving/apis/logging.pb.h"
 #include "tensorflow_serving/apis/model.pb.h"
 #include "tensorflow_serving/apis/predict.pb.h"
 #include "tensorflow_serving/config/logging_config.pb.h"
 #include "tensorflow_serving/core/log_collector.h"
-#include "tensorflow_serving/core/logging.pb.h"
 #include "tensorflow_serving/core/test_util/mock_log_collector.h"
 #include "tensorflow_serving/core/test_util/mock_request_logger.h"
 #include "tensorflow_serving/test_util/test_util.h"

diff --git a/tensorflow_serving/core/server_request_logger.cc b/tensorflow_serving/core/server_request_logger.cc
@@ -19,8 +19,8 @@ limitations under the License.
 #include "tensorflow/core/lib/gtl/map_util.h"
 #include "tensorflow/core/lib/strings/proto_serialization.h"
 #include "tensorflow/core/platform/macros.h"
+#include "tensorflow_serving/apis/logging.pb.h"
 #include "tensorflow_serving/apis/model.pb.h"
-#include "tensorflow_serving/core/logging.pb.h"
 
 namespace tensorflow {
 namespace serving {

diff --git a/tensorflow_serving/core/server_request_logger.h b/tensorflow_serving/core/server_request_logger.h
@@ -25,8 +25,8 @@ limitations under the License.
 
 #include "google/protobuf/message.h"
 #include "tensorflow/core/lib/core/status.h"
+#include "tensorflow_serving/apis/logging.pb.h"
 #include "tensorflow_serving/config/logging_config.pb.h"
-#include "tensorflow_serving/core/logging.pb.h"
 #include "tensorflow_serving/core/request_logger.h"
 #include "tensorflow_serving/util/fast_read_dynamic_ptr.h"
 

diff --git a/tensorflow_serving/core/server_request_logger_test.cc b/tensorflow_serving/core/server_request_logger_test.cc
@@ -29,12 +29,12 @@ limitations under the License.
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow_serving/apis/logging.pb.h"
 #include "tensorflow_serving/apis/model.pb.h"
 #include "tensorflow_serving/apis/predict.pb.h"
 #include "tensorflow_serving/config/log_collector_config.pb.h"
 #include "tensorflow_serving/config/logging_config.pb.h"
 #include "tensorflow_serving/core/log_collector.h"
-#include "tensorflow_serving/core/logging.pb.h"
 #include "tensorflow_serving/core/test_util/fake_log_collector.h"
 #include "tensorflow_serving/core/test_util/mock_request_logger.h"
 #include "tensorflow_serving/test_util/test_util.h"

diff --git a/tensorflow_serving/core/test_util/BUILD b/tensorflow_serving/core/test_util/BUILD
@@ -176,7 +176,7 @@ cc_library(
     testonly = 1,
     hdrs = ["mock_request_logger.h"],
     deps = [
-        "//tensorflow_serving/core:logging_cc_proto",
+        "//tensorflow_serving/apis:logging_cc_proto",
         "//tensorflow_serving/core:request_logger",
         "@com_google_googletest//:gtest",
         "@com_google_protobuf//:protobuf",

diff --git a/tensorflow_serving/core/test_util/mock_request_logger.h b/tensorflow_serving/core/test_util/mock_request_logger.h
@@ -21,9 +21,9 @@ limitations under the License.
 #include "google/protobuf/message.h"
 #include <gmock/gmock.h>
 #include "tensorflow/core/lib/core/status.h"
+#include "tensorflow_serving/apis/logging.pb.h"
 #include "tensorflow_serving/config/logging_config.pb.h"
 #include "tensorflow_serving/core/log_collector.h"
-#include "tensorflow_serving/core/logging.pb.h"
 #include "tensorflow_serving/core/request_logger.h"
 
 namespace tensorflow {

diff --git a/tensorflow_serving/model_servers/test_util/mock_server_core.h b/tensorflow_serving/model_servers/test_util/mock_server_core.h
@@ -26,11 +26,11 @@ limitations under the License.
 #include <gmock/gmock.h>
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow_serving/apis/logging.proto.h"
 #include "tensorflow_serving/apis/model.pb.h"
 #include "tensorflow_serving/config/model_server_config.pb.h"
 #include "tensorflow_serving/config/platform_config.pb.h"
 #include "tensorflow_serving/core/aspired_versions_manager.h"
-#include "tensorflow_serving/core/logging.pb.h"
 #include "tensorflow_serving/core/servable_handle.h"
 #include "tensorflow_serving/core/servable_state.h"
 #include "tensorflow_serving/core/servable_state_monitor.h"

diff --git a/tensorflow_serving/tools/pip_package/BUILD b/tensorflow_serving/tools/pip_package/BUILD
@@ -27,6 +27,6 @@ sh_binary(
         "//tensorflow_serving/config:logging_config_proto_py_pb2",
         "//tensorflow_serving/config:model_server_config_proto_py_pb2",
         "//tensorflow_serving/config:file_system_storage_path_source_proto_py_pb2",
-        "//tensorflow_serving/core:logging_proto_py_pb2",
+        "//tensorflow_serving/apis:logging_proto_py_pb2",
     ],
 )
diff --git a/tensorflow_serving/tools/pip_package/build_pip_package.sh b/tensorflow_serving/tools/pip_package/build_pip_package.sh
@@ -36,7 +36,6 @@ function main() {
   echo $(date) : "=== Using tmpdir: ${TMPDIR}"
   mkdir -p ${TMPDIR}/tensorflow_serving/apis
   mkdir -p ${TMPDIR}/tensorflow_serving/config
-  mkdir -p ${TMPDIR}/tensorflow_serving/core
 
   echo "Adding python files"
   cp bazel-out/k8-opt/bin/tensorflow_serving/apis/*_pb2.py \
@@ -51,12 +50,8 @@ function main() {
   cp bazel-out/k8-opt/bin/tensorflow_serving/config/*_pb2.py \
     "${TMPDIR}/tensorflow_serving/config"
 
-  cp bazel-out/k8-opt/bin/tensorflow_serving/core/*_pb2.py \
-    "${TMPDIR}/tensorflow_serving/core"
-
   touch "${TMPDIR}/tensorflow_serving/apis/__init__.py"
   touch "${TMPDIR}/tensorflow_serving/config/__init__.py"
-  touch "${TMPDIR}/tensorflow_serving/core/__init__.py"
   touch "${TMPDIR}/tensorflow_serving/__init__.py"
 
   echo "Adding package setup files"