Solve ObjectDetection functions

captainst · captainst · commit b345efa32041 · 2019-04-28T10:01:17.000+08:00
diff --git a/src/TensorFlowNET.Core/Sessions/BaseSession.cs b/src/TensorFlowNET.Core/Sessions/BaseSession.cs
@@ -217,6 +217,12 @@ private unsafe NDArray fetchValue(IntPtr output)
                     var str = UTF8Encoding.Default.GetString(bytes, 9, bytes[8]);
                     nd = np.array(str).reshape();
                     break;
+                case TF_DataType.TF_UINT8:
+                    var _bytes = new byte[tensor.size];
+                    for (ulong i = 0; i < tensor.size; i++)
+                        _bytes[i] = *(byte*)(offset + (int)(tensor.itemsize * i));
+                    nd = np.array(_bytes).reshape(ndims);
+                    break;
                 case TF_DataType.TF_INT16:
                     var shorts = new short[tensor.size];
                     for (ulong i = 0; i < tensor.size; i++)
diff --git a/src/TensorFlowNET.Core/Tensors/Tensor.Creation.cs b/src/TensorFlowNET.Core/Tensors/Tensor.Creation.cs
@@ -67,7 +67,8 @@ private IntPtr Allocate(NDArray nd)
                 case "Double":
                     Marshal.Copy(nd1.Data<double>(), 0, dotHandle, nd.size);
                     break;
-                //case "Byte":
+                case "Byte":
+                    Marshal.Copy(nd1.Data<byte>(), 0, dotHandle, nd.size);
                     /*var bb = nd.Data<byte>();
                     var bytes = Marshal.AllocHGlobal(bb.Length);
                     Marshal.Copy(bb, 0, bytes, bb.Length);
diff --git a/src/TensorFlowNET.Core/Tensors/Tensor.cs b/src/TensorFlowNET.Core/Tensors/Tensor.cs
@@ -195,6 +195,7 @@ public TF_DataType ToTFDataType(Type type)
                 case "Double":
                     return TF_DataType.TF_DOUBLE;
                 case "Byte":
+                    return TF_DataType.TF_UINT8;
                 case "String":
                     return TF_DataType.TF_STRING;
                 default:
diff --git a/test/TensorFlowNET.Examples/ObjectDetection.cs b/test/TensorFlowNET.Examples/ObjectDetection.cs
@@ -28,7 +28,7 @@ public class ObjectDetection : Python, IExample
 
         public bool Run()
         {
-            //buildOutputImage(null);
+            PrepareData();
 
             // read in the input image
             var imgArr = ReadTensorFromImageFile(Path.Join(imageDir, "input.jpg"));
@@ -91,7 +91,7 @@ public void PrepareData()
             // download the pbtxt file
             if (!File.Exists(Path.Join(modelDir, "mscoco_label_map.pbtxt")))
             {
-                string url = $"https://github.com/tensorflow/models/blob/master/research/object_detection/data/mscoco_label_map.pbtxt";
+                string url = $"https://raw.githubusercontent.com/tensorflow/models/master/research/object_detection/data/mscoco_label_map.pbtxt";
                 Utility.Web.Download(url, modelDir, "mscoco_label_map.pbtxt");
             }
         }
@@ -123,7 +123,6 @@ private void buildOutputImage(NDArray[] resultArr)
                 float score = scores[i];
                 if (score > MIN_SCORE)
                 {
-                    //var boxes = resultArr[1].Data<float[,,]>();
                     float[] boxes = resultArr[1].Data<float>();
                     float top = boxes[i * 4] * bitmap.Height;
                     float left = boxes[i * 4 + 1] * bitmap.Width;

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class ObjectDetection : Python, IExample`
`28`	`28`
`29`	`29`	`public bool Run()`
`30`	`30`	`{`
`31`		`- //buildOutputImage(null);`
	`31`	`+ PrepareData();`
`32`	`32`
`33`	`33`	`// read in the input image`
`34`	`34`	`var imgArr = ReadTensorFromImageFile(Path.Join(imageDir, "input.jpg"));`
`@@ -91,7 +91,7 @@ public void PrepareData()`
`91`	`91`	`// download the pbtxt file`
`92`	`92`	`if (!File.Exists(Path.Join(modelDir, "mscoco_label_map.pbtxt")))`
`93`	`93`	`{`
`94`		`- string url = $"https://github.com/tensorflow/models/blob/master/research/object_detection/data/mscoco_label_map.pbtxt";`
	`94`	`+ string url = $"https://raw.githubusercontent.com/tensorflow/models/master/research/object_detection/data/mscoco_label_map.pbtxt";`
`95`	`95`	`Utility.Web.Download(url, modelDir, "mscoco_label_map.pbtxt");`
`96`	`96`	`}`
`97`	`97`	`}`
`@@ -123,7 +123,6 @@ private void buildOutputImage(NDArray[] resultArr)`
`123`	`123`	`float score = scores[i];`
`124`	`124`	`if (score > MIN_SCORE)`
`125`	`125`	`{`
`126`		`- //var boxes = resultArr[1].Data<float[,,]>();`
`127`	`126`	`float[] boxes = resultArr[1].Data<float>();`
`128`	`127`	`float top = boxes[i * 4] * bitmap.Height;`
`129`	`128`	`float left = boxes[i * 4 + 1] * bitmap.Width;`