Add git hash for version metadata of model server and add tags for dev and nightly builds.

PiperOrigin-RevId: 217403451
(cherry picked from commit 5c7740f)

Author: gautamvasudevan

tensorflow_serving/model_servers/BUILD

@@ -330,7 +330,10 @@ cc_library(
     srcs = [
         "main.cc",
     ],
-    hdrs = ["version.h"],
+    hdrs = [
+        "version.h",
+    ],
+    linkstamp = "version.cc",
     visibility = [
         ":tensorflow_model_server_custom_op_clients",
         "//tensorflow_serving:internal",
@@ -347,6 +350,7 @@ cc_library(
 
 cc_binary(
     name = "tensorflow_model_server",
+    stamp = 1,
     visibility = ["//tensorflow_serving:internal"],
     deps = [
         ":tensorflow_model_server_main_lib",

tensorflow_serving/model_servers/main.cc

@@ -158,8 +158,7 @@ int main(int argc, char** argv) {
   }
 
   if (display_version) {
-    std::cout << "TensorFlow ModelServer: " << TF_MODELSERVER_VERSION_STRING
-              << "\n"
+    std::cout << "TensorFlow ModelServer: " << TF_Serving_Version() << "\n"
               << "TensorFlow Library: " << TF_Version() << "\n";
     return 0;
   }

tensorflow_serving/model_servers/version.cc

@@ -0,0 +1,22 @@
+/* Copyright 2018 Google Inc. 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.
+==============================================================================*/
+
+#include "tensorflow_serving/model_servers/version.h"
+
+const char kTFS_SCM_Revision[] = TF_MODELSERVER_VERSION_STRING;
+
+extern "C" {
+const char* TF_Serving_Version() { return kTFS_SCM_Revision; }
+}

tensorflow_serving/model_servers/version.h

@@ -16,25 +16,43 @@ limitations under the License.
 #ifndef TENSORFLOW_SERVING_MODEL_SERVERS_VERSION_H_
 #define TENSORFLOW_SERVING_MODEL_SERVERS_VERSION_H_
 
-// TF Serving Model Server uses semantic versioning, see http://semver.org/.
+// TF Serving Model Server uses semantic versioning for releases
+// - see http://semver.org/. For nightlies, a git hash is used to track the
+// build via linkstamping
+#define TF_MODELSERVER_STR_HELPER(x) #x
+#define TF_MODELSERVER_STR(x) TF_MODELSERVER_STR_HELPER(x)
 
 #define TF_MODELSERVER_MAJOR_VERSION 1
 #define TF_MODELSERVER_MINOR_VERSION 11
 #define TF_MODELSERVER_PATCH_VERSION 0
-
 // TF_MODELSERVER_VERSION_SUFFIX is non-empty for pre-releases
 // (e.g. "-alpha", "-alpha.1", "-beta", "-rc", "-rc.1")
 #define TF_MODELSERVER_VERSION_SUFFIX ""
 
-#define TF_MODELSERVER_STR_HELPER(x) #x
-#define TF_MODELSERVER_STR(x) TF_MODELSERVER_STR_HELPER(x)
-
-// e.g. "0.5.0" or "0.6.0-alpha".
+#ifndef TF_MODELSERVER_VERSION_NO_META
+// TF_MODELSERVER_BUILD_TAG can be set to be nightly for nightly builds
+#ifndef TF_MODELSERVER_BUILD_TAG
+#define TF_MODELSERVER_META_TAG "+dev"
+#else
+#define TF_MODELSERVER_META_TAG "+" TF_MODELSERVER_STR(TF_MODELSERVER_BUILD_TAG)
+#endif
+#define TF_MODELSERVER_META_SCM_HASH ".sha." BUILD_SCM_REVISION
+#else
+#define TF_MODELSERVER_META_TAG ""
+#define TF_MODELSERVER_META_SCM_HASH ""
+#endif
+
+// e.g. "0.5.0+nightly.sha.a1b2c3d" or "0.6.0-rc1".
 // clang-format off
 #define TF_MODELSERVER_VERSION_STRING \
   (TF_MODELSERVER_STR(TF_MODELSERVER_MAJOR_VERSION) "." TF_MODELSERVER_STR( \
-      TF_MODELSERVER_MINOR_VERSION) "." TF_MODELSERVER_STR( \
-          TF_MODELSERVER_PATCH_VERSION) TF_MODELSERVER_VERSION_SUFFIX)
+    TF_MODELSERVER_MINOR_VERSION) "." TF_MODELSERVER_STR( \
+      TF_MODELSERVER_PATCH_VERSION) TF_MODELSERVER_VERSION_SUFFIX \
+        TF_MODELSERVER_META_TAG TF_MODELSERVER_META_SCM_HASH)
 // clang-format on
 
+extern "C" {
+const char* TF_Serving_Version();
+}
+
 #endif  // TENSORFLOW_SERVING_MODEL_SERVERS_VERSION_H_

tools/bazel.rc

@@ -33,4 +33,6 @@ build -c opt
 # Adding --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=0" creates parity with TF
 # compilation options. It also addresses memory use due to
 # copy-on-write semantics of std::strings of the older ABI.
-build --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=0
+build --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=0
+
+build --workspace_status_command=/proc/self/cwd/tools/gen_status_stamp.sh

tools/gen_status_stamp.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+# Copyright 2018 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.
+# ==============================================================================
+
+# This script will be run by the building process to generate key-value
+# information that represents the status of the workspace. The output should be
+# in the format:
+#
+# KEY1 VALUE1
+# KEY2 VALUE2
+#
+# If the script exits with non-zero code, it's considered as a failure
+# and the output will be discarded.
+
+# if we're inside a git tree
+if [ -d .git ] || git rev-parse --git-dir > /dev/null 2>&1; then
+  git_rev=$(git rev-parse --short HEAD)
+  if [[ $? != 0 ]];
+  then
+      exit 1
+  fi
+  echo "BUILD_SCM_REVISION ${git_rev}"
+else
+  echo "BUILD_SCM_REVISION no_git"
+fi;
+
+