Remove race conditions from TensorShapeUtils::MakeShape

girving · tensorflower-gardener · commit 725e968a9344 · 2016-03-15T11:46:54.000-07:00
Also move some functions from header to C++.
Change: 117255894
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
@@ -799,6 +799,7 @@ tf_cuda_library(
         ":lib",
         ":lib_internal",
         ":protos_all_cc",
+        "//tensorflow/core/kernels:bounds_check",
         "//third_party/eigen3",
     ],
     alwayslink = 1,
diff --git a/tensorflow/core/framework/tensor_shape.cc b/tensorflow/core/framework/tensor_shape.cc
@@ -15,6 +15,7 @@ limitations under the License.
 
 #include "tensorflow/core/framework/tensor_shape.h"
 
+#include "tensorflow/core/kernels/bounds_check.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/lib/strings/strcat.h"
@@ -327,4 +328,38 @@ bool TensorShapeUtils::StartsWith(const TensorShape& shape,
   return true;
 }
 
+template <typename T>
+static inline Status MakeShapeHelper(const T* dims, int n, TensorShape* out) {
+  *out = TensorShape();
+  for (int i = 0; i < n; ++i) {
+    const T dim = internal::SubtleMustCopy(dims[i]);
+    if (dim >= 0) {
+      out->AddDim(dim);
+    } else {
+      return errors::InvalidArgument("Dimension ", dim, " must be >= 0");
+    }
+  }
+  return Status::OK();
+}
+
+#define MAKE_SHAPE(T)                                                          \
+  Status TensorShapeUtils::MakeShape(const T* dims, int n, TensorShape* out) { \
+    return MakeShapeHelper(dims, n, out);                                      \
+  }
+MAKE_SHAPE(int32)
+MAKE_SHAPE(int64)
+#undef MAKE_SHAPE
+
+string TensorShapeUtils::ShapeListString(
+    const gtl::ArraySlice<TensorShape>& shapes) {
+  string result = "[";
+  bool first = true;
+  for (const TensorShape& shape : shapes) {
+    strings::StrAppend(&result, (first ? "" : ", "), shape.DebugString());
+    first = false;
+  }
+  strings::StrAppend(&result, "]");
+  return result;
+}
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/framework/tensor_shape.h b/tensorflow/core/framework/tensor_shape.h
@@ -252,29 +252,10 @@ class TensorShapeUtils {
 
   /// \brief Returns a `TensorShape` whose dimensions are
   /// `dims[0]`, `dims[1]`, ..., `dims[n-1]`.
-  template <typename T>
-  static Status MakeShape(const T* dims, int n, TensorShape* out) {
-    *out = TensorShape();
-    for (int i = 0; i < n; ++i) {
-      if (dims[i] >= 0) {
-        out->AddDim(dims[i]);
-      } else {
-        return errors::InvalidArgument("Dimension ", dims[i], " must be >= 0");
-      }
-    }
-    return Status::OK();
-  }
+  static Status MakeShape(const int32* dims, int n, TensorShape* out);
+  static Status MakeShape(const int64* dims, int n, TensorShape* out);
 
-  static string ShapeListString(const gtl::ArraySlice<TensorShape>& shapes) {
-    string result = "[";
-    bool first = true;
-    for (const TensorShape& shape : shapes) {
-      strings::StrAppend(&result, (first ? "" : ", "), shape.DebugString());
-      first = false;
-    }
-    strings::StrAppend(&result, "]");
-    return result;
-  }
+  static string ShapeListString(const gtl::ArraySlice<TensorShape>& shapes);
 
   static bool StartsWith(const TensorShape& shape0, const TensorShape& shape1);
 };
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
@@ -203,7 +203,7 @@ cc_library(
     hdrs = ["bounds_check.h"],
     visibility = ["//tensorflow:__subpackages__"],
     deps = [
-        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
         "//third_party/eigen3",
     ],
 )
@@ -1002,6 +1002,7 @@ filegroup(
     name = "android_srcs",
     srcs = [
         "avgpooling_op.h",
+        "bounds_check.h",
         "maxpooling_op.h",
         "ops_util.cc",
         "ops_util.h",
