Remove platform/grpc_services.h and related rules

PiperOrigin-RevId: 282640644 Change-Id: I69e28febd983a482d81c69559f2a96c782380386
2019-11-26 14:28:51 -08:00 · 2019-11-26 14:28:51 -08:00 · d693915624
commit d693915624
parent 9ece4ad931
12 changed files with 18 additions and 66 deletions
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@ -385,11 +385,6 @@ filegroup(
    visibility = ["//visibility:private"],
 )

-alias(
-    name = "grpc_services",
-    actual = "//tensorflow/core/platform:grpc_services",
-)
-
 alias(
    name = "human_readable_json",
    actual = "//tensorflow/core/platform:human_readable_json",
--- a/tensorflow/core/platform/BUILD
+++ b/tensorflow/core/platform/BUILD
@ -202,16 +202,6 @@ cc_library(
    ],
 )

-cc_library(
-    name = "grpc_services",
-    hdrs = ["grpc_services.h"],
-    deps = [
-        ":platform",
-        "//tensorflow/core/profiler:profiler_analysis_proto_cc",
-        "//tensorflow/core/profiler:profiler_service_proto_cc",
-    ],
-)
-
 cc_library(
    name = "human_readable_json",
    textual_hdrs = ["human_readable_json.h"],
--- a/tensorflow/core/platform/default/build_config.bzl
+++ b/tensorflow/core/platform/default/build_config.bzl
@ -477,6 +477,7 @@ def tf_proto_library(
        cc_libs = [],
        cc_api_version = 2,
        cc_grpc_version = None,
+        use_grpc_namespace = False,
        j2objc_api_version = 1,
        js_codegen = "jspb",
        make_default_target_header_only = False,
@ -489,6 +490,7 @@ def tf_proto_library(
        testonly = testonly,
        srcs = srcs,
        cc_grpc_version = cc_grpc_version,
+        use_grpc_namespace = use_grpc_namespace,
        cc_libs = cc_libs,
        make_default_target_header_only = make_default_target_header_only,
        protodeps = protodeps,
--- a/tensorflow/core/platform/grpc_services.h
+++ b/tensorflow/core/platform/grpc_services.h
@ -1,33 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. 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.
-==============================================================================*/
-#ifndef TENSORFLOW_CORE_PLATFORM_GRPC_SERVICES_H_
-#define TENSORFLOW_CORE_PLATFORM_GRPC_SERVICES_H_
-
-#include "tensorflow/core/platform/platform.h"
-#include "tensorflow/core/profiler/profiler_analysis.grpc.pb.h"
-#include "tensorflow/core/profiler/profiler_service.grpc.pb.h"
-
-#if !defined(PLATFORM_GOOGLE)
-namespace tensorflow {
-namespace grpc {
-
-// Google internal GRPC generates services under namespace "tensorflow::grpc".
-// Creating aliases here to make sure we can access services under namespace
-// "tensorflow::grpc" both in google internal and open-source.
-using ::tensorflow::ProfileAnalysis;
-using ::tensorflow::ProfilerService;
-
-}  // namespace grpc
-}  // namespace tensorflow
-#endif
-
-#endif  // TENSORFLOW_CORE_PLATFORM_GRPC_SERVICES_H_
--- a/tensorflow/core/profiler/BUILD
+++ b/tensorflow/core/profiler/BUILD
@ -45,6 +45,7 @@ tf_proto_library(
        ":op_profile_proto",
        ":profiler_service_monitor_result_proto",
    ] + tf_additional_all_protos(),
+    use_grpc_namespace = True,
    visibility = ["//visibility:public"],
 )

@ -55,6 +56,7 @@ tf_proto_library(
    cc_api_version = 2,
    cc_grpc_version = 1,
    protodeps = [":profiler_service_proto"],
+    use_grpc_namespace = True,
    visibility = ["//visibility:public"],
 )

--- a/tensorflow/core/profiler/rpc/BUILD
+++ b/tensorflow/core/profiler/rpc/BUILD
@ -1,11 +1,8 @@
-load("//tensorflow:tensorflow.bzl", "tf_cuda_library")
-
 package(
-    default_visibility = ["//visibility:public"],
    licenses = ["notice"],  # Apache 2.0
 )

-tf_cuda_library(
+cc_library(
    name = "profiler_service_impl",
    srcs = ["profiler_service_impl.cc"],
    hdrs = ["profiler_service_impl.h"],
@ -13,15 +10,14 @@ tf_cuda_library(
    deps = [
        "//tensorflow:grpc++",
        "//tensorflow/core:framework",
-        "//tensorflow/core:grpc_services",
        "//tensorflow/core:lib",
+        "//tensorflow/core/profiler:profiler_service_proto_cc",
        "//tensorflow/core/profiler/lib:profiler_lib",
        "//tensorflow/core/profiler/lib:profiler_session",
    ],
-    alwayslink = 1,
 )

-tf_cuda_library(
+cc_library(
    name = "profiler_server",
    srcs = ["profiler_server.cc"],
    hdrs = ["profiler_server.h"],
@ -30,10 +26,9 @@ tf_cuda_library(
        ":profiler_service_impl",
        "//tensorflow:grpc++",
        "//tensorflow/core:framework",
-        "//tensorflow/core:grpc_services",
        "//tensorflow/core:lib",
+        "//tensorflow/core/profiler:profiler_service_proto_cc",
        "//tensorflow/core/profiler/lib:profiler_lib",
        "//tensorflow/core/profiler/lib:profiler_session",
    ],
-    alwayslink = 1,
 )
--- a/tensorflow/core/profiler/rpc/client/BUILD
+++ b/tensorflow/core/profiler/rpc/client/BUILD
@ -1,10 +1,10 @@
-load("//tensorflow:tensorflow.bzl", "tf_cc_test", "tf_cuda_library")
+load("//tensorflow:tensorflow.bzl", "tf_cc_test")

 package(
    licenses = ["notice"],  # Apache 2.0
 )

-tf_cuda_library(
+cc_library(
    name = "capture_profile",
    srcs = ["capture_profile.cc"],
    hdrs = ["capture_profile.h"],
@ -13,9 +13,10 @@ tf_cuda_library(
        ":dump_tpu_profile",
        "//tensorflow:grpc++",
        "//tensorflow/core:framework",
-        "//tensorflow/core:grpc_services",
        "//tensorflow/core:lib",
        "//tensorflow/core/distributed_runtime/rpc:grpc_util",
+        "//tensorflow/core/profiler:profiler_analysis_proto_cc",
+        "//tensorflow/core/profiler:profiler_service_proto_cc",
        "@com_google_absl//absl/strings",
    ],
 )
@ -28,10 +29,10 @@ cc_library(
    deps = [
        ":trace_events_to_json",
        "//tensorflow/core:framework",
-        "//tensorflow/core:grpc_services",
        "//tensorflow/core:lib",
        "//tensorflow/core:protos_all_cc",
        "//tensorflow/core/profiler:op_profile_proto_cc",
+        "//tensorflow/core/profiler:profiler_service_proto_cc",
    ],
 )

--- a/tensorflow/core/profiler/rpc/client/capture_profile.cc
+++ b/tensorflow/core/profiler/rpc/client/capture_profile.cc
@ -27,7 +27,8 @@ limitations under the License.
 #include "tensorflow/core/lib/io/path.h"
 #include "tensorflow/core/lib/strings/numbers.h"
 #include "tensorflow/core/lib/strings/str_util.h"
-#include "tensorflow/core/platform/grpc_services.h"
+#include "tensorflow/core/profiler/profiler_analysis.grpc.pb.h"
+#include "tensorflow/core/profiler/profiler_service.grpc.pb.h"
 #include "tensorflow/core/profiler/rpc/client/dump_tpu_profile.h"
 #include "tensorflow/core/util/events_writer.h"

--- a/tensorflow/core/profiler/rpc/client/dump_tpu_profile.h
+++ b/tensorflow/core/profiler/rpc/client/dump_tpu_profile.h
@ -17,7 +17,7 @@ limitations under the License.
 #define TENSORFLOW_CORE_PROFILER_RPC_CLIENT_DUMP_TPU_PROFILE_H_

 #include "tensorflow/core/lib/core/status.h"
-#include "tensorflow/core/platform/grpc_services.h"
+#include "tensorflow/core/profiler/profiler_service.pb.h"

 namespace tensorflow {

--- a/tensorflow/core/profiler/rpc/profiler_server.cc
+++ b/tensorflow/core/profiler/rpc/profiler_server.cc
@ -21,8 +21,8 @@ limitations under the License.
 #include "grpcpp/grpcpp.h"
 #include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/platform/env.h"
-#include "tensorflow/core/platform/grpc_services.h"
 #include "tensorflow/core/profiler/lib/profiler_session.h"
+#include "tensorflow/core/profiler/profiler_service.grpc.pb.h"
 #include "tensorflow/core/profiler/rpc/profiler_service_impl.h"
 #include "tensorflow/core/util/ptr_util.h"

--- a/tensorflow/core/profiler/rpc/profiler_service_impl.cc
+++ b/tensorflow/core/profiler/rpc/profiler_service_impl.cc
@ -17,7 +17,6 @@ limitations under the License.

 #include "grpcpp/support/status.h"
 #include "tensorflow/core/platform/env.h"
-#include "tensorflow/core/platform/grpc_services.h"
 #include "tensorflow/core/profiler/lib/profiler_session.h"
 #include "tensorflow/core/util/ptr_util.h"

--- a/tensorflow/core/profiler/rpc/profiler_service_impl.h
+++ b/tensorflow/core/profiler/rpc/profiler_service_impl.h
@ -18,8 +18,8 @@ limitations under the License.
 #include "grpcpp/grpcpp.h"
 #include "grpcpp/server_context.h"
 #include "grpcpp/support/status.h"
-#include "tensorflow/core/platform/grpc_services.h"
 #include "tensorflow/core/profiler/lib/profiler_session.h"
+#include "tensorflow/core/profiler/profiler_service.grpc.pb.h"

 namespace tensorflow {