diff --git a/TensorFlow.NET.sln b/TensorFlow.NET.sln
index 069ae794..12b93519 100644
--- a/TensorFlow.NET.sln
+++ b/TensorFlow.NET.sln
@@ -9,11 +9,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowNET.Examples", "t
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowNET.Core", "src\TensorFlowNET.Core\TensorFlowNET.Core.csproj", "{FD682AC0-7B2D-45D3-8B0D-C6D678B04144}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MakinaNET.Core", "src\MakinaNET.Core\MakinaNET.Core.csproj", "{6FF518EB-523F-4930-919E-05011EFCED6F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Keras.Core", "src\KerasNET.Core\Keras.Core.csproj", "{902E188F-A953-43B4-9991-72BAB1697BC3}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakinaNET.Example", "src\MakinaNET.Example\MakinaNET.Example.csproj", "{17E1AC16-9E0E-4545-905A-E92C6300C7AF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Keras.Example", "test\KerasNET.Example\Keras.Example.csproj", "{17E1AC16-9E0E-4545-905A-E92C6300C7AF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakinaNET.UnitTest", "src\MakinaNET.Test\MakinaNET.UnitTest.csproj", "{02F54D9F-617B-4B15-9D21-E21AF66693B1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Keras.UnitTest", "test\KerasNET.Test\Keras.UnitTest.csproj", "{A5839A45-A117-4BEA-898B-DE1ED6E0D58F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -33,18 +33,18 @@ Global
{FD682AC0-7B2D-45D3-8B0D-C6D678B04144}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD682AC0-7B2D-45D3-8B0D-C6D678B04144}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD682AC0-7B2D-45D3-8B0D-C6D678B04144}.Release|Any CPU.Build.0 = Release|Any CPU
- {6FF518EB-523F-4930-919E-05011EFCED6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6FF518EB-523F-4930-919E-05011EFCED6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6FF518EB-523F-4930-919E-05011EFCED6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6FF518EB-523F-4930-919E-05011EFCED6F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {902E188F-A953-43B4-9991-72BAB1697BC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {902E188F-A953-43B4-9991-72BAB1697BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {902E188F-A953-43B4-9991-72BAB1697BC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {902E188F-A953-43B4-9991-72BAB1697BC3}.Release|Any CPU.Build.0 = Release|Any CPU
{17E1AC16-9E0E-4545-905A-E92C6300C7AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17E1AC16-9E0E-4545-905A-E92C6300C7AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17E1AC16-9E0E-4545-905A-E92C6300C7AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17E1AC16-9E0E-4545-905A-E92C6300C7AF}.Release|Any CPU.Build.0 = Release|Any CPU
- {02F54D9F-617B-4B15-9D21-E21AF66693B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {02F54D9F-617B-4B15-9D21-E21AF66693B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {02F54D9F-617B-4B15-9D21-E21AF66693B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {02F54D9F-617B-4B15-9D21-E21AF66693B1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A5839A45-A117-4BEA-898B-DE1ED6E0D58F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A5839A45-A117-4BEA-898B-DE1ED6E0D58F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A5839A45-A117-4BEA-898B-DE1ED6E0D58F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A5839A45-A117-4BEA-898B-DE1ED6E0D58F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/MakinaNET.Core/Core.cs b/src/KerasNET.Core/Core.cs
similarity index 89%
rename from src/MakinaNET.Core/Core.cs
rename to src/KerasNET.Core/Core.cs
index e8a07ebf..8adae938 100644
--- a/src/MakinaNET.Core/Core.cs
+++ b/src/KerasNET.Core/Core.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
using System.Text;
using Tensorflow;
-namespace Makina
+namespace Keras
{
- public static class Makina
+ public static class Keras
{
public static Tensor create_tensor(int[] shape, float mean = 0, float stddev = 1, TF_DataType dtype = TF_DataType.TF_FLOAT, int? seed = null, string name = null)
{
diff --git a/src/MakinaNET.Core/IInitializer.cs b/src/KerasNET.Core/IInitializer.cs
similarity index 87%
rename from src/MakinaNET.Core/IInitializer.cs
rename to src/KerasNET.Core/IInitializer.cs
index f60987a5..53cb9112 100644
--- a/src/MakinaNET.Core/IInitializer.cs
+++ b/src/KerasNET.Core/IInitializer.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Makina
+namespace Keras
{
interface IInitializer
{
diff --git a/src/MakinaNET.Core/Initializer/BaseInitializer.cs b/src/KerasNET.Core/Initializer/BaseInitializer.cs
similarity index 87%
rename from src/MakinaNET.Core/Initializer/BaseInitializer.cs
rename to src/KerasNET.Core/Initializer/BaseInitializer.cs
index 31c301c6..84a420a7 100644
--- a/src/MakinaNET.Core/Initializer/BaseInitializer.cs
+++ b/src/KerasNET.Core/Initializer/BaseInitializer.cs
@@ -4,7 +4,7 @@ using System.Text;
using Tensorflow;
using Tensorflow.Layers;
-namespace Makina.Initializer
+namespace Keras.Initializer
{
class BaseInitializer : IInitializer
{
diff --git a/src/MakinaNET.Core/MakinaNET.Core.csproj b/src/KerasNET.Core/Keras.Core.csproj
similarity index 75%
rename from src/MakinaNET.Core/MakinaNET.Core.csproj
rename to src/KerasNET.Core/Keras.Core.csproj
index c844d9a1..3a7cfc6b 100644
--- a/src/MakinaNET.Core/MakinaNET.Core.csproj
+++ b/src/KerasNET.Core/Keras.Core.csproj
@@ -2,8 +2,8 @@
netstandard2.0
- Makina
- Makina
+ Keras
+ Keras
diff --git a/src/MakinaNET.Core/Layers/Dense.cs b/src/KerasNET.Core/Layers/Dense.cs
similarity index 96%
rename from src/MakinaNET.Core/Layers/Dense.cs
rename to src/KerasNET.Core/Layers/Dense.cs
index 3196ff0d..66569882 100644
--- a/src/MakinaNET.Core/Layers/Dense.cs
+++ b/src/KerasNET.Core/Layers/Dense.cs
@@ -3,12 +3,12 @@ using System.Collections.Generic;
using System.Text;
using System.Linq;
using Tensorflow;
-using static Makina.Makina;
-using Makina;
+using static Keras.Keras;
+using Keras;
using NumSharp;
using Tensorflow.Operations.Activation;
-namespace Makina.Layers
+namespace Keras.Layers
{
public class Dense : ILayer
{
diff --git a/src/MakinaNET.Core/Layers/ILayer.cs b/src/KerasNET.Core/Layers/ILayer.cs
similarity index 93%
rename from src/MakinaNET.Core/Layers/ILayer.cs
rename to src/KerasNET.Core/Layers/ILayer.cs
index 45e64ac6..2c033eef 100644
--- a/src/MakinaNET.Core/Layers/ILayer.cs
+++ b/src/KerasNET.Core/Layers/ILayer.cs
@@ -4,7 +4,7 @@ using System.Text;
using Tensorflow;
using NumSharp;
-namespace Makina.Layers
+namespace Keras.Layers
{
public interface ILayer
{
diff --git a/src/MakinaNET.Core/Model.cs b/src/KerasNET.Core/Model.cs
similarity index 98%
rename from src/MakinaNET.Core/Model.cs
rename to src/KerasNET.Core/Model.cs
index 5b682ba9..d1d889fc 100644
--- a/src/MakinaNET.Core/Model.cs
+++ b/src/KerasNET.Core/Model.cs
@@ -1,13 +1,13 @@
-using Makina.Layers;
+using Keras.Layers;
using NumSharp;
using System;
using System.Collections.Generic;
using System.Text;
using Tensorflow;
-using static Makina.Makina;
+using static Keras.Keras;
using static Tensorflow.Python;
-namespace Makina
+namespace Keras
{
public class Model
{
diff --git a/src/MakinaNET.Test/MakinaNET.UnitTest.csproj b/src/MakinaNET.Test/MakinaNET.UnitTest.csproj
deleted file mode 100644
index 1a744896..00000000
--- a/src/MakinaNET.Test/MakinaNET.UnitTest.csproj
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
- Debug
- AnyCPU
- {02F54D9F-617B-4B15-9D21-E21AF66693B1}
- Library
- Properties
- MakinaNET.Test
- MakinaNET.Test
- v4.7.2
- 512
- {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 15.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
- $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
- False
- UnitTest
-
-
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
- ..\..\packages\ArrayFire.0.0.2\lib\netstandard2.0\ArrayFire.dll
-
-
- ..\..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll
-
-
- ..\..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll
-
-
- ..\..\packages\NumSharp.0.10.1\lib\netstandard2.0\NumSharp.Core.dll
-
-
-
- ..\..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll
-
-
-
- ..\..\packages\System.Memory.4.5.2\lib\netstandard2.0\System.Memory.dll
-
-
-
- ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
-
-
- ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
-
-
-
-
-
-
-
-
-
-
-
-
- {6ff518eb-523f-4930-919e-05011efced6f}
- MakinaNET.Core
-
-
- {fd682ac0-7b2d-45d3-8b0d-c6d678b04144}
- TensorFlowNET.Core
-
-
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/MakinaNET.Test/Properties/AssemblyInfo.cs b/src/MakinaNET.Test/Properties/AssemblyInfo.cs
deleted file mode 100644
index 107f1cc6..00000000
--- a/src/MakinaNET.Test/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Makina.Test")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Makina.Test")]
-[assembly: AssemblyCopyright("Copyright © 2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: Guid("02f54d9f-617b-4b15-9d21-e21af66693b1")]
-
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/MakinaNET.Test/app.config b/src/MakinaNET.Test/app.config
deleted file mode 100644
index 254c62f6..00000000
--- a/src/MakinaNET.Test/app.config
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/MakinaNET.Example/App.config b/test/KerasNET.Example/App.config
similarity index 100%
rename from src/MakinaNET.Example/App.config
rename to test/KerasNET.Example/App.config
diff --git a/src/MakinaNET.Example/MakinaNET.Example.csproj b/test/KerasNET.Example/Keras.Example.csproj
similarity index 94%
rename from src/MakinaNET.Example/MakinaNET.Example.csproj
rename to test/KerasNET.Example/Keras.Example.csproj
index a3a596fc..f5986c92 100644
--- a/src/MakinaNET.Example/MakinaNET.Example.csproj
+++ b/test/KerasNET.Example/Keras.Example.csproj
@@ -74,11 +74,11 @@
-
- {6ff518eb-523f-4930-919e-05011efced6f}
- MakinaNET.Core
+
+ {902e188f-a953-43b4-9991-72bab1697bc3}
+ Keras.Core
-
+
{fd682ac0-7b2d-45d3-8b0d-c6d678b04144}
TensorFlowNET.Core
diff --git a/src/MakinaNET.Example/Program.cs b/test/KerasNET.Example/Program.cs
similarity index 93%
rename from src/MakinaNET.Example/Program.cs
rename to test/KerasNET.Example/Program.cs
index f68b5fe3..2fbf288c 100644
--- a/src/MakinaNET.Example/Program.cs
+++ b/test/KerasNET.Example/Program.cs
@@ -5,18 +5,18 @@ using System.Text;
using System.Threading.Tasks;
using Tensorflow;
using static Tensorflow.Python;
-using static Makina.Makina;
-using Makina.Layers;
-using Makina;
+using static Keras.Keras;
+using Keras.Layers;
+using Keras;
using NumSharp;
-namespace Makina.Example
+namespace Keras.Example
{
class Program
{
static void Main(string[] args)
{
- Console.WriteLine("================================== Makina ==================================");
+ Console.WriteLine("================================== Keras ==================================");
#region data
var batch_size = 1000;
diff --git a/src/MakinaNET.Example/Properties/AssemblyInfo.cs b/test/KerasNET.Example/Properties/AssemblyInfo.cs
similarity index 93%
rename from src/MakinaNET.Example/Properties/AssemblyInfo.cs
rename to test/KerasNET.Example/Properties/AssemblyInfo.cs
index e1a21eb2..772c5031 100644
--- a/src/MakinaNET.Example/Properties/AssemblyInfo.cs
+++ b/test/KerasNET.Example/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("Makina.Example")]
+[assembly: AssemblyTitle("Keras.Example")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Makina.Example")]
+[assembly: AssemblyProduct("Keras.Example")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/src/MakinaNET.Example/packages.config b/test/KerasNET.Example/packages.config
similarity index 100%
rename from src/MakinaNET.Example/packages.config
rename to test/KerasNET.Example/packages.config
diff --git a/src/MakinaNET.Test/BaseTests.cs b/test/KerasNET.Test/BaseTests.cs
similarity index 65%
rename from src/MakinaNET.Test/BaseTests.cs
rename to test/KerasNET.Test/BaseTests.cs
index 545e7a8a..6a716c5f 100644
--- a/src/MakinaNET.Test/BaseTests.cs
+++ b/test/KerasNET.Test/BaseTests.cs
@@ -1,11 +1,11 @@
using System;
using Tensorflow;
-using Makina;
-using Makina.Layers;
+using Keras;
+using Keras.Layers;
using NumSharp;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-namespace Makina.Test
+namespace Keras.Test
{
[TestClass]
public class BaseTests
@@ -17,7 +17,12 @@ namespace Makina.Test
var input = new Tensor(np.array(new int[] { 3 }));
dense_1.__build__(input.getShape());
var outputShape = dense_1.output_shape(input.getShape());
- //Assert.AreEqual(outputShape.Dimensions, new int[] { 1 });
+ var a = (int[])(outputShape.Dimensions);
+ var b = (int[])(new int[] { 1 });
+ var _a = np.array(a);
+ var _b = np.array(b);
+
+ Assert.IsTrue(np.array_equal(_a, _b));
}
}
}
diff --git a/test/KerasNET.Test/Keras.UnitTest.csproj b/test/KerasNET.Test/Keras.UnitTest.csproj
new file mode 100644
index 00000000..e2a0e357
--- /dev/null
+++ b/test/KerasNET.Test/Keras.UnitTest.csproj
@@ -0,0 +1,34 @@
+
+
+
+ netcoreapp2.2
+
+ false
+
+ Keras.UnitTest
+
+ Keras.UnitTest
+
+
+
+ DEBUG;TRACE
+ true
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/MakinaNET.Test/packages.config b/test/KerasNET.Test/packages.config
similarity index 100%
rename from src/MakinaNET.Test/packages.config
rename to test/KerasNET.Test/packages.config