Skip to content

Commit 41df785

Browse files
Oceania2018Oceania2018
committed
Seperated Keras from binding project.
1 parent 8141f8c commit 41df785

471 files changed

Lines changed: 1333 additions & 6232 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎TensorFlow.NET.sln‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tensorflow.UnitTest", "test
1111
EndProject
1212
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowNET.Console", "src\TensorFlowNET.Console\TensorFlowNET.Console.csproj", "{03F06299-3F4B-4449-A709-3A647657BC0C}"
1313
EndProject
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tensorflow.Keras", "src\TensorFlowNET.Keras\Tensorflow.Keras.csproj", "{49D71826-C03D-4FA7-9BAC-22C1327E65CF}"
15+
EndProject
1416
Global
1517
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1618
Debug|Any CPU = Debug|Any CPU
@@ -123,6 +125,30 @@ Global
123125
{03F06299-3F4B-4449-A709-3A647657BC0C}.Release|x64.Build.0 = Release|Any CPU
124126
{03F06299-3F4B-4449-A709-3A647657BC0C}.Release|x86.ActiveCfg = Release|Any CPU
125127
{03F06299-3F4B-4449-A709-3A647657BC0C}.Release|x86.Build.0 = Release|Any CPU
128+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
129+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
130+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Debug|x64.ActiveCfg = Debug|x64
131+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Debug|x64.Build.0 = Debug|x64
132+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Debug|x86.ActiveCfg = Debug|Any CPU
133+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Debug|x86.Build.0 = Debug|Any CPU
134+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Debug-Minimal|Any CPU.ActiveCfg = Debug|Any CPU
135+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Debug-Minimal|Any CPU.Build.0 = Debug|Any CPU
136+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Debug-Minimal|x64.ActiveCfg = Debug|x64
137+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Debug-Minimal|x64.Build.0 = Debug|x64
138+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Debug-Minimal|x86.ActiveCfg = Debug|Any CPU
139+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Debug-Minimal|x86.Build.0 = Debug|Any CPU
140+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Publish|Any CPU.ActiveCfg = Release|Any CPU
141+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Publish|Any CPU.Build.0 = Release|Any CPU
142+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Publish|x64.ActiveCfg = Debug|x64
143+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Publish|x64.Build.0 = Debug|x64
144+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Publish|x86.ActiveCfg = Release|Any CPU
145+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Publish|x86.Build.0 = Release|Any CPU
146+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
147+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Release|Any CPU.Build.0 = Release|Any CPU
148+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Release|x64.ActiveCfg = Release|x64
149+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Release|x64.Build.0 = Release|x64
150+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Release|x86.ActiveCfg = Release|Any CPU
151+
{49D71826-C03D-4FA7-9BAC-22C1327E65CF}.Release|x86.Build.0 = Release|Any CPU
126152
EndGlobalSection
127153
GlobalSection(SolutionProperties) = preSolution
128154
HideSolutionNode = FALSE

‎src/TensorFlowNET.Console/Program.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using static Tensorflow.Binding;
32

43
namespace Tensorflow
54
{

‎src/TensorFlowNET.Console/TensorFlowNET.Console.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<ProjectReference Include="..\TensorFlowNET.Core\Tensorflow.Binding.csproj" />
15+
<ProjectReference Include="..\TensorFlowNET.Keras\Tensorflow.Keras.csproj" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/TensorFlowNET.Core/APIs/tf.nn.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,6 @@ public Tensor[] fused_batch_norm(Tensor x,
137137
is_training: is_training,
138138
name: name);
139139

140-
public IPoolFunction max_pool_fn => new MaxPoolFunction();
141-
142140
public Tensor max_pool(Tensor value, int[] ksize, int[] strides, string padding, string data_format = "NHWC", string name = null)
143141
=> nn_ops.max_pool(value, ksize, strides, padding, data_format: data_format, name: name);
144142

‎src/TensorFlowNET.Core/APIs/tf.optimizers.cs‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎src/TensorFlowNET.Core/APIs/tf.train.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ limitations under the License.
1515
******************************************************************************/
1616

1717
using System.Collections.Generic;
18-
using Tensorflow.Keras.Optimizers;
1918
using Tensorflow.Train;
2019

2120
namespace Tensorflow
@@ -87,7 +86,7 @@ public string latest_checkpoint(string checkpoint_dir, string latest_filename =
8786
public CheckpointState get_checkpoint_state(string checkpoint_dir, string latest_filename = null)
8887
=> checkpoint_management.get_checkpoint_state(checkpoint_dir, latest_filename: latest_filename);
8988

90-
public Tensor polynomial_decay(float learning_rate,
89+
/*public Tensor polynomial_decay(float learning_rate,
9190
RefVariable global_step,
9291
float decay_steps,
9392
float end_learning_rate = 0.0001f,
@@ -105,7 +104,7 @@ public Tensor polynomial_decay(float learning_rate,
105104
var decayed_lr = decayed.__call__(global_step);
106105
107106
return decayed_lr;
108-
}
107+
}*/
109108
}
110109
}
111110
}

‎src/TensorFlowNET.Core/Keras/ArgsDefinition/DataHandlerArgs.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class DataHandlerArgs
1414
public int MaxQueueSize { get; set; } = 10;
1515
public int Workers { get; set; } = 1;
1616
public bool UseMultiprocessing { get; set; } = false;
17-
public Model Model { get; set; }
17+
public IModel Model { get; set; }
1818
public IVariableV1 StepsPerExecution { get; set; }
1919
}
2020
}

‎src/TensorFlowNET.Core/Keras/ArgsDefinition/NodeArgs.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace Tensorflow.Keras.ArgsDefinition
44
{
55
public class NodeArgs
66
{
7-
public Layer[] InboundLayers { get; set; }
7+
public ILayer[] InboundLayers { get; set; }
88
public int[] NodeIndices { get; set; }
99
public int[] TensorIndices { get; set; }
1010
public Tensors InputTensors { get; set; }

‎src/TensorFlowNET.Core/Keras/ArgsDefinition/SequentialArgs.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ namespace Tensorflow.Keras.ArgsDefinition
55
{
66
public class SequentialArgs : ModelArgs
77
{
8-
public List<Layer> Layers { get; set; }
8+
public List<ILayer> Layers { get; set; }
99
}
1010
}

‎src/TensorFlowNET.Core/Keras/ArgsDefinition/TensorLikeDataAdapterArgs.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ public class TensorLikeDataAdapterArgs
1313
public int MaxQueueSize { get; set; }
1414
public int Worker { get; set; }
1515
public bool UseMultiprocessing { get; set; }
16-
public Model Model { get; set; }
16+
public IModel Model { get; set; }
1717
}
1818
}

0 commit comments

Comments
 (0)