Shape error for gradients/Sum_grad/Tile #193

Author: Oceania2018

src/TensorFlowNET.Core/Framework/common_shapes.py.cs

@@ -34,5 +34,10 @@ public static Tensor _broadcast_shape_helper(Tensor shape_x, Tensor shape_y)
         {
             return tensor.rank;
         }
+
+        public static bool has_fully_defined_shape(Tensor tensor)
+        {
+            return tensor.getShape().is_fully_defined();
+        }
     }
 }

src/TensorFlowNET.Core/Gradients/math_grad.cs

@@ -1,4 +1,5 @@
-using System;
+//using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

src/TensorFlowNET.Core/Operations/Operation.Output.cs

@@ -1,4 +1,5 @@
-using System;
+//using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;

src/TensorFlowNET.Core/Operations/Operation.cs

@@ -1,4 +1,5 @@
 using Google.Protobuf.Collections;
+//using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/TensorFlowNET.Core/Operations/gen_math_ops.cs

@@ -207,14 +207,14 @@ public static Tensor pow<Tx, Ty>(Tx x, Ty y, string name = null)
             return _op.outputs[0];
         }
 
-        public static Tensor sum(Tensor input, Tensor axis = null, bool keep_dims = false, string name = null)
+        public static Tensor _sum(Tensor input, Tensor axis = null, bool keep_dims = false, string name = null)
         {
             var _op = _op_def_lib._apply_op_helper("Sum", name, args: new { input, reduction_indices = axis, keep_dims });
 
             return _op.outputs[0];
         }
 
-        public static Tensor sum(Tensor input, int axis, bool keep_dims = false, string name = null)
+        public static Tensor _sum(Tensor input, int axis, bool keep_dims = false, string name = null)
         {
             var _op = _op_def_lib._apply_op_helper("Sum", name, args: new { input, reduction_indices = axis, keep_dims });
 

src/TensorFlowNET.Core/Operations/math_ops.py.cs

@@ -212,26 +212,29 @@ public static Tensor __case__(Tensor x, TF_DataType dtype, string name = null)
             throw new NotImplementedException();
         }
 
-        public static Tensor reduce_sum(Tensor input_tensor, Tensor axis = null, bool keepdims = false)
+        public static Tensor reduce_sum(Tensor input_tensor, Tensor axis = null, bool keepdims = false, string name = null)
         {
             var r = _ReductionDims(input_tensor, axis);
-            var m = gen_math_ops.sum(input_tensor, r);
-            return _may_reduce_to_scalar(keepdims, m);
+            var m = gen_math_ops._sum(input_tensor, r, keep_dims: keepdims, name: name);
+            return _may_reduce_to_scalar(keepdims, axis, m);
         }
 
         public static Tensor reduce_sum(Tensor input_tensor, int axis, bool keepdims = false)
         {
-            var m = gen_math_ops.sum(input_tensor, axis);
-            return _may_reduce_to_scalar(keepdims, m);
+            var m = gen_math_ops._sum(input_tensor, axis);
+            return _may_reduce_to_scalar(keepdims, new int[] { axis }, m);
         }
 
-        private static Tensor _may_reduce_to_scalar(bool keepdims, Tensor output)
+        private static Tensor _may_reduce_to_scalar(bool keepdims, Tensor axis, Tensor output)
         {
-            output.shape = new long[0];
+            if (!common_shapes.has_fully_defined_shape(output) &&
+                !keepdims &&
+                axis == null)
+                output.shape = new long[0];
             return output;
         }
 
-        private static Tensor _may_reduce_to_scalar(bool keepdims, int[] axos, Tensor output)
+        private static Tensor _may_reduce_to_scalar(bool keepdims, int[] axis, Tensor output)
         {
             output.shape = new long[0];
             return output;

src/TensorFlowNET.Core/Tensors/Tensor.cs

@@ -1,4 +1,5 @@
-using NumSharp.Core;
+//using Newtonsoft.Json;
+using NumSharp.Core;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/TensorFlowNET.Core/Tensors/tensor_util.cs

@@ -302,7 +302,7 @@ public static TensorShapeProto as_shape<T>(T[] dims)
                     default:
                         throw new NotImplementedException("as_shape Not Implemented");
                 }
-                dim.Name = $"dim_{i}";
+                // dim.Name = $"dim_{i}";
 
                 shape.Dim.Add(dim);
             }
@@ -333,7 +333,7 @@ public static TensorShapeProto as_proto(this TensorShape tshape)
             {
                 var dim = new TensorShapeProto.Types.Dim();
                 dim.Size = tshape.Dimensions[i];
-                dim.Name = $"dim_{i}";
+                //dim.Name = $"dim_{i}";
 
                 shape.Dim.Add(dim);
             }

test/TensorFlowNET.Examples/LogisticRegression.cs

@@ -49,13 +49,6 @@ private void PrepareData()
             // Gradient Descent
             var optimizer = tf.train.GradientDescentOptimizer(learning_rate).minimize(cost);
 
-            //var new_saver = tf.train.import_meta_graph("logistic_regression.meta.bin");
-
-            /*var text = JsonConvert.SerializeObject(tf.get_default_graph(), new JsonSerializerSettings
-            {
-                Formatting = Formatting.Indented
-            });*/
-
             // Initialize the variables (i.e. assign their default value)
             var init = tf.global_variables_initializer();