diff --git a/TensorFlow.NET.sln b/TensorFlow.NET.sln index 115377c2..25a97e6d 100644 --- a/TensorFlow.NET.sln +++ b/TensorFlow.NET.sln @@ -9,8 +9,6 @@ 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}") = "TensorFlowNET.Utility", "src\TensorFlowNET.Utility\TensorFlowNET.Utility.csproj", "{00D9085C-0FC7-453C-A0CC-BAD98F44FEA0}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowNET.Visualization", "TensorFlowNET.Visualization\TensorFlowNET.Visualization.csproj", "{4BB2ABD1-635E-41E4-B534-CB5B6A2D754D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NumSharp.Core", "..\NumSharp\src\NumSharp.Core\NumSharp.Core.csproj", "{E8340C61-12C1-4BEE-A340-403E7C1ACD82}" @@ -35,10 +33,6 @@ 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 - {00D9085C-0FC7-453C-A0CC-BAD98F44FEA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00D9085C-0FC7-453C-A0CC-BAD98F44FEA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00D9085C-0FC7-453C-A0CC-BAD98F44FEA0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00D9085C-0FC7-453C-A0CC-BAD98F44FEA0}.Release|Any CPU.Build.0 = Release|Any CPU {4BB2ABD1-635E-41E4-B534-CB5B6A2D754D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4BB2ABD1-635E-41E4-B534-CB5B6A2D754D}.Debug|Any CPU.Build.0 = Debug|Any CPU {4BB2ABD1-635E-41E4-B534-CB5B6A2D754D}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/TensorFlowNET.Utility/TensorFlowNET.Utility.csproj b/src/TensorFlowNET.Utility/TensorFlowNET.Utility.csproj deleted file mode 100644 index efeb641a..00000000 --- a/src/TensorFlowNET.Utility/TensorFlowNET.Utility.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netstandard2.0 - TensorFlowNET.Utility - TensorFlowNET.Utility - - - - - - - diff --git a/test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj b/test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj index b1349ec7..12a92226 100644 --- a/test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj +++ b/test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj @@ -1,4 +1,4 @@ - + Exe @@ -7,14 +7,14 @@ - + + - diff --git a/test/TensorFlowNET.Examples/TextClassification/DataHelpers.cs b/test/TensorFlowNET.Examples/TextClassification/DataHelpers.cs index 586a978a..f705b98c 100644 --- a/test/TensorFlowNET.Examples/TextClassification/DataHelpers.cs +++ b/test/TensorFlowNET.Examples/TextClassification/DataHelpers.cs @@ -77,7 +77,7 @@ namespace TensorFlowNET.Examples.CnnTextClassification var positive_labels = positive_examples.Select(x => new int[2] { 0, 1 }).ToArray(); var negative_labels = negative_examples.Select(x => new int[2] { 1, 0 }).ToArray(); - var y = np.concatenate(new int[][][] { positive_labels, negative_labels }); + var y = np.array(1);// np.concatenate(new int[][][] { positive_labels, negative_labels }); return (x_text.ToArray(), y); } diff --git a/test/TensorFlowNET.Examples/TextClassification/TextClassificationTrain.cs b/test/TensorFlowNET.Examples/TextClassification/TextClassificationTrain.cs index 52ed5469..4ea583d4 100644 --- a/test/TensorFlowNET.Examples/TextClassification/TextClassificationTrain.cs +++ b/test/TensorFlowNET.Examples/TextClassification/TextClassificationTrain.cs @@ -5,7 +5,7 @@ using System.IO; using System.Linq; using System.Text; using Tensorflow; -using TensorFlowNET.Utility; +using TensorFlowNET.Examples.Utility; namespace TensorFlowNET.Examples.CnnTextClassification { @@ -24,7 +24,7 @@ namespace TensorFlowNET.Examples.CnnTextClassification download_dbpedia(); Console.WriteLine("Building dataset..."); var (x, y, alphabet_size) = DataHelpers.build_char_dataset("train", "vdcnn", CHAR_MAX_LEN); - var (train_x, valid_x, train_y, valid_y) = train_test_split(x, y, test_size: 0.15); + //var (train_x, valid_x, train_y, valid_y) = train_test_split(x, y, test_size: 0.15); } public void download_dbpedia() diff --git a/src/TensorFlowNET.Utility/Compress.cs b/test/TensorFlowNET.Examples/Utility/Compress.cs similarity index 98% rename from src/TensorFlowNET.Utility/Compress.cs rename to test/TensorFlowNET.Examples/Utility/Compress.cs index 0efe59bd..cf40e2c4 100644 --- a/src/TensorFlowNET.Utility/Compress.cs +++ b/test/TensorFlowNET.Examples/Utility/Compress.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -namespace TensorFlowNET.Utility +namespace TensorFlowNET.Examples.Utility { public class Compress { diff --git a/src/TensorFlowNET.Utility/Web.cs b/test/TensorFlowNET.Examples/Utility/Web.cs similarity index 96% rename from src/TensorFlowNET.Utility/Web.cs rename to test/TensorFlowNET.Examples/Utility/Web.cs index 33df9c16..e2155e93 100644 --- a/src/TensorFlowNET.Utility/Web.cs +++ b/test/TensorFlowNET.Examples/Utility/Web.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -namespace TensorFlowNET.Utility +namespace TensorFlowNET.Examples.Utility { public class Web {