Skip to content

fix bug in normal distribution: _log_prob #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 20, 2019
Merged

fix bug in normal distribution: _log_prob #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5d5a46
fix bug in normal distribution: _log_prob
PppBr Jun 20, 2019
984405f
Merge branch 'master' of https://github.com/SciSharp/TensorFlow.NET
PppBr Jun 20, 2019
41bb848
add nb_example data
PppBr Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions TensorFlow.NET.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Binary file added data/nb_example.npy
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/TensorFlowNET.Core/Operations/Distributions/normal.py.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public Tensor _batch_shape()

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);
}
Expand Down
6 changes: 6 additions & 0 deletions src/TensorFlowNET.Core/TensorFlowNET.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,10 @@ Docs: https://tensorflownet.readthedocs.io</Description>
<Folder Include="Keras\Initializers\" />
</ItemGroup>

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

</Project>
11 changes: 10 additions & 1 deletion test/TensorFlowNET.Examples/BasicModels/NaiveBayesClassifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
using NumSharp;
using System.Linq;
using static Tensorflow.Python;
using System.IO;
using TensorFlowNET.Examples.Utility;

namespace TensorFlowNET.Examples
{
Expand Down Expand Up @@ -34,7 +36,10 @@ public bool Run()
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[,]>(Path.Join("nb", "nb_example.npy"));
var samples = np.array(array).astype(np.float32);
var Z = sess.run(predict(samples));
});

Expand Down Expand Up @@ -167,6 +172,10 @@ public void PrepareData()
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2);


string url = "https://raw.githubusercontent.com/SciSharp/TensorFlow.NET/master/data/nb_example.npy";
Web.Download(url, "nb", "nb_example.npy");
#endregion
}

Expand Down
6 changes: 6 additions & 0 deletions test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,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>