Merge pull request #1153 from netfs/r1.11

Cherry picks for upcoming 1.11.1 release

Author: netfs

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_

tensorflow_serving/tools/docker/Dockerfile.devel-gpu

@@ -155,7 +155,7 @@ RUN echo "Building with Bazel options: ${TF_SERVING_BAZEL_OPTIONS}"
 
 RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/libcuda.so.1 && \
     LD_LIBRARY_PATH=/usr/local/cuda/lib64/stubs:${LD_LIBRARY_PATH} \
-    bazel build --color=yes --curses=yes --config=cuda \
+    bazel build --color=yes --curses=yes --config=cuda --copt="-fPIC"\
     ${TF_SERVING_BAZEL_OPTIONS} \
     --verbose_failures \
     --output_filter=DONT_MATCH_ANYTHING \

tensorflow_serving/util/json_tensor.cc

@@ -15,6 +15,7 @@ limitations under the License.
 
 #include "tensorflow_serving/util/json_tensor.h"
 
+#include <cstdlib>
 #include <limits>
 #include <string>
 #include <type_traits>
@@ -209,15 +210,26 @@ Status LossyDecimalError(const rapidjson::Value& val, const string& target) {
 template <typename T>
 bool IsLosslessDecimal(const rapidjson::Value& val) {
   static_assert(std::is_same<T, float>::value || std::is_same<T, double>::value,
-                "Only floating-point value types are supported.");
+                "Only floating point value types are supported.");
+  static_assert(std::numeric_limits<T>::radix == 2,
+                "Floating point type must have base 2.");
 
   // Note, we use GetDouble() for both types as std::isfinite() returns false
   // for decimal values that do not fit in float (due to the static_cast<> used
   // in converting double to float in GetFloat() call).
   if (!std::isfinite(val.GetDouble())) return true;
 
-  if (std::is_same<T, float>::value) return val.IsLosslessFloat();
-  return val.IsLosslessDouble();
+  // Maximum integer value that can be represented by the floating type.
+  static constexpr int64 kMaxInt = (1LL << std::numeric_limits<T>::digits) - 1;
+
+  if (val.IsUint64()) {
+    return val.GetUint64() <= kMaxInt;
+  }
+  if (val.IsInt64()) {
+    return std::abs(val.GetInt64()) <= kMaxInt;
+  }
+  return val.GetDouble() <= std::numeric_limits<T>::max() &&
+         val.GetDouble() >= std::numeric_limits<T>::lowest();
 }
 
 // Adds a JSON value to Tensor. Returns error if value cannot be converted

tensorflow_serving/util/json_tensor_test.cc

@@ -81,7 +81,7 @@ TEST(JsontensorTest, SingleUnnamedTensor) {
     )"));
 }
 
-TEST(JsontensorTest, IntegerInputForFloatTensor) {
+TEST(JsontensorTest, MixedInputForFloatTensor) {
   TensorInfoMap infomap;
   ASSERT_TRUE(
       TextFormat::ParseFromString("dtype: DT_FLOAT", &infomap["default"]));
@@ -90,24 +90,26 @@ TEST(JsontensorTest, IntegerInputForFloatTensor) {
   JsonPredictRequestFormat format;
   TF_EXPECT_OK(FillPredictRequestFromJson(R"(
     {
-      "instances": [1, 2, 3, 4, 5]
+      "instances": [1, 2.0, 3, 4, 5.003, 0.007, 0.0]
     })",
                                           getmap(infomap), &req, &format));
   auto tmap = req.inputs();
   EXPECT_EQ(tmap.size(), 1);
   EXPECT_EQ(format, JsonPredictRequestFormat::kRow);
   EXPECT_THAT(tmap["default"], EqualsProto(R"(
                 dtype: DT_FLOAT
-                tensor_shape { dim { size: 5 } }
+                tensor_shape { dim { size: 7 } }
                 float_val: 1
-                float_val: 2
+                float_val: 2.0
                 float_val: 3
                 float_val: 4
-                float_val: 5
+                float_val: 5.003
+                float_val: 0.007
+                float_val: 0.0
               )"));
 }
 
-TEST(JsontensorTest, IntegerInputForDoubleTensor) {
+TEST(JsontensorTest, MixedInputForDoubleTensor) {
   TensorInfoMap infomap;
   ASSERT_TRUE(
       TextFormat::ParseFromString("dtype: DT_DOUBLE", &infomap["default"]));
@@ -116,20 +118,22 @@ TEST(JsontensorTest, IntegerInputForDoubleTensor) {
   JsonPredictRequestFormat format;
   TF_EXPECT_OK(FillPredictRequestFromJson(R"(
     {
-      "instances": [1, 2, 3, 4, 5]
+      "instances": [1.0, 2, 3, 4, 0.662, 0, 0.0]
     })",
                                           getmap(infomap), &req, &format));
   auto tmap = req.inputs();
   EXPECT_EQ(tmap.size(), 1);
   EXPECT_EQ(format, JsonPredictRequestFormat::kRow);
   EXPECT_THAT(tmap["default"], EqualsProto(R"(
                 dtype: DT_DOUBLE
-                tensor_shape { dim { size: 5 } }
-                double_val: 1
+                tensor_shape { dim { size: 7 } }
+                double_val: 1.0
                 double_val: 2
                 double_val: 3
                 double_val: 4
-                double_val: 5
+                double_val: 0.662
+                double_val: 0
+                double_val: 0.0
               )"));
 }
 

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/bazel_in_docker.sh

@@ -46,7 +46,7 @@ function get_switch_user_cmd() {
   local username=$(id -n -u)
   local groupname=$(id -n -g)
   local cmdline="groupadd -f ${groupname} && groupmod -o -g ${gid} ${groupname}"
-  cmdline+="; id -u ${username} &>/dev/null || useradd ${username} && usermod -o -u ${uid} -g ${gid} ${username}"
+  cmdline+="; id -u ${username} &>/dev/null || useradd -N ${username} && usermod -o -u ${uid} -g ${gid} ${username}"
   cmdline+="; chroot --userspec=${username} / "
   echo "${cmdline}"
 }

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;
+
+