From b5d1021f077fc0252232bfa4f7418f0f01b2c5ae Mon Sep 17 00:00:00 2001 From: Eli Belash Date: Tue, 27 Aug 2019 23:01:25 +0300 Subject: [PATCH] BaseSession.run: revamped validate and process feed_dict. --- src/TensorFlowNET.Core/Sessions/BaseSession.cs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/TensorFlowNET.Core/Sessions/BaseSession.cs b/src/TensorFlowNET.Core/Sessions/BaseSession.cs index 96c8a657..f81e1bf9 100644 --- a/src/TensorFlowNET.Core/Sessions/BaseSession.cs +++ b/src/TensorFlowNET.Core/Sessions/BaseSession.cs @@ -99,20 +99,15 @@ namespace Tensorflow var feed_dict_tensor = new Dictionary(); var feed_map = new Dictionary(); - Func> feed_fn = (item) => { return new (object, object)[] {(item.Key, item.Value)}; }; - // Validate and process feed_dict. - if (feed_dict != null) + if (feed_dict != null && feed_dict.Length > 0) { - foreach (var feed in feed_dict) + foreach (var subfeed in feed_dict) { - foreach (var (subfeed, subfeed_val) in feed_fn(feed)) - { - var subfeed_t = _graph.as_graph_element(subfeed, allow_tensor: true, allow_operation: false); - //var subfeed_dtype = subfeed_t.dtype.as_numpy_datatype(); // subfeed_dtype was never used - feed_dict_tensor[subfeed_t] = subfeed_val; - feed_map[subfeed_t.name] = (subfeed_t, subfeed_val); - } + var subfeed_t = _graph.as_graph_element(subfeed.Key, allow_tensor: true, allow_operation: false); + //var subfeed_dtype = subfeed_t.dtype.as_numpy_datatype(); // subfeed_dtype was never used + feed_dict_tensor[subfeed_t] = subfeed.Value; + feed_map[subfeed_t.name] = (subfeed_t, subfeed.Value); } }