fix iterator_get_next for dataset.

Oceania2018 · Oceania2018 · commit 34efa15d4df0 · 2020-07-25T21:48:18.000-05:00
diff --git a/src/TensorFlowNET.Core/Binding.Util.cs b/src/TensorFlowNET.Core/Binding.Util.cs
@@ -270,12 +270,10 @@ public static float time()
             int i = 0;
             foreach(var val in values)
             {
-                if (i < start)
-                {
-                    i++;
+                if (i++ < start)
                     continue;
-                }
-                yield return (i, val);
+                
+                yield return (i - start, val);
             }
         }
 
diff --git a/src/TensorFlowNET.Core/Data/DatasetV2.cs b/src/TensorFlowNET.Core/Data/DatasetV2.cs
@@ -78,9 +78,19 @@ public override string ToString()
         {
             var ownedIterator = new OwnedIterator(this);
 
-            Tensor[] results = ownedIterator.next();
-            while (results != null)
+            bool stop = false;
+            Tensor[] results = null;
+            while (!stop)
             {
+                try
+                {
+                    results = ownedIterator.next();
+                }
+                catch (StopIteration)
+                {
+                    stop = true;
+                }
+
                 yield return (results[0], results[1]);
             }
         }
diff --git a/src/TensorFlowNET.Core/Data/OwnedIterator.cs b/src/TensorFlowNET.Core/Data/OwnedIterator.cs
@@ -35,6 +35,15 @@ void _create_iterator(IDatasetV2 dataset)
         }
 
         public Tensor[] next()
-            => ops.iterator_get_next(_iterator_resource, _dataset.output_types, _dataset.output_shapes);
+        {
+            try
+            {
+                return ops.iterator_get_next(_iterator_resource, _dataset.output_types, _dataset.output_shapes);
+            }
+            catch (OutOfRangeError ex)
+            {
+                throw new StopIteration(ex.Message);
+            }
+        }
     }
 }
diff --git a/src/TensorFlowNET.Core/Exceptions/OutOfRangeError.cs b/src/TensorFlowNET.Core/Exceptions/OutOfRangeError.cs
@@ -0,0 +1,17 @@
+﻿using System;
+
+namespace Tensorflow
+{
+    public class OutOfRangeError : TensorflowException
+    {
+        public OutOfRangeError() : base()
+        {
+
+        }
+
+        public OutOfRangeError(string message) : base(message)
+        {
+
+        }
+    }
+}
diff --git a/src/TensorFlowNET.Core/Status/Status.cs b/src/TensorFlowNET.Core/Status/Status.cs
@@ -78,9 +78,18 @@ public void Check(bool throwException = false)
             if (Code != TF_Code.TF_OK)
             {
                 var message = Message;
-                Console.WriteLine(message);
+
                 if (throwException)
-                    throw new TensorflowException(message);
+                {
+                    switch (Code)
+                    {
+                        case TF_Code.TF_OUT_OF_RANGE:
+                            throw new OutOfRangeError(message);
+                        default:
+                            Console.WriteLine(message);
+                            throw new TensorflowException(message);
+                    }
+                }
             }
         }
 
diff --git a/src/TensorFlowNET.Core/Tensors/Tensor.Implicit.cs b/src/TensorFlowNET.Core/Tensors/Tensor.Implicit.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Text;
 using Tensorflow.Eager;
+using static Tensorflow.Binding;
 
 namespace Tensorflow
 {
@@ -21,5 +22,8 @@ public static implicit operator TF_Tensor(Tensor tensor)
 
         public static implicit operator Tensor(IntPtr handle)
             => new Tensor(handle);
+
+        public static implicit operator Tensor(NDArray nd)
+            => tf.convert_to_tensor(nd);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -270,12 +270,10 @@ public static float time()`
`270`	`270`	`int i = 0;`
`271`	`271`	`foreach(var val in values)`
`272`	`272`	`{`
`273`		`- if (i < start)`
`274`		`- {`
`275`		`- i++;`
	`273`	`+ if (i++ < start)`
`276`	`274`	`continue;`
`277`		`- }`
`278`		`- yield return (i, val);`
	`275`	`+`
	`276`	`+ yield return (i - start, val);`
`279`	`277`	`}`
`280`	`278`	`}`
`281`	`279`
Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,19 @@ public override string ToString()`
`78`	`78`	`{`
`79`	`79`	`var ownedIterator = new OwnedIterator(this);`
`80`	`80`
`81`		`- Tensor[] results = ownedIterator.next();`
`82`		`- while (results != null)`
	`81`	`+ bool stop = false;`
	`82`	`+ Tensor[] results = null;`
	`83`	`+ while (!stop)`
`83`	`84`	`{`
	`85`	`+ try`
	`86`	`+ {`
	`87`	`+ results = ownedIterator.next();`
	`88`	`+ }`
	`89`	`+ catch (StopIteration)`
	`90`	`+ {`
	`91`	`+ stop = true;`
	`92`	`+ }`
	`93`	`+`
`84`	`94`	`yield return (results[0], results[1]);`
`85`	`95`	`}`
`86`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,15 @@ void _create_iterator(IDatasetV2 dataset)`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public Tensor[] next()`
`38`		`- => ops.iterator_get_next(_iterator_resource, _dataset.output_types, _dataset.output_shapes);`
	`38`	`+ {`
	`39`	`+ try`
	`40`	`+ {`
	`41`	`+ return ops.iterator_get_next(_iterator_resource, _dataset.output_types, _dataset.output_shapes);`
	`42`	`+ }`
	`43`	`+ catch (OutOfRangeError ex)`
	`44`	`+ {`
	`45`	`+ throw new StopIteration(ex.Message);`
	`46`	`+ }`
	`47`	`+ }`
`39`	`48`	`}`
`40`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Text;`
`5`	`5`	`using Tensorflow.Eager;`
	`6`	`+using static Tensorflow.Binding;`
`6`	`7`
`7`	`8`	`namespace Tensorflow`
`8`	`9`	`{`
`@@ -21,5 +22,8 @@ public static implicit operator TF_Tensor(Tensor tensor)`
`21`	`22`
`22`	`23`	`public static implicit operator Tensor(IntPtr handle)`
`23`	`24`	`=> new Tensor(handle);`
	`25`	`+`
	`26`	`+ public static implicit operator Tensor(NDArray nd)`
	`27`	`+ => tf.convert_to_tensor(nd);`
`24`	`28`	`}`
`25`	`29`	`}`