Expose tf.shape() API.

Oceania2018 · Oceania2018 · commit b1bd05c1a15b · 2019-08-31T11:27:34.000-05:00
diff --git a/src/TensorFlowNET.Core/APIs/tf.array.cs b/src/TensorFlowNET.Core/APIs/tf.array.cs
@@ -124,5 +124,15 @@ public Tensor pad(Tensor tensor, Tensor paddings, string mode = "CONSTANT", stri
         /// <returns>A `Tensor`. Has the same type as `input`.</returns>
         public Tensor placeholder_with_default<T>(T input, int[] shape, string name = null)
             => gen_array_ops.placeholder_with_default(input, shape, name: name);
+
+        /// <summary>
+        /// Returns the shape of a tensor.
+        /// </summary>
+        /// <param name="input"></param>
+        /// <param name="name"></param>
+        /// <param name="out_type"></param>
+        /// <returns></returns>
+        public Tensor shape(Tensor input, string name = null, TF_DataType out_type = TF_DataType.TF_INT32)
+            => array_ops.shape_internal(input, name, optimize: true, out_type: out_type);
     }
 }
diff --git a/src/TensorFlowNET.Core/Operations/array_ops.py.cs b/src/TensorFlowNET.Core/Operations/array_ops.py.cs
@@ -338,7 +338,7 @@ public static Tensor shape(Tensor input, string name = null, TF_DataType out_typ
         public static Tensor size(Tensor input, string name = null, bool optimize = true, TF_DataType out_type = TF_DataType.TF_INT32)
             => size_internal(input, name, optimize: optimize, out_type: out_type);
 
-        private static Tensor shape_internal(Tensor input, string name = null, bool optimize = true, TF_DataType out_type = TF_DataType.TF_INT32)
+        public static Tensor shape_internal(Tensor input, string name = null, bool optimize = true, TF_DataType out_type = TF_DataType.TF_INT32)
         {
             return tf_with(ops.name_scope(name, "Shape", new { input }), scope =>
             {
diff --git a/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj b/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj
@@ -26,7 +26,7 @@ Docs: https://tensorflownet.readthedocs.io</Description>
 5. Overload session.run(), make syntax simpler.
 6. Add Local Response Normalization.
 7. Add tf.image related APIs.
-8. Add tf.random_normal, tf.constant, tf.pad.
+8. Add tf.random_normal, tf.constant, tf.pad, tf.shape.
 9. MultiThread is safe.</PackageReleaseNotes>
     <LangVersion>7.3</LangVersion>
     <FileVersion>0.11.2.0</FileVersion>
diff --git a/test/TensorFlowNET.Examples/ImageProcessing/YOLO/common.cs b/test/TensorFlowNET.Examples/ImageProcessing/YOLO/common.cs
@@ -65,11 +65,14 @@ public static Tensor upsample(Tensor input_data, string name, string method = "d
             Tensor output = null;
             if (method == "resize")
             {
-
+                tf_with(tf.variable_scope(name), delegate
+                {
+                    var input_shape = tf.shape(input_data);
+                });
             }
             else if(method == "deconv")
             {
-
+                throw new NotImplementedException("upsample.deconv");
             }
 
             return output;
diff --git a/test/TensorFlowNET.UnitTest/ImageTest.cs b/test/TensorFlowNET.UnitTest/ImageTest.cs
@@ -14,10 +14,11 @@ namespace TensorFlowNET.UnitTest
     [TestClass]
     public class ImageTest
     {
-        string imgPath = "../../../../../data/shasta-daisy.jpg";
+        string imgPath = "shasta-daisy.jpg";
         Tensor contents;
 
-        public ImageTest()
+        [TestInitialize]
+        public void Initialize()
         {
             imgPath = Path.GetFullPath(imgPath);
             contents = tf.read_file(imgPath);

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ public static Tensor shape(Tensor input, string name = null, TF_DataType out_typ`
`338`	`338`	`public static Tensor size(Tensor input, string name = null, bool optimize = true, TF_DataType out_type = TF_DataType.TF_INT32)`
`339`	`339`	`=> size_internal(input, name, optimize: optimize, out_type: out_type);`
`340`	`340`
`341`		`- private static Tensor shape_internal(Tensor input, string name = null, bool optimize = true, TF_DataType out_type = TF_DataType.TF_INT32)`
	`341`	`+ public static Tensor shape_internal(Tensor input, string name = null, bool optimize = true, TF_DataType out_type = TF_DataType.TF_INT32)`
`342`	`342`	`{`
`343`	`343`	`return tf_with(ops.name_scope(name, "Shape", new { input }), scope =>`
`344`	`344`	`{`
Original file line number	Diff line number	Diff line change
`@@ -65,11 +65,14 @@ public static Tensor upsample(Tensor input_data, string name, string method = "d`
`65`	`65`	`Tensor output = null;`
`66`	`66`	`if (method == "resize")`
`67`	`67`	`{`
`68`		`-`
	`68`	`+ tf_with(tf.variable_scope(name), delegate`
	`69`	`+ {`
	`70`	`+ var input_shape = tf.shape(input_data);`
	`71`	`+ });`
`69`	`72`	`}`
`70`	`73`	`else if(method == "deconv")`
`71`	`74`	`{`
`72`		`-`
	`75`	`+ throw new NotImplementedException("upsample.deconv");`
`73`	`76`	`}`
`74`	`77`
`75`	`78`	`return output;`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,11 @@ namespace TensorFlowNET.UnitTest`
`14`	`14`	`[TestClass]`
`15`	`15`	`public class ImageTest`
`16`	`16`	`{`
`17`		`- string imgPath = "../../../../../data/shasta-daisy.jpg";`
	`17`	`+ string imgPath = "shasta-daisy.jpg";`
`18`	`18`	`Tensor contents;`
`19`	`19`
`20`		`- public ImageTest()`
	`20`	`+ [TestInitialize]`
	`21`	`+ public void Initialize()`
`21`	`22`	`{`
`22`	`23`	`imgPath = Path.GetFullPath(imgPath);`
`23`	`24`	`contents = tf.read_file(imgPath);`