Fixes TFTensor.GetValue for multidimensional arrays.

andykernahan · andykernahan · commit 1810de4cfa81 · 2017-03-11T22:16:13.000Z
TFTensor.GetValue was updating the target in column major order, instead of
the (documented) row major order. This commit aligns the multidimensional array
behaviour with that when jagged: true is specified.
diff --git a/SampleTest/SampleTest.cs b/SampleTest/SampleTest.cs
@@ -421,6 +421,29 @@ void TestVariable ()
 			}
 		}
 
+		void BasicMultidimensionalArray ()
+		{
+			Console.WriteLine ("Basic multidimensional array");
+			using (var g = new TFGraph ()) {
+				var s = new TFSession (g);
+
+				var var_a = g.Placeholder (TFDataType.Int32);
+				var mul = g.Mul (var_a, g.Const (2));
+
+				var a = new int[,,] { { { 0, 1 } , { 2, 3 } } , { { 4, 5 }, { 6, 7 } } };
+				var result = s.GetRunner ().AddInput (var_a, a).Fetch (mul).Run () [0];
+
+				var actual = (int[,,])result.GetValue ();
+				var expected = new int[,,] { { { 0, 2 } , { 4, 6 } } , { { 8, 10 }, { 12, 14 } } };
+
+				Console.WriteLine ("Actual:   " + RowOrderJoin (actual));
+				Console.WriteLine ("Expected: " + RowOrderJoin (expected));
+				Assert(expected.Cast<int> ().SequenceEqual (actual.Cast<int> ()));
+			};
+		}
+
+		private static string RowOrderJoin(int[,,] array) => string.Join (", ", array.Cast<int> ());
+
 		void BasicMatrix ()
 		{
 			Console.WriteLine ("Basic matrix");
@@ -573,6 +596,7 @@ public static void Main (string [] args)
 
 			t.BasicConstantOps ();
 			t.BasicVariables ();
+			t.BasicMultidimensionalArray ();
 			t.BasicMatrix ();
 
 			t.NearestNeighbor ();
diff --git a/TensorFlowSharp/Tensor.cs b/TensorFlowSharp/Tensor.cs
@@ -824,18 +824,17 @@ static void FetchMultiDimensionalArray (Array target, TFDataType dt, IntPtr data
 			for (int i = 0; i < shape.Length; i++) {
 				if (shape [i] > Int32.MaxValue)
 					throw new ArgumentOutOfRangeException ("Shape can not be longer than 32 bits");
-				idx [i] = (int)shape [i];
 			}
-			Copy (target, dt, shape, idx, shape.Length - 1, ref data);
+			Copy (target, dt, shape, idx, 0, ref data);
 		}
 
 		static unsafe void Copy (Array target, TFDataType dt, long [] shape, int [] idx, int level, ref IntPtr data)
 		{
-			if (level > 0) {
+			if (level < shape.Length - 1) {
 				for (idx [level] = 0; idx [level] < shape [level]; idx [level]++)
-					Copy (target, dt, shape, idx, level - 1, ref data);
+					Copy (target, dt, shape, idx, level + 1, ref data);
 			} else {
-				for (idx [0] = 0; idx [0] < shape [0]; idx [0]++) {
+				for (idx [level] = 0; idx [level] < shape [level]; idx [level]++) {
 					switch (dt) {
 					case TFDataType.Float:
 						target.SetValue ((*(float*)data), idx);
