diff --git a/TensorFlow.NET.sln b/TensorFlow.NET.sln index 51125309..523a148c 100644 --- a/TensorFlow.NET.sln +++ b/TensorFlow.NET.sln @@ -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 diff --git a/data/nb_example.npy b/data/nb_example.npy new file mode 100644 index 00000000..4547812c Binary files /dev/null and b/data/nb_example.npy differ diff --git a/src/TensorFlowNET.Core/Operations/Distributions/normal.py.cs b/src/TensorFlowNET.Core/Operations/Distributions/normal.py.cs index 4c69faba..29cefda1 100644 --- a/src/TensorFlowNET.Core/Operations/Distributions/normal.py.cs +++ b/src/TensorFlowNET.Core/Operations/Distributions/normal.py.cs @@ -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); } diff --git a/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj b/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj index 85b20994..7bc7ae52 100644 --- a/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj +++ b/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj @@ -62,4 +62,10 @@ Docs: https://tensorflownet.readthedocs.io + + + ..\..\..\..\NumSharp\src\NumSharp.Core\bin\Debug\netstandard2.0\NumSharp.Core.dll + + + diff --git a/test/TensorFlowNET.Examples/BasicModels/NaiveBayesClassifier.cs b/test/TensorFlowNET.Examples/BasicModels/NaiveBayesClassifier.cs index e1615035..1f891b8c 100644 --- a/test/TensorFlowNET.Examples/BasicModels/NaiveBayesClassifier.cs +++ b/test/TensorFlowNET.Examples/BasicModels/NaiveBayesClassifier.cs @@ -5,6 +5,8 @@ using Tensorflow; using NumSharp; using System.Linq; using static Tensorflow.Python; +using System.IO; +using TensorFlowNET.Examples.Utility; namespace TensorFlowNET.Examples { @@ -34,7 +36,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(xx.ravel().reshape(xx.size, 1), yy.ravel().reshape(yy.size, 1)); + //var samples = np.vstack(xx.ravel(), yy.ravel()); + //samples = np.transpose(samples); + var array = np.Load(Path.Join("nb", "nb_example.npy")); + var samples = np.array(array).astype(np.float32); var Z = sess.run(predict(samples)); }); @@ -167,6 +172,10 @@ namespace TensorFlowNET.Examples 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 } diff --git a/test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj b/test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj index e399bc82..470399ff 100644 --- a/test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj +++ b/test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj @@ -24,4 +24,10 @@ + + + ..\..\..\..\NumSharp\src\NumSharp.Core\bin\Debug\netstandard2.0\NumSharp.Core.dll + + +