Merge commit for internal changes

Author: kirilg

WORKSPACE

@@ -1,32 +1,11 @@
-new_http_archive(
-  name = "gmock_archive",
-  url = "https://googlemock.googlecode.com/files/gmock-1.7.0.zip",
-  sha256 = "26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b",
-  build_file = "tensorflow/google/protobuf/gmock.BUILD",
-)
-
-new_http_archive(
-  name = "eigen_archive",
-  url = "https://bitbucket.org/eigen/eigen/get/70505a059011.tar.gz",
-  sha256 = "9751bd3485a9b373bc1b40626feac37484099e54b2b47a93d3da8bf1312a7beb",
-  build_file = "tensorflow/eigen.BUILD",
-)
-
-bind(
-  name = "gtest",
-  actual = "@gmock_archive//:gtest",
-)
-
-bind(
-  name = "gtest_main",
-  actual = "@gmock_archive//:gtest_main",
-)
-
 local_repository(
-    name = "tf",
-    path = __workspace_dir__ + "/tensorflow",
+  name = "tf",
+  path = __workspace_dir__ + "/tensorflow",
 )
 
+load('//tensorflow/tensorflow:workspace.bzl', 'tf_workspace')
+tf_workspace("tensorflow/")
+
 # ===== gRPC dependencies =====
 
 bind(
@@ -58,37 +37,3 @@ new_http_archive(
     strip_prefix = "zlib-1.2.8",
     url = "http://zlib.net/zlib128.zip",
 )
-
-# =========================
-
-git_repository(
-  name = "re2",
-  remote = "https://github.com/google/re2.git",
-  commit = "791beff",
-)
-
-new_http_archive(
-  name = "jpeg_archive",
-  url = "http://www.ijg.org/files/jpegsrc.v9a.tar.gz",
-  sha256 = "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7",
-  build_file = "tensorflow/jpeg.BUILD",
-)
-
-new_http_archive(
-  name = "png_archive",
-  url = "https://storage.googleapis.com/libpng-public-archive/libpng-1.2.53.tar.gz",
-  sha256 = "e05c9056d7f323088fd7824d8c6acc03a4a758c4b4916715924edc5dd3223a72",
-  build_file = "tensorflow/png.BUILD",
-)
-
-new_http_archive(
-  name = "six_archive",
-  url = "https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz#md5=34eed507548117b2ab523ab14b2f8b55",
-  sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",
-  build_file = "tensorflow/six.BUILD",
-)
-
-bind(
-  name = "six",
-  actual = "@six_archive//:six",
-)

grpc

@@ -8,6 +8,8 @@ licenses(["notice"])  # Apache 2.0
 
 exports_files(["LICENSE"])
 
+# open source marker; do not remove
+
 package_group(
     name = "internal",
     packages = [

tensorflow

@@ -6,21 +6,21 @@ To compile and use TensorFlow Serving, you need to set up some prerequisites.
 
 ### Bazel
 
-TensorFlow Serving requires Bazel 0.1.5 or higher. You can find the Bazel
+TensorFlow Serving requires Bazel 0.2.0 or higher. You can find the Bazel
 installation instructions [here](http://bazel.io/docs/install.html).
 
 If you have the prerequisites for Bazel, those instructions consist of the
 following steps:
 
 1.  Download the relevant binary from
     [here](https://github.com/bazelbuild/bazel/releases).
-    Let's say you downloaded bazel-0.1.5-installer-linux-x86_64.sh. You would
+    Let's say you downloaded bazel-0.2.0-installer-linux-x86_64.sh. You would
     execute:
 
     ~~~shell
     cd ~/Downloads
-    chmod +x bazel-0.1.5-installer-linux-x86_64.sh
-    ./bazel-0.1.5-installer-linux-x86_64.sh --user
+    chmod +x bazel-0.2.0-installer-linux-x86_64.sh
+    ./bazel-0.2.0-installer-linux-x86_64.sh --user
     ~~~
 2.  Set up your environment. Put this in your ~/.bashrc.
 

tensorflow_serving/BUILD

@@ -35,9 +35,9 @@ class ServingSession : public Session {
   ~ServingSession() override = default;
 
   // Methods that return errors.
-  Status Create(const GraphDef& graph) override;
-  Status Extend(const GraphDef& graph) override;
-  Status Close() override;
+  Status Create(const GraphDef& graph) final;
+  Status Extend(const GraphDef& graph) final;
+  Status Close() final;
 
   // (Subclasses just implement Run().)
 };