Browse Source

fix bug in normal distribution: _log_prob

tags/v0.9
Bo Peng 6 years ago
parent
commit
d5d5a46ba3
5 changed files with 29 additions and 4 deletions
  1. +8
    -2
      TensorFlow.NET.sln
  2. +1
    -1
      src/TensorFlowNET.Core/Operations/Distributions/normal.py.cs
  3. +10
    -0
      src/TensorFlowNET.Core/TensorFlowNET.Core.csproj
  4. +4
    -1
      test/TensorFlowNET.Examples/BasicModels/NaiveBayesClassifier.cs
  5. +6
    -0
      test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj

+ 8
- 2
TensorFlow.NET.sln View File

@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.452
# Visual Studio 15
VisualStudioVersion = 15.0.28307.168
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowNET.UnitTest", "test\TensorFlowNET.UnitTest\TensorFlowNET.UnitTest.csproj", "{029A8CF1-CF95-4DCB-98AA-9D3D96A83B3E}"
EndProject
@@ -17,6 +17,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Keras.UnitTest", "test\Kera
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "TensorFlowNET.Examples.FSharp", "test\TensorFlowNET.Examples.FSharp\TensorFlowNET.Examples.FSharp.fsproj", "{62BC3801-F0D3-44A9-A0AC-712F40C8F961}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NumSharp.Core", "..\NumSharp\src\NumSharp.Core\NumSharp.Core.csproj", "{E038A3C1-9055-4BF4-BE5B-0E7D661A7EB3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -51,6 +53,10 @@ Global
{62BC3801-F0D3-44A9-A0AC-712F40C8F961}.Debug|Any CPU.Build.0 = Debug|Any CPU
{62BC3801-F0D3-44A9-A0AC-712F40C8F961}.Release|Any CPU.ActiveCfg = Release|Any CPU
{62BC3801-F0D3-44A9-A0AC-712F40C8F961}.Release|Any CPU.Build.0 = Release|Any CPU
{E038A3C1-9055-4BF4-BE5B-0E7D661A7EB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E038A3C1-9055-4BF4-BE5B-0E7D661A7EB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E038A3C1-9055-4BF4-BE5B-0E7D661A7EB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E038A3C1-9055-4BF4-BE5B-0E7D661A7EB3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE


+ 1
- 1
src/TensorFlowNET.Core/Operations/Distributions/normal.py.cs View File

@@ -82,7 +82,7 @@ namespace Tensorflow

protected override Tensor _log_prob(Tensor x)
{
var log_prob = _log_unnormalized_prob(_z(x));
var log_prob = _log_unnormalized_prob(x);
var log_norm = _log_normalization();
return tf.sub(log_prob, log_norm);
}


+ 10
- 0
src/TensorFlowNET.Core/TensorFlowNET.Core.csproj View File

@@ -62,4 +62,14 @@ Docs: https://tensorflownet.readthedocs.io</Description>
<Folder Include="Keras\Initializers\" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\NumSharp\src\NumSharp.Core\NumSharp.Core.csproj" />
</ItemGroup>

<ItemGroup>
<Reference Include="NumSharp.Core">
<HintPath>..\..\..\..\NumSharp\src\NumSharp.Core\bin\Debug\netstandard2.0\NumSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>

</Project>

+ 4
- 1
test/TensorFlowNET.Examples/BasicModels/NaiveBayesClassifier.cs View File

@@ -34,7 +34,10 @@ namespace TensorFlowNET.Examples
var (xx, yy) = np.meshgrid(np.linspace(x_min, x_max, 30), np.linspace(y_min, y_max, 30));
with(tf.Session(), sess =>
{
var samples = np.hstack<float>(xx.ravel().reshape(xx.size, 1), yy.ravel().reshape(yy.size, 1));
var samples = np.vstack<float>(xx.ravel(), yy.ravel());
samples = np.transpose(samples);
var array = np.Load<double[,]>("H:\\PythonApplication1\\PythonApplication1\\data.npy");
samples = np.array(array).astype(np.float32);
var Z = sess.run(predict(samples));
});



+ 6
- 0
test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj View File

@@ -23,4 +23,10 @@
<ProjectReference Include="..\..\src\TensorFlowNET.Core\TensorFlowNET.Core.csproj" />
</ItemGroup>

<ItemGroup>
<Reference Include="NumSharp.Core">
<HintPath>..\..\..\..\NumSharp\src\NumSharp.Core\bin\Debug\netstandard2.0\NumSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>

</Project>

Loading…
Cancel
Save