Skip to content

Commit 0060039

Browse files
AsakusaRinneAsakusaRinne
committed
Resolve the comments and errors.
1 parent 3f46862 commit 0060039

File tree

3 files changed

+38
-61
lines changed

3 files changed

+38
-61
lines changed

‎src/TensorFlowNET.Core/Checkpoint/CheckpointReader.cs

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44
using System.Linq;
55
using System.Runtime.InteropServices;
66
using System.Text;
7+
using Tensorflow.Util;
78

89
namespace Tensorflow.Checkpoint
910
{
10-
public class CheckpointReader : IDisposable
11+
public class CheckpointReader : SafeTensorflowHandle
1112
{
12-
private IntPtr _reader;
1313
public Dictionary<string, TF_DataType> VariableToDataTypeMap { get; set; }
1414
public Dictionary<string, Shape> VariableToShapeMap { get; set; }
1515

1616
public CheckpointReader(string filename)
1717
{
1818
Status status = new Status();
19-
_reader = c_api.TF_NewCheckpointReader(filename, status.Handle);
19+
handle = c_api.TF_NewCheckpointReader(filename, status.Handle);
2020
status.Check(true);
2121
ReadAllShapeAndType();
2222
}
2323

2424
public int HasTensor(string name)
2525
{
26-
return c_api.TF_CheckpointReaderHasTensor(_reader, name);
26+
return c_api.TF_CheckpointReaderHasTensor(handle, name);
2727
}
2828

2929
/// <summary>
@@ -33,17 +33,17 @@ public int HasTensor(string name)
3333
/// <returns></returns>
3434
public string GetVariable(int index)
3535
{
36-
return c_api.TF_CheckpointReaderGetVariable(_reader, index);
36+
return c_api.TF_CheckpointReaderGetVariable(handle, index);
3737
}
3838

3939
public int Size()
4040
{
41-
return c_api.TF_CheckpointReaderSize(_reader);
41+
return c_api.TF_CheckpointReaderSize(handle);
4242
}
4343

4444
public TF_DataType GetVariableDataType(string name)
4545
{
46-
return c_api.TF_CheckpointReaderGetVariableDataType(_reader, name);
46+
return c_api.TF_CheckpointReaderGetVariableDataType(handle, name);
4747
}
4848

4949
public Shape GetVariableShape(string name)
@@ -52,20 +52,20 @@ public Shape GetVariableShape(string name)
5252
int num_dims = GetVariableNumDims(name);
5353
long[] dims = new long[num_dims];
5454
Status status = new Status();
55-
c_api.TF_CheckpointReaderGetVariableShape(_reader, name, dims, num_dims, status.Handle);
55+
c_api.TF_CheckpointReaderGetVariableShape(handle, name, dims, num_dims, status.Handle);
5656
status.Check(true);
5757
return new Shape(dims);
5858
}
5959

6060
public int GetVariableNumDims(string name)
6161
{
62-
return c_api.TF_CheckpointReaderGetVariableNumDims(_reader, name);
62+
return c_api.TF_CheckpointReaderGetVariableNumDims(handle, name);
6363
}
6464

6565
public unsafe Tensor GetTensor(string name, TF_DataType dtype = TF_DataType.DtInvalid)
6666
{
6767
Status status = new Status();
68-
var tensor = c_api.TF_CheckpointReaderGetTensor(_reader, name, status.Handle);
68+
var tensor = c_api.TF_CheckpointReaderGetTensor(handle, name, status.Handle);
6969
status.Check(true);
7070
var shape = GetVariableShape(name);
7171
if(dtype == TF_DataType.DtInvalid)
@@ -90,9 +90,15 @@ private void ReadAllShapeAndType()
9090
}
9191
}
9292

93+
protected override bool ReleaseHandle()
94+
{
95+
c_api.TF_DeleteCheckpointReader(handle);
96+
return true;
97+
}
98+
9399
public void Dispose()
94100
{
95-
c_api.TF_DeleteCheckpointReader(_reader);
101+
c_api.TF_DeleteCheckpointReader(handle);
96102
}
97103
}
98104
}

‎src/TensorFlowNET.Core/Keras/Common/CustomizedDTypeJsonConverter.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
using Newtonsoft.Json.Linq;
22
using Newtonsoft.Json;
3-
using System;
4-
using System.Collections.Generic;
5-
using System.Text;
63

74
namespace Tensorflow.Keras.Common
85
{
@@ -19,7 +16,7 @@ public override bool CanConvert(Type objectType)
1916

2017
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
2118
{
22-
var token = JToken.FromObject(value);
19+
var token = JToken.FromObject(dtypes.as_numpy_name((TF_DataType)value));
2320
token.WriteTo(writer);
2421
}
2522

‎src/TensorFlowNET.Keras/Utils/generic_utils.cs

Lines changed: 20 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ limitations under the License.
2222
using System.Data;
2323
using System.Diagnostics;
2424
using System.Linq;
25+
using System.Reflection;
2526
using Tensorflow.Keras.ArgsDefinition;
2627
using Tensorflow.Keras.Engine;
2728
using Tensorflow.Keras.Layers;
@@ -58,59 +59,32 @@ public static JObject serialize_keras_object(IKerasConfigable instance)
5859

5960
public static Layer deserialize_keras_object(string class_name, JToken config)
6061
{
61-
return class_name switch
62-
{
63-
"Sequential" => new Sequential(config.ToObject<SequentialArgs>()),
64-
"InputLayer" => new InputLayer(config.ToObject<InputLayerArgs>()),
65-
"Flatten" => new Flatten(config.ToObject<FlattenArgs>()),
66-
"ELU" => new ELU(config.ToObject<ELUArgs>()),
67-
"Dense" => new Dense(config.ToObject<DenseArgs>()),
68-
"Softmax" => new Softmax(config.ToObject<SoftmaxArgs>()),
69-
"Conv2D" => new Conv2D(config.ToObject<Conv2DArgs>()),
70-
"BatchNormalization" => new BatchNormalization(config.ToObject<BatchNormalizationArgs>()),
71-
"MaxPooling2D" => new MaxPooling2D(config.ToObject<MaxPooling2DArgs>()),
72-
"Dropout" => new Dropout(config.ToObject<DropoutArgs>()),
73-
_ => throw new NotImplementedException($"The deserialization of <{class_name}> has not been supported. Usually it's a miss during the development. " +
74-
$"Please submit an issue to https://github.com/SciSharp/TensorFlow.NET/issues")
75-
};
62+
var argType = Assembly.Load("Tensorflow.Binding").GetType($"Tensorflow.Keras.ArgsDefinition.{class_name}Args");
63+
var deserializationMethod = typeof(JToken).GetMethods(BindingFlags.Instance | BindingFlags.Public)
64+
.Single(x => x.Name == "ToObject" && x.IsGenericMethodDefinition && x.GetParameters().Count() == 0);
65+
var deserializationGenericMethod = deserializationMethod.MakeGenericMethod(argType);
66+
var args = deserializationGenericMethod.Invoke(config, null);
67+
var layer = Assembly.Load("Tensorflow.Keras").CreateInstance($"Tensorflow.Keras.Layers.{class_name}", true, BindingFlags.Default, null, new object[] { args }, null, null);
68+
Debug.Assert(layer is Layer);
69+
return layer as Layer;
7670
}
7771

7872
public static Layer deserialize_keras_object(string class_name, LayerArgs args)
7973
{
80-
return class_name switch
81-
{
82-
"Sequential" => new Sequential(args as SequentialArgs),
83-
"InputLayer" => new InputLayer(args as InputLayerArgs),
84-
"Flatten" => new Flatten(args as FlattenArgs),
85-
"ELU" => new ELU(args as ELUArgs),
86-
"Dense" => new Dense(args as DenseArgs),
87-
"Softmax" => new Softmax(args as SoftmaxArgs),
88-
"Conv2D" => new Conv2D(args as Conv2DArgs),
89-
"BatchNormalization" => new BatchNormalization(args as BatchNormalizationArgs),
90-
"MaxPooling2D" => new MaxPooling2D(args as MaxPooling2DArgs),
91-
"Dropout" => new Dropout(args as DropoutArgs),
92-
_ => throw new NotImplementedException($"The deserialization of <{class_name}> has not been supported. Usually it's a miss during the development. " +
93-
$"Please submit an issue to https://github.com/SciSharp/TensorFlow.NET/issues")
94-
};
74+
var layer = Assembly.Load("Tensorflow.Keras").CreateInstance($"Tensorflow.Keras.Layers.{class_name}", true, BindingFlags.Default, null, new object[] { args }, null, null);
75+
Debug.Assert(layer is Layer);
76+
return layer as Layer;
9577
}
9678

97-
public static LayerArgs? deserialize_layer_args(string class_name, JToken config)
79+
public static LayerArgs deserialize_layer_args(string class_name, JToken config)
9880
{
99-
return class_name switch
100-
{
101-
"Sequential" => config.ToObject<SequentialArgs>(),
102-
"InputLayer" => config.ToObject<InputLayerArgs>(),
103-
"Flatten" => config.ToObject<FlattenArgs>(),
104-
"ELU" => config.ToObject<ELUArgs>(),
105-
"Dense" => config.ToObject<DenseArgs>(),
106-
"Softmax" => config.ToObject<SoftmaxArgs>(),
107-
"Conv2D" => config.ToObject<Conv2DArgs>(),
108-
"BatchNormalization" => config.ToObject<BatchNormalizationArgs>(),
109-
"MaxPooling2D" => config.ToObject<MaxPooling2DArgs>(),
110-
"Dropout" => config.ToObject<DropoutArgs>(),
111-
_ => throw new NotImplementedException($"The deserialization of <{class_name}> has not been supported. Usually it's a miss during the development. " +
112-
$"Please submit an issue to https://github.com/SciSharp/TensorFlow.NET/issues")
113-
};
81+
var argType = Assembly.Load("Tensorflow.Binding").GetType($"Tensorflow.Keras.ArgsDefinition.{class_name}Args");
82+
var deserializationMethod = typeof(JToken).GetMethods(BindingFlags.Instance | BindingFlags.Public)
83+
.Single(x => x.Name == "ToObject" && x.IsGenericMethodDefinition && x.GetParameters().Count() == 0);
84+
var deserializationGenericMethod = deserializationMethod.MakeGenericMethod(argType);
85+
var args = deserializationGenericMethod.Invoke(config, null);
86+
Debug.Assert(args is LayerArgs);
87+
return args as LayerArgs;
11488
}
11589

11690
public static ModelConfig deserialize_model_config(JToken json)

0 commit comments

Comments
 (0)