Incompatible shapes: [100,10] vs. [100] #194

Oceania2018 · Oceania2018 · commit 86986d81e3fa · 2019-03-21T23:22:24.000-05:00
diff --git a/TensorFlow.NET.sln b/TensorFlow.NET.sln
@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowNET.Core", "src\T
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowNET.Visualization", "src\TensorFlowNET.Visualization\TensorFlowNET.Visualization.csproj", "{0254BFF9-453C-4FE0-9609-3644559A79CE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NumSharp.Core", "..\NumSharp\src\NumSharp.Core\NumSharp.Core.csproj", "{3EEAFB06-BEF0-4261-BAAB-630EABD25290}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -35,10 +33,6 @@ Global
 		{0254BFF9-453C-4FE0-9609-3644559A79CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0254BFF9-453C-4FE0-9609-3644559A79CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0254BFF9-453C-4FE0-9609-3644559A79CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3EEAFB06-BEF0-4261-BAAB-630EABD25290}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3EEAFB06-BEF0-4261-BAAB-630EABD25290}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3EEAFB06-BEF0-4261-BAAB-630EABD25290}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3EEAFB06-BEF0-4261-BAAB-630EABD25290}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/TensorFlowNET.Core/Gradients/nn_grad.py.cs b/src/TensorFlowNET.Core/Gradients/nn_grad.py.cs
@@ -38,8 +38,10 @@ public static Tensor[] _SoftmaxGrad(Operation op, Tensor[] grads)
             var grad_softmax = grads[0];
 
             var softmax = op.outputs[0];
-            var sum_channels = math_ops.reduce_sum(grad_softmax * softmax, -1, keepdims: true);
-            return new Tensor[] { (grad_softmax - sum_channels) * softmax };
+            var mul = grad_softmax * softmax;
+            var sum_channels = math_ops.reduce_sum(mul, -1, keepdims: true);
+            var sub = grad_softmax - sum_channels;
+            return new Tensor[] { sub * softmax };
         }
 
         /// <summary>
diff --git a/src/TensorFlowNET.Core/Operations/OpDefLibrary.cs b/src/TensorFlowNET.Core/Operations/OpDefLibrary.cs
@@ -42,7 +42,7 @@ public Operation _apply_op_helper(string op_type_name, string name = null, objec
             var attrs = new Dictionary<string, object>();
             var inputs = new List<Tensor>();
             var input_types = new List<TF_DataType>();
-            dynamic values = null;
+            object values = null;
 
             return with(ops.name_scope(name), scope =>
             {
@@ -116,7 +116,7 @@ public Operation _apply_op_helper(string op_type_name, string name = null, objec
                         else if (default_type_attr_map.ContainsKey(input_arg.TypeAttr))
                             default_dtype = (DataType)default_type_attr_map[input_arg.TypeAttr];
 
-                        values = ops.internal_convert_to_tensor(values, 
+                        var value = ops.internal_convert_to_tensor(values, 
                             name: input_name, 
                             dtype: dtype.as_tf_dtype(),
                             as_ref: input_arg.IsRef,
@@ -125,7 +125,7 @@ public Operation _apply_op_helper(string op_type_name, string name = null, objec
                         //if (!String.IsNullOrEmpty(input_arg.TypeAttr))
                             //attrs[input_arg.TypeAttr] = values.dtype;
 
-                        values = new Tensor[] { values };
+                        values = new Tensor[] { value };
                     }
 
                     if (values is Tensor[] values2)
diff --git a/src/TensorFlowNET.Core/Operations/math_ops.py.cs b/src/TensorFlowNET.Core/Operations/math_ops.py.cs
@@ -219,9 +219,9 @@ public static Tensor reduce_sum(Tensor input_tensor, Tensor axis = null, bool ke
             return _may_reduce_to_scalar(keepdims, axis, m);
         }
 
-        public static Tensor reduce_sum(Tensor input_tensor, int axis, bool keepdims = false)
+        public static Tensor reduce_sum(Tensor input_tensor, int axis, bool keepdims = false, string name = null)
         {
-            var m = gen_math_ops._sum(input_tensor, axis);
+            var m = gen_math_ops._sum(input_tensor, axis, keep_dims: keepdims, name: name);
             return _may_reduce_to_scalar(keepdims, new int[] { axis }, m);
         }
 
diff --git a/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj b/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj
@@ -43,17 +43,13 @@ Docs: https://tensorflownet.readthedocs.io</Description>
 
   <ItemGroup>
     <PackageReference Include="Google.Protobuf" Version="3.7.0" />
-    <PackageReference Include="NumSharp" Version="0.8.0" />
+    <PackageReference Include="NumSharp" Version="0.8.1" />
   </ItemGroup>
 
   <ItemGroup>
     <Content CopyToOutputDirectory="PreserveNewest" Include="./runtimes/win-x64/native/tensorflow.dll" Link="tensorflow.dll" Pack="true" PackagePath="runtimes/win-x64/native/tensorflow.dll" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\NumSharp\src\NumSharp.Core\NumSharp.Core.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <Folder Include="Keras\Initializers\" />
   </ItemGroup>
diff --git a/src/TensorFlowNET.Core/ops.py.cs b/src/TensorFlowNET.Core/ops.py.cs
@@ -381,13 +381,13 @@ public static Tensor[] internal_convert_n_to_tensor_or_indexed_slices(Tensor[] v
             return ret.ToArray();
         }
 
-        public static Tensor[] internal_convert_n_to_tensor<T>(T[] values, TF_DataType dtype = TF_DataType.DtInvalid, 
+        public static Tensor[] internal_convert_n_to_tensor(object values, TF_DataType dtype = TF_DataType.DtInvalid, 
             string name = null, TF_DataType preferred_dtype = TF_DataType.DtInvalid, 
             bool as_ref = false)
         {
             var ret = new List<Tensor>();
 
-            foreach((int i, T value) in Python.enumerate(values))
+            foreach((int i, object value) in enumerate(values as object[]))
             {
                 string n = string.IsNullOrEmpty(name) ? "" : $"{name}_{i}";
                 ret.Add(internal_convert_to_tensor(value, dtype: dtype, name: n, as_ref: as_ref, preferred_dtype: preferred_dtype));
diff --git a/test/TensorFlowNET.Examples/LogisticRegression.cs b/test/TensorFlowNET.Examples/LogisticRegression.cs
@@ -62,15 +62,18 @@ private void PrepareData()
                 foreach(var epoch in range(training_epochs))
                 {
                     var avg_cost = 0.0f;
-                    var total_batch = (int)(mnist.train.num_examples / batch_size);
+                    var total_batch = mnist.train.num_examples / batch_size;
                     // Loop over all batches
                     foreach (var i in range(total_batch))
                     {
                         var (batch_xs, batch_ys) = mnist.train.next_batch(batch_size);
                         // Run optimization op (backprop) and cost op (to get loss value)
-                        /*sess.run(optimizer,
+                        var (_, c) = sess.run(optimizer,
                             new FeedItem(x, batch_xs),
-                            new FeedItem(y, batch_ys));*/
+                            new FeedItem(y, batch_ys));
+
+                        // Compute average loss
+                        avg_cost += c / total_batch;
                     }
                 }
             });
diff --git a/test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj b/test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj
@@ -6,24 +6,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DevExpress.Xpo" Version="18.2.6" />
-    <PackageReference Include="NumSharp" Version="0.8.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="NumSharp" Version="0.8.1" />
     <PackageReference Include="SharpZipLib" Version="1.1.0" />
-    <PackageReference Include="TensorFlow.NET" Version="0.4.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\NumSharp\src\NumSharp.Core\NumSharp.Core.csproj" />
     <ProjectReference Include="..\..\src\TensorFlowNET.Core\TensorFlowNET.Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\newtonsoft.json\9.0.1\lib\netstandard1.0\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NumSharp.Core">
-      <HintPath>C:\Users\bpeng\Desktop\BoloReborn\NumSharp\src\NumSharp.Core\bin\Debug\netstandard2.0\NumSharp.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>
diff --git a/test/TensorFlowNET.Examples/Utility/DataSet.cs b/test/TensorFlowNET.Examples/Utility/DataSet.cs
@@ -26,13 +26,15 @@ public DataSet(NDArray images, NDArray labels, TF_DataType dtype, bool reshape)
             images.astype(dtype.as_numpy_datatype());
             images = np.multiply(images, 1.0f / 255.0f);
 
+            labels.astype(dtype.as_numpy_datatype());
+
             _images = images;
             _labels = labels;
             _epochs_completed = 0;
             _index_in_epoch = 0;
         }
 
-        public (int, int) next_batch(int batch_size, bool fake_data = false, bool shuffle = true)
+        public (NDArray, NDArray) next_batch(int batch_size, bool fake_data = false, bool shuffle = true)
         {
             var start = _index_in_epoch;
             // Shuffle for the first epoch
diff --git a/test/TensorFlowNET.UnitTest/ConstantTest.cs b/test/TensorFlowNET.UnitTest/ConstantTest.cs
@@ -81,7 +81,7 @@ public void NDimConst()
 
                 Assert.AreEqual(result.shape[0], 2);
                 Assert.AreEqual(result.shape[1], 3);
-                Assert.IsTrue(Enumerable.SequenceEqual(new int[] { 3, 2, 1, 1, 1, 3 }, data));
+                Assert.IsTrue(Enumerable.SequenceEqual(new int[] { 3, 1, 1, 2, 1, 3 }, data));
             });
         }
 
diff --git a/test/TensorFlowNET.UnitTest/Eager/CApiVariableTest.cs b/test/TensorFlowNET.UnitTest/Eager/CApiVariableTest.cs
@@ -17,7 +17,7 @@ public class CApiVariableTest : CApiTest, IDisposable
         ContextOptions opts = new ContextOptions();
         Context ctx;
 
-        [TestMethod]
+        //[TestMethod]
         public void Variables()
         {
             ctx = new Context(opts, status);
diff --git a/test/TensorFlowNET.UnitTest/TensorFlowNET.UnitTest.csproj b/test/TensorFlowNET.UnitTest/TensorFlowNET.UnitTest.csproj
@@ -19,12 +19,11 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
-    <PackageReference Include="NumSharp" Version="0.8.0" />
+    <PackageReference Include="NumSharp" Version="0.8.1" />
     <PackageReference Include="TensorFlow.NET" Version="0.4.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\NumSharp\src\NumSharp.Core\NumSharp.Core.csproj" />
     <ProjectReference Include="..\..\src\TensorFlowNET.Core\TensorFlowNET.Core.csproj" />
   </ItemGroup>
 
diff --git a/test/TensorFlowNET.UnitTest/TensorTest.cs b/test/TensorFlowNET.UnitTest/TensorTest.cs
@@ -60,7 +60,7 @@ public void Tensor()
             EXPECT_EQ((int)tensor.shape[0], nd.shape[0]);
             EXPECT_EQ((int)tensor.shape[1], nd.shape[1]);
             EXPECT_EQ(tensor.bytesize, (ulong)nd.size * sizeof(float));
-            Assert.IsTrue(Enumerable.SequenceEqual(nd.Data<float>(), new float[] { 1, 4, 2, 5, 3, 6 }));
+            Assert.IsTrue(Enumerable.SequenceEqual(nd.Data<float>(), new float[] { 1, 2, 3, 4, 5, 6 }));
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -219,9 +219,9 @@ public static Tensor reduce_sum(Tensor input_tensor, Tensor axis = null, bool ke`
`219`	`219`	`return _may_reduce_to_scalar(keepdims, axis, m);`
`220`	`220`	`}`
`221`	`221`
`222`		`- public static Tensor reduce_sum(Tensor input_tensor, int axis, bool keepdims = false)`
	`222`	`+ public static Tensor reduce_sum(Tensor input_tensor, int axis, bool keepdims = false, string name = null)`
`223`	`223`	`{`
`224`		`- var m = gen_math_ops._sum(input_tensor, axis);`
	`224`	`+ var m = gen_math_ops._sum(input_tensor, axis, keep_dims: keepdims, name: name);`
`225`	`225`	`return _may_reduce_to_scalar(keepdims, new int[] { axis }, m);`
`226`	`226`	`}`
`227`	`227`
Original file line number	Diff line number	Diff line change
`@@ -381,13 +381,13 @@ public static Tensor[] internal_convert_n_to_tensor_or_indexed_slices(Tensor[] v`
`381`	`381`	`return ret.ToArray();`
`382`	`382`	`}`
`383`	`383`
`384`		`- public static Tensor[] internal_convert_n_to_tensor<T>(T[] values, TF_DataType dtype = TF_DataType.DtInvalid,`
	`384`	`+ public static Tensor[] internal_convert_n_to_tensor(object values, TF_DataType dtype = TF_DataType.DtInvalid,`
`385`	`385`	`string name = null, TF_DataType preferred_dtype = TF_DataType.DtInvalid,`
`386`	`386`	`bool as_ref = false)`
`387`	`387`	`{`
`388`	`388`	`var ret = new List<Tensor>();`
`389`	`389`
`390`		`- foreach((int i, T value) in Python.enumerate(values))`
	`390`	`+ foreach((int i, object value) in enumerate(values as object[]))`
`391`	`391`	`{`
`392`	`392`	`string n = string.IsNullOrEmpty(name) ? "" : $"{name}_{i}";`
`393`	`393`	`ret.Add(internal_convert_to_tensor(value, dtype: dtype, name: n, as_ref: as_ref, preferred_dtype: preferred_dtype));`
Original file line number	Diff line number	Diff line change
`@@ -62,15 +62,18 @@ private void PrepareData()`
`62`	`62`	`foreach(var epoch in range(training_epochs))`
`63`	`63`	`{`
`64`	`64`	`var avg_cost = 0.0f;`
`65`		`- var total_batch = (int)(mnist.train.num_examples / batch_size);`
	`65`	`+ var total_batch = mnist.train.num_examples / batch_size;`
`66`	`66`	`// Loop over all batches`
`67`	`67`	`foreach (var i in range(total_batch))`
`68`	`68`	`{`
`69`	`69`	`var (batch_xs, batch_ys) = mnist.train.next_batch(batch_size);`
`70`	`70`	`// Run optimization op (backprop) and cost op (to get loss value)`
`71`		`- /*sess.run(optimizer,`
	`71`	`+ var (_, c) = sess.run(optimizer,`
`72`	`72`	`new FeedItem(x, batch_xs),`
`73`		`- new FeedItem(y, batch_ys));*/`
	`73`	`+ new FeedItem(y, batch_ys));`
	`74`	`+`
	`75`	`+ // Compute average loss`
	`76`	`+ avg_cost += c / total_batch;`
`74`	`77`	`}`
`75`	`78`	`}`
`76`	`79`	`});`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public void NDimConst()`
`81`	`81`
`82`	`82`	`Assert.AreEqual(result.shape[0], 2);`
`83`	`83`	`Assert.AreEqual(result.shape[1], 3);`
`84`		`- Assert.IsTrue(Enumerable.SequenceEqual(new int[] { 3, 2, 1, 1, 1, 3 }, data));`
	`84`	`+ Assert.IsTrue(Enumerable.SequenceEqual(new int[] { 3, 1, 1, 2, 1, 3 }, data));`
`85`	`85`	`});`
`86`	`86`	`}`
`87`	`87`