Branch 170919783

RELEASE.md

@@ -1,6 +1,9 @@
 # Release 1.4.0
 
 ## Major Features And Improvements
+* Java:
+  * Generics (e.g., `Tensor<Integer>`) for improved type-safety (courtesy @andrewcmyers).
+  * Support for multi-dimensional string tensors.
 
 ## Bug Fixes and Other Changes
 * `tf.nn.rnn_cell.DropoutWrapper` is now more careful about dropping out LSTM

WORKSPACE

@@ -2,11 +2,11 @@ workspace(name = "org_tensorflow")
 
 http_archive(
     name = "io_bazel_rules_closure",
-    sha256 = "25f5399f18d8bf9ce435f85c6bbf671ec4820bc4396b3022cc5dc4bc66303609",
-    strip_prefix = "rules_closure-0.4.2",
+    sha256 = "110fe68753413777944b473c25eed6368c4a0487cee23a7bac1b13cc49d3e257",
+    strip_prefix = "rules_closure-4af89ef1db659eb41f110df189b67d4cf14073e1",
     urls = [
-        "http://mirror.bazel.build/github.com/bazelbuild/rules_closure/archive/0.4.2.tar.gz",  # 2017-08-29
-        "https://github.com/bazelbuild/rules_closure/archive/0.4.2.tar.gz",
+        "http://mirror.bazel.build/github.com/bazelbuild/rules_closure/archive/4af89ef1db659eb41f110df189b67d4cf14073e1.tar.gz",
+        "https://github.com/bazelbuild/rules_closure/archive/4af89ef1db659eb41f110df189b67d4cf14073e1.tar.gz",  # 2017-08-28
     ],
 )
 

tensorflow/BUILD

@@ -400,6 +400,7 @@ filegroup(
         "//tensorflow/contrib/nn:all_files",
         "//tensorflow/contrib/opt:all_files",
         "//tensorflow/contrib/predictor:all_files",
+        "//tensorflow/contrib/quantize:all_files",
         "//tensorflow/contrib/receptive_field:all_files",
         "//tensorflow/contrib/reduce_slice_ops:all_files",
         "//tensorflow/contrib/remote_fused_graph/pylib:all_files",

tensorflow/cc/ops/const_op.cc

@@ -19,19 +19,17 @@ limitations under the License.
 namespace tensorflow {
 namespace ops {
 
-Output Const(const Scope& scope, const Input::Initializer& val) {
+namespace {
+template <typename T>
+Output ConstHelper(const Scope& scope, const T& value, DataType dtype) {
   if (!scope.ok()) return Output();
-  if (!val.status.ok()) {
-    scope.UpdateStatus(val.status);
-    return Output();
-  }
 
   Node* ret;
   Graph* graph = scope.graph();
   const string unique_name = scope.GetUniqueNameForOp("Const");
   auto builder = NodeBuilder(unique_name, "Const")
-                     .Attr("value", val.tensor)
-                     .Attr("dtype", val.tensor.dtype());
+                     .Attr("value", value)
+                     .Attr("dtype", dtype);
   scope.UpdateBuilder(&builder);
   scope.UpdateStatus(builder.Finalize(graph, &ret));
   if (!scope.ok()) return Output();
@@ -41,6 +39,19 @@ Output Const(const Scope& scope, const Input::Initializer& val) {
 
   return Output(ret);
 }
+}  // namespace
+
+Output Const(const Scope& scope, const Input::Initializer& val) {
+  if (!val.status.ok()) {
+    scope.UpdateStatus(val.status);
+    return Output();
+  }
+  return ConstHelper(scope, val.tensor, val.tensor.dtype());
+}
+
+Output ConstFromProto(const Scope& scope, const TensorProto& proto) {
+  return ConstHelper(scope, proto, proto.dtype());
+}
 
 NodeBuilder::NodeOut AsNodeOut(const Scope& scope, const Input& inp) {
   if (!inp.status().ok()) {

tensorflow/cc/ops/const_op.h

@@ -28,6 +28,8 @@ namespace ops {
 
 Output Const(const Scope& scope, const Input::Initializer& val);
 
+Output ConstFromProto(const Scope& scope, const TensorProto& proto);
+
 NodeBuilder::NodeOut AsNodeOut(const Scope& scope, const Input& inp);
 
 template <typename T>

tensorflow/cc/ops/const_op_test.cc

@@ -100,6 +100,20 @@ TEST(ConstOpTest, WithExplicitShape) {
   ExpectNodeEqual<string>(d.node(), {"1", "2", "3", "4", "5", "6"}, {2, 3});
 }
 
+TEST(ConstOpTest, FromProto) {
+  Scope root = Scope::NewRootScope();
+  TensorProto proto;
+  proto.set_dtype(DT_DOUBLE);
+  TensorShape({2, 2}).AsProto(proto.mutable_tensor_shape());
+  for (int i = 0; i < 4; ++i) {
+    proto.add_double_val(static_cast<double>(i));
+  }
+  auto c = ops::ConstFromProto(root, proto);
+  TF_CHECK_OK(root.status());
+  EXPECT_EQ(c.op().output_type(0), DT_DOUBLE);
+  ExpectNodeEqual<double>(c.node(), {0.0, 1.0, 2.0, 3.0}, {2, 2});
+}
+
 TEST(ConstOpTest, InvalidInitializer) {
   Scope root = Scope::NewRootScope();
   ops::Const(root, {{2.0}, {"df"}});