GH-828: Accord.Neuro under .Net Standard 2.0

accord-net · Sep 6, 2017 · a257ba1 · a257ba1
1 parent 727d82d
commit a257ba1
Show file tree

Hide file tree

Showing 24 changed files with 771 additions and 8 deletions.
diff --git a/Setup/NuGet/Accord.Neuro.nuspec b/Setup/NuGet/Accord.Neuro.nuspec
@@ -41,7 +41,7 @@
     <file src="..\..\Release\net462\Accord.Neuro.dll" target="lib\net462\Accord.Neuro.dll" />
     <file src="..\..\Release\net462\Accord.Neuro.xml" target="lib\net462\Accord.Neuro.xml" />
 
-    <!-- <file src="..\..\Release\netstandard2.0\Accord.Neuro.xml" target="lib\netstandard2.0\Accord.Neuro.xml" /> -->
-    <!-- <file src="..\..\Release\netstandard2.0\Accord.Neuro.dll" target="lib\netstandard2.0\Accord.Neuro.dll" /> -->
+     <file src="..\..\Release\netstandard2.0\Accord.Neuro.xml" target="lib\netstandard2.0\Accord.Neuro.xml" /> 
+     <file src="..\..\Release\netstandard2.0\Accord.Neuro.dll" target="lib\netstandard2.0\Accord.Neuro.dll" /> 
   </files>
 </package>
diff --git a/Sources/Accord.NET (NETStandard).sln b/Sources/Accord.NET (NETStandard).sln
diff --git a/Sources/Accord.Neuro/AForge.Neuro/Activation Functions/BipolarSigmoidFunction.cs b/Sources/Accord.Neuro/AForge.Neuro/Activation Functions/BipolarSigmoidFunction.cs
@@ -9,6 +9,7 @@
 namespace Accord.Neuro
 {
     using System;
+    using Accord.Compat;
 
     /// <summary>
     /// Bipolar sigmoid activation function.

diff --git a/Sources/Accord.Neuro/AForge.Neuro/Activation Functions/SigmoidFunction.cs b/Sources/Accord.Neuro/AForge.Neuro/Activation Functions/SigmoidFunction.cs
@@ -9,6 +9,7 @@
 namespace Accord.Neuro
 {
     using System;
+    using Accord.Compat;
 
     /// <summary>
     /// Sigmoid activation function.

diff --git a/Sources/Accord.Neuro/AForge.Neuro/Activation Functions/ThresholdFunction.cs b/Sources/Accord.Neuro/AForge.Neuro/Activation Functions/ThresholdFunction.cs
@@ -9,6 +9,7 @@
 namespace Accord.Neuro
 {
     using System;
+    using Accord.Compat;
 
     /// <summary>
     /// Threshold activation function.

diff --git a/Sources/Accord.Neuro/AForge.Neuro/Layers/ActivationLayer.cs b/Sources/Accord.Neuro/AForge.Neuro/Layers/ActivationLayer.cs
@@ -9,6 +9,7 @@
 namespace Accord.Neuro
 {
     using System;
+    using Accord.Compat;
 
     /// <summary>
     /// Activation layer.

diff --git a/Sources/Accord.Neuro/AForge.Neuro/Layers/DistanceLayer.cs b/Sources/Accord.Neuro/AForge.Neuro/Layers/DistanceLayer.cs
@@ -9,6 +9,7 @@
 namespace Accord.Neuro
 {
     using System;
+    using Accord.Compat;
 
     /// <summary>
     /// Distance layer.

diff --git a/Sources/Accord.Neuro/AForge.Neuro/Layers/Layer.cs b/Sources/Accord.Neuro/AForge.Neuro/Layers/Layer.cs
@@ -9,6 +9,7 @@
 namespace Accord.Neuro
 {
     using System;
+    using Accord.Compat;
 
     /// <summary>
     /// Base neural layer class.

diff --git a/Sources/Accord.Neuro/AForge.Neuro/Networks/ActivationNetwork.cs b/Sources/Accord.Neuro/AForge.Neuro/Networks/ActivationNetwork.cs
@@ -9,6 +9,7 @@
 namespace Accord.Neuro
 {
     using System;
+    using Accord.Compat;
 
     /// <summary>
     /// Activation network.

diff --git a/Sources/Accord.Neuro/AForge.Neuro/Networks/DistanceNetwork.cs b/Sources/Accord.Neuro/AForge.Neuro/Networks/DistanceNetwork.cs
@@ -9,6 +9,7 @@
 namespace Accord.Neuro
 {
     using System;
+    using Accord.Compat;
 
     /// <summary>
     /// Distance network.

diff --git a/Sources/Accord.Neuro/AForge.Neuro/Networks/Network.cs b/Sources/Accord.Neuro/AForge.Neuro/Networks/Network.cs
@@ -12,6 +12,7 @@ namespace Accord.Neuro
     using System.IO;
     using System.Runtime.Serialization;
     using System.Runtime.Serialization.Formatters.Binary;
+    using Accord.Compat;
 
     /// <summary>
     /// Base neural network class.
@@ -148,6 +149,7 @@ public virtual void Randomize()
             }
         }
 
+#if !NO_BINARY_SERIALIZATION
         /// <summary>
         /// Save network to specified file.
         /// </summary>
@@ -212,5 +214,6 @@ public static Network Load(Stream stream)
             Network network = (Network)formatter.Deserialize(stream);
             return network;
         }
+#endif
     }
 }
diff --git a/Sources/Accord.Neuro/AForge.Neuro/Neurons/ActivationNeuron.cs b/Sources/Accord.Neuro/AForge.Neuro/Neurons/ActivationNeuron.cs
@@ -9,6 +9,7 @@
 namespace Accord.Neuro
 {
     using System;
+    using Accord.Compat;
 
     /// <summary>
     /// Activation neuron.

diff --git a/Sources/Accord.Neuro/AForge.Neuro/Neurons/DistanceNeuron.cs b/Sources/Accord.Neuro/AForge.Neuro/Neurons/DistanceNeuron.cs
@@ -9,6 +9,7 @@
 namespace Accord.Neuro
 {
     using System;
+    using Accord.Compat;
 
     /// <summary>
     /// Distance neuron.

diff --git a/Sources/Accord.Neuro/AForge.Neuro/Neurons/Neuron.cs b/Sources/Accord.Neuro/AForge.Neuro/Neurons/Neuron.cs
@@ -12,7 +12,8 @@ namespace Accord.Neuro
     using AForge;
     using Accord;
     using Accord.Math.Random;
-using Accord.Statistics.Distributions.Univariate;
+    using Accord.Statistics.Distributions.Univariate;
+    using Accord.Compat;
 
     /// <summary>
     /// Base neuron class.

diff --git a/Sources/Accord.Neuro/Accord.Neuro (NETStandard).csproj b/Sources/Accord.Neuro/Accord.Neuro (NETStandard).csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>Accord.Neuro</AssemblyName>
+    <RootNamespace>Accord.Neuro</RootNamespace>
+    <TargetFrameworks>netstandard2.0;netstandard1.4<!--;net462;net46;net45;net40;net35--></TargetFrameworks>
+  </PropertyGroup>
+
+  <Import Project="$(SolutionDir)Accord.NET (NETStandard).targets" />
+
+  <ItemGroup>
+    <ProjectReference Include="..\Accord.Core\Accord.Core (NETStandard).csproj" />
+    <ProjectReference Include="..\Accord.Genetic\Accord.Genetic (NETStandard).csproj" />
+    <ProjectReference Include="..\Accord.Math.Core\Accord.Math.Core (NETStandard).csproj" />
+    <ProjectReference Include="..\Accord.Math\Accord.Math (NETStandard).csproj" />
+    <ProjectReference Include="..\Accord.Statistics\Accord.Statistics (NETStandard).csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Sources/Accord.Neuro/Activation Functions/BernoulliFunction.cs b/Sources/Accord.Neuro/Activation Functions/BernoulliFunction.cs
@@ -28,6 +28,7 @@ namespace Accord.Neuro.ActivationFunctions
     using Accord.Neuro.Networks;
     using Accord.Statistics.Distributions.Univariate;
     using Accord.Math.Random;
+    using Accord.Compat;
 
     /// <summary>
     ///   Bernoulli stochastic activation function.

diff --git a/Sources/Accord.Neuro/Activation Functions/GaussianFunction.cs b/Sources/Accord.Neuro/Activation Functions/GaussianFunction.cs
@@ -30,6 +30,7 @@ namespace Accord.Neuro.ActivationFunctions
     using Accord.Statistics.Distributions.Univariate;
     using Accord.Math.Random;
     using Accord.Math;
+    using Accord.Compat;
 
     /// <summary>
     ///   Gaussian stochastic activation function.

diff --git a/Sources/Accord.Neuro/Activation Functions/IdentityFunction.cs b/Sources/Accord.Neuro/Activation Functions/IdentityFunction.cs
@@ -24,6 +24,7 @@ namespace Accord.Neuro
 {
     using System;
     using AForge;
+    using Accord.Compat;
 
     /// <summary>
     ///   Identity activation function.

diff --git a/Sources/Accord.Neuro/Activation Functions/LinearFunction.cs b/Sources/Accord.Neuro/Activation Functions/LinearFunction.cs
@@ -24,6 +24,7 @@ namespace Accord.Neuro
 {
     using System;
     using AForge;
+    using Accord.Compat;
 
     /// <summary>
     ///   Linear activation function.

diff --git a/Sources/Accord.Neuro/Activation Functions/RectifiedLinearFunction.cs b/Sources/Accord.Neuro/Activation Functions/RectifiedLinearFunction.cs
@@ -24,6 +24,7 @@ namespace Accord.Neuro
 {
     using System;
     using AForge;
+    using Accord.Compat;
 
     /// <summary>
     ///   Rectified linear activation function.

diff --git a/Sources/Accord.Neuro/Layers/StochasticLayer.cs b/Sources/Accord.Neuro/Layers/StochasticLayer.cs
@@ -25,6 +25,7 @@ namespace Accord.Neuro.Layers
     using Accord.Neuro.ActivationFunctions;
     using Accord.Neuro.Neurons;
     using System;
+    using Accord.Compat;
 
     /// <summary>
     ///   Stochastic Activation Layer.

diff --git a/Sources/Accord.Neuro/Networks/DeepBeliefNetwork.cs b/Sources/Accord.Neuro/Networks/DeepBeliefNetwork.cs
@@ -29,6 +29,7 @@ namespace Accord.Neuro.Networks
     using Accord.Neuro.ActivationFunctions;
     using Accord.Neuro.Layers;
     using Accord.Neuro.Neurons;
+    using Accord.Compat;
 
     /// <summary>
     ///   Deep Belief Network.
@@ -424,8 +425,9 @@ public static DeepBeliefNetwork CreateMixedNetwork(IStochasticFunction visible,
                 neuron.ActivationFunction = visible;
 
             return network;
-        }
-
+        }
+
+#if !NO_BINARY_SERIALIZATION
         /// <summary>
         ///   Saves the network to a stream.
         /// </summary>
@@ -480,7 +482,7 @@ public static DeepBeliefNetwork CreateMixedNetwork(IStochasticFunction visible,
             {
                 return Load(fs);
             }
-        }
-
+        }
+#endif
     }
 }
diff --git a/Sources/Accord.Neuro/Networks/RestrictedBoltzmannMachine.cs b/Sources/Accord.Neuro/Networks/RestrictedBoltzmannMachine.cs
@@ -26,6 +26,7 @@ namespace Accord.Neuro.Networks
     using Accord.Neuro.ActivationFunctions;
     using Accord.Neuro.Layers;
     using Accord.Neuro.Neurons;
+    using Accord.Compat;
 
     /// <summary>
     ///   Restricted Boltzmann Machine.

diff --git a/Sources/Accord.Neuro/Neurons/StochasticNeuron.cs b/Sources/Accord.Neuro/Neurons/StochasticNeuron.cs
@@ -24,6 +24,7 @@ namespace Accord.Neuro.Neurons
 {
     using System;
     using Accord.Neuro.ActivationFunctions;
+    using Accord.Compat;
 
     /// <summary>
     ///   Stochastic Activation Neuron.