FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge branch 'SciSharp:master' into alnovi/optimizer_tests · MSavameri/TensorFlow.NET@2a5d0f7 · GitHub

/ TensorFlow.NET Public
forked from SciSharp/TensorFlow.NET

Commit 2a5d0f7

Browse files
novikov-alexander
authored
Merge branch 'SciSharp:master' into alnovi/optimizer_tests
2 parents c906f46 + ee004c0 commit 2a5d0f7

4 files changed

Lines changed: 58 additions & 17 deletions

File tree

‎src/TensorFlowNET.Core/Util/Data.cs‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Tensorflow.NumPy;
1+
using OneOf;
2+
using Tensorflow.NumPy;
23

34
namespace Tensorflow.Util
45
{
@@ -8,10 +9,10 @@ namespace Tensorflow.Util
89
/// </summary>
910
public class ValidationDataPack
1011
{
11-
public NDArray val_x;
12-
public NDArray val_y;
13-
public NDArray val_sample_weight = null;
14-
12+
internal OneOf<NDArray, NDArray[]> val_x;
13+
internal NDArray val_y;
14+
internal NDArray val_sample_weight = null;
15+
public bool val_x_is_array = false;
1516
public ValidationDataPack((NDArray, NDArray) validation_data)
1617
{
1718
this.val_x = validation_data.Item1;
@@ -27,15 +28,17 @@ public ValidationDataPack((NDArray, NDArray, NDArray) validation_data)
2728

2829
public ValidationDataPack((IEnumerable<NDArray>, NDArray) validation_data)
2930
{
30-
this.val_x = validation_data.Item1.ToArray()[0];
31+
this.val_x = validation_data.Item1.ToArray();
3132
this.val_y = validation_data.Item2;
33+
val_x_is_array = true;
3234
}
3335

3436
public ValidationDataPack((IEnumerable<NDArray>, NDArray, NDArray) validation_data)
3537
{
36-
this.val_x = validation_data.Item1.ToArray()[0];
38+
this.val_x = validation_data.Item1.ToArray();
3739
this.val_y = validation_data.Item2;
3840
this.val_sample_weight = validation_data.Item3;
41+
val_x_is_array = true;
3942
}
4043

4144
public static implicit operator ValidationDataPack((NDArray, NDArray) validation_data)
@@ -52,15 +55,24 @@ public static implicit operator ValidationDataPack((IEnumerable<NDArray>, NDArra
5255

5356
public void Deconstruct(out NDArray val_x, out NDArray val_y)
5457
{
55-
val_x = this.val_x;
58+
val_x = this.val_x.AsT0;
5659
val_y = this.val_y;
5760
}
5861

5962
public void Deconstruct(out NDArray val_x, out NDArray val_y, out NDArray val_sample_weight)
6063
{
61-
val_x = this.val_x;
64+
val_x = this.val_x.AsT0;
65+
val_y = this.val_y;
66+
val_sample_weight = this.val_sample_weight;
67+
}
68+
69+
// add a unuse parameter to make it different from Deconstruct(out NDArray val_x, out NDArray val_y, out NDArray val_sample_weight)
70+
public void Deconstruct(out NDArray[] val_x_array, out NDArray val_y, out NDArray val_sample_weight, out NDArray unuse)
71+
{
72+
val_x_array = this.val_x.AsT1;
6273
val_y = this.val_y;
6374
val_sample_weight = this.val_sample_weight;
75+
unuse = null;
6476
}
6577
}
6678
}

‎src/TensorFlowNET.Keras/Engine/DataAdapters/DataAdapter.cs‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,17 @@ public static ((IEnumerable<NDArray>, NDArray, NDArray), ValidationDataPack) tra
9292
var train_y = y[new Slice(0, train_count)];
9393
var val_x = x.Select(x => x[new Slice(train_count)] as NDArray);
9494
var val_y = y[new Slice(train_count)];
95-
NDArray tmp_sample_weight = sample_weight;
96-
sample_weight = sample_weight[new Slice(0, train_count)];
97-
ValidationDataPack validation_data = (val_x, val_y, tmp_sample_weight[new Slice(train_count)]);
95+
96+
ValidationDataPack validation_data;
97+
if (sample_weight != null)
98+
{
99+
validation_data = (val_x, val_y, sample_weight[new Slice(train_count)]);
100+
sample_weight = sample_weight[new Slice(0, train_count)];
101+
}
102+
else
103+
{
104+
validation_data = (val_x, val_y);
105+
}
98106
return ((train_x, train_y, sample_weight), validation_data);
99107
}
100108
}

‎src/TensorFlowNET.Keras/Engine/Model.Evaluate.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,19 @@ public Dictionary<string, float> evaluate(NDArray x, NDArray y,
7070
return evaluate(data_handler, callbacks, is_val, test_function);
7171
}
7272

73-
public Dictionary<string, float> evaluate(IEnumerable<Tensor> x, Tensor y, int verbose = 1, bool is_val = false)
73+
public Dictionary<string, float> evaluate(
74+
IEnumerable<Tensor> x,
75+
Tensor y,
76+
int verbose = 1,
77+
NDArray sample_weight = null,
78+
bool is_val = false)
7479
{
7580
var data_handler = new DataHandler(new DataHandlerArgs
7681
{
7782
X = new Tensors(x.ToArray()),
7883
Y = y,
7984
Model = this,
85+
SampleWeight = sample_weight,
8086
StepsPerExecution = _steps_per_execution
8187
});
8288

‎src/TensorFlowNET.Keras/Engine/Model.Fit.cs‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Diagnostics;
88
using Tensorflow.Keras.Callbacks;
99
using Tensorflow.Util;
10+
using OneOf;
1011

1112
namespace Tensorflow.Keras.Engine
1213
{
@@ -287,10 +288,24 @@ History FitInternal(DataHandler data_handler, int epochs, int verbose, List<ICal
287288

288289
if (validation_data != null)
289290
{
290-
// Because evaluate calls call_test_batch_end, this interferes with our output on the screen
291-
// so we need to pass a is_val parameter to stop on_test_batch_end
292-
var (val_x, val_y, val_sample_weight) = validation_data;
293-
var val_logs = evaluate(val_x, val_y, sample_weight:val_sample_weight, is_val:true);
291+
NDArray val_x;
292+
NDArray[] val_x_array;
293+
NDArray val_y;
294+
NDArray val_sample_weight;
295+
Dictionary<string, float> val_logs;
296+
if (!validation_data.val_x_is_array)
297+
{
298+
(val_x, val_y, val_sample_weight) = validation_data;
299+
// Because evaluate calls call_test_batch_end, this interferes with our output on the screen
300+
// so we need to pass a is_val parameter to stop on_test_batch_end
301+
val_logs = evaluate(val_x, val_y, sample_weight: val_sample_weight, is_val: true);
302+
303+
}
304+
else
305+
{
306+
(val_x_array, val_y, val_sample_weight, _) = validation_data;
307+
val_logs = evaluate(val_x_array, val_y, sample_weight: val_sample_weight, is_val: true);
308+
}
294309
foreach (var log in val_logs)
295310
{
296311
logs["val_" + log.Key] = log.Value;

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL