Browse Source

Fix Sequential model.summary missing layers. #960

tags/v0.100.4-load-saved-model
Haiping Chen 2 years ago
parent
commit
2adfcd2cf9
4 changed files with 9 additions and 2 deletions
  1. +1
    -1
      src/TensorFlowNET.Keras/Engine/Layer.FlattenLayers.cs
  2. +1
    -1
      src/TensorFlowNET.Keras/Engine/Layer.Layers.cs
  3. +4
    -0
      src/TensorFlowNET.Keras/Engine/Model.cs
  4. +3
    -0
      src/TensorFlowNET.Keras/Engine/Sequential.cs

+ 1
- 1
src/TensorFlowNET.Keras/Engine/Layer.FlattenLayers.cs View File

@@ -10,7 +10,7 @@ namespace Tensorflow.Keras.Engine
yield return this; yield return this;


var seen_object_ids = new List<int>(); var seen_object_ids = new List<int>();
var deque = new Queue<ILayer>(_layers);
var deque = new Queue<ILayer>(_self_tracked_trackables);
while (!deque.empty()) while (!deque.empty())
{ {
var layer_or_container = deque.Dequeue(); var layer_or_container = deque.Dequeue();


+ 1
- 1
src/TensorFlowNET.Keras/Engine/Layer.Layers.cs View File

@@ -6,7 +6,7 @@ namespace Tensorflow.Keras.Engine
public partial class Layer public partial class Layer
{ {
protected List<ILayer> _layers = new List<ILayer>(); protected List<ILayer> _layers = new List<ILayer>();
public List<ILayer> Layers => _layers;
public virtual List<ILayer> Layers => _layers;


protected void StackLayers(params ILayer[] layers) protected void StackLayers(params ILayer[] layers)
{ {


+ 4
- 0
src/TensorFlowNET.Keras/Engine/Model.cs View File

@@ -1,4 +1,5 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using Tensorflow.Keras.ArgsDefinition; using Tensorflow.Keras.ArgsDefinition;
using Tensorflow.Keras.Engine.DataAdapters; using Tensorflow.Keras.Engine.DataAdapters;
using Tensorflow.Keras.Losses; using Tensorflow.Keras.Losses;
@@ -70,6 +71,9 @@ namespace Tensorflow.Keras.Engine
aggregation: VariableAggregation.OnlyFirstReplica); aggregation: VariableAggregation.OnlyFirstReplica);
} }


public override List<ILayer> Layers
=> _flatten_layers(recursive: false, include_self: false).ToList();

public override List<IVariableV1> trainable_variables public override List<IVariableV1> trainable_variables
{ {
get get


+ 3
- 0
src/TensorFlowNET.Keras/Engine/Sequential.cs View File

@@ -202,5 +202,8 @@ namespace Tensorflow.Keras.Engine
created_nodes.add(prev_layer.OutboundNodes.Last()); created_nodes.add(prev_layer.OutboundNodes.Last());
} }
} }

public override List<ILayer> Layers
=> base.Layers.Where(x => x is not InputLayer).ToList();
} }
} }

Loading…
Cancel
Save