diff --git a/TensorFlow.NET.sln b/TensorFlow.NET.sln index 3f01a6a6..96a8af5c 100644 --- a/TensorFlow.NET.sln +++ b/TensorFlow.NET.sln @@ -7,13 +7,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowNET.UnitTest", "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}") = "TensorFlowHub", "src\TensorFlowHub\TensorFlowHub.csproj", "{8FD59A5A-97EB-457E-B9F1-D88B0C822C6E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowNET.Models", "src\TensorFlowNET.Models\TensorFlowNET.Models.csproj", "{D03F94CF-B283-4730-B177-21A57641061F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowText", "src\TensorFlowText\TensorFlowText.csproj", "{B598E5D5-BD2D-4191-8532-F2FBAC31AB81}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowNET.Text", "src\TensorFlowNET.Text\TensorFlowNET.Text.csproj", "{904472F8-40E1-4650-AA6F-C7F209B3691B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowDatasets", "src\TensorFlowDatasets\TensorFlowDatasets.csproj", "{DF151A51-E9FD-41BD-B0F4-08A743755D44}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowNET.Hub", "src\TensorFlowNET.Hub\TensorFlowNET.Hub.csproj", "{4EAFAE19-C832-47C6-B01E-0F4268C9072C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowNET.Models", "src\TensorFlowNET.Models\TensorFlowNET.Models.csproj", "{D03F94CF-B283-4730-B177-21A57641061F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowNET.Datasets", "src\TensorFlowNET.Datasets\TensorFlowNET.Datasets.csproj", "{494D6CAD-2C0D-4C0B-90E2-B097DB039383}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -29,22 +29,22 @@ 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 - {8FD59A5A-97EB-457E-B9F1-D88B0C822C6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8FD59A5A-97EB-457E-B9F1-D88B0C822C6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8FD59A5A-97EB-457E-B9F1-D88B0C822C6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8FD59A5A-97EB-457E-B9F1-D88B0C822C6E}.Release|Any CPU.Build.0 = Release|Any CPU - {B598E5D5-BD2D-4191-8532-F2FBAC31AB81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B598E5D5-BD2D-4191-8532-F2FBAC31AB81}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B598E5D5-BD2D-4191-8532-F2FBAC31AB81}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B598E5D5-BD2D-4191-8532-F2FBAC31AB81}.Release|Any CPU.Build.0 = Release|Any CPU - {DF151A51-E9FD-41BD-B0F4-08A743755D44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF151A51-E9FD-41BD-B0F4-08A743755D44}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF151A51-E9FD-41BD-B0F4-08A743755D44}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF151A51-E9FD-41BD-B0F4-08A743755D44}.Release|Any CPU.Build.0 = Release|Any CPU {D03F94CF-B283-4730-B177-21A57641061F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D03F94CF-B283-4730-B177-21A57641061F}.Debug|Any CPU.Build.0 = Debug|Any CPU {D03F94CF-B283-4730-B177-21A57641061F}.Release|Any CPU.ActiveCfg = Release|Any CPU {D03F94CF-B283-4730-B177-21A57641061F}.Release|Any CPU.Build.0 = Release|Any CPU + {904472F8-40E1-4650-AA6F-C7F209B3691B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {904472F8-40E1-4650-AA6F-C7F209B3691B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {904472F8-40E1-4650-AA6F-C7F209B3691B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {904472F8-40E1-4650-AA6F-C7F209B3691B}.Release|Any CPU.Build.0 = Release|Any CPU + {4EAFAE19-C832-47C6-B01E-0F4268C9072C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4EAFAE19-C832-47C6-B01E-0F4268C9072C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4EAFAE19-C832-47C6-B01E-0F4268C9072C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4EAFAE19-C832-47C6-B01E-0F4268C9072C}.Release|Any CPU.Build.0 = Release|Any CPU + {494D6CAD-2C0D-4C0B-90E2-B097DB039383}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {494D6CAD-2C0D-4C0B-90E2-B097DB039383}.Debug|Any CPU.Build.0 = Debug|Any CPU + {494D6CAD-2C0D-4C0B-90E2-B097DB039383}.Release|Any CPU.ActiveCfg = Release|Any CPU + {494D6CAD-2C0D-4C0B-90E2-B097DB039383}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/TensorFlowDatasets/DatasetBuilder.cs b/src/TensorFlowNET.Datasets/DatasetBuilder.cs similarity index 100% rename from src/TensorFlowDatasets/DatasetBuilder.cs rename to src/TensorFlowNET.Datasets/DatasetBuilder.cs diff --git a/src/TensorFlowDatasets/DownloadConfig.cs b/src/TensorFlowNET.Datasets/DownloadConfig.cs similarity index 100% rename from src/TensorFlowDatasets/DownloadConfig.cs rename to src/TensorFlowNET.Datasets/DownloadConfig.cs diff --git a/src/TensorFlowDatasets/TensorFlowDatasets.csproj b/src/TensorFlowNET.Datasets/TensorFlowNET.Datasets.csproj similarity index 88% rename from src/TensorFlowDatasets/TensorFlowDatasets.csproj rename to src/TensorFlowNET.Datasets/TensorFlowNET.Datasets.csproj index 1b839c1f..198c3e12 100644 --- a/src/TensorFlowDatasets/TensorFlowDatasets.csproj +++ b/src/TensorFlowNET.Datasets/TensorFlowNET.Datasets.csproj @@ -14,6 +14,8 @@ git SciSharp, Dataset, TensorFlow Apache 2.0 + TensorFlow.Datasets + TensorFlow.Datasets diff --git a/src/TensorFlowHub/DataSetBase.cs b/src/TensorFlowNET.Hub/DataSetBase.cs similarity index 100% rename from src/TensorFlowHub/DataSetBase.cs rename to src/TensorFlowNET.Hub/DataSetBase.cs diff --git a/src/TensorFlowHub/Datasets.cs b/src/TensorFlowNET.Hub/Datasets.cs similarity index 100% rename from src/TensorFlowHub/Datasets.cs rename to src/TensorFlowNET.Hub/Datasets.cs diff --git a/src/TensorFlowHub/IDataSet.cs b/src/TensorFlowNET.Hub/IDataSet.cs similarity index 100% rename from src/TensorFlowHub/IDataSet.cs rename to src/TensorFlowNET.Hub/IDataSet.cs diff --git a/src/TensorFlowHub/IModelLoader.cs b/src/TensorFlowNET.Hub/IModelLoader.cs similarity index 100% rename from src/TensorFlowHub/IModelLoader.cs rename to src/TensorFlowNET.Hub/IModelLoader.cs diff --git a/src/TensorFlowHub/MnistDataSet.cs b/src/TensorFlowNET.Hub/MnistDataSet.cs similarity index 100% rename from src/TensorFlowHub/MnistDataSet.cs rename to src/TensorFlowNET.Hub/MnistDataSet.cs diff --git a/src/TensorFlowHub/MnistModelLoader.cs b/src/TensorFlowNET.Hub/MnistModelLoader.cs similarity index 100% rename from src/TensorFlowHub/MnistModelLoader.cs rename to src/TensorFlowNET.Hub/MnistModelLoader.cs diff --git a/src/TensorFlowHub/ModelLoadSetting.cs b/src/TensorFlowNET.Hub/ModelLoadSetting.cs similarity index 100% rename from src/TensorFlowHub/ModelLoadSetting.cs rename to src/TensorFlowNET.Hub/ModelLoadSetting.cs diff --git a/src/TensorFlowHub/README.md b/src/TensorFlowNET.Hub/README.md similarity index 100% rename from src/TensorFlowHub/README.md rename to src/TensorFlowNET.Hub/README.md diff --git a/src/TensorFlowHub/TensorFlowHub.csproj b/src/TensorFlowNET.Hub/TensorFlowNET.Hub.csproj similarity index 94% rename from src/TensorFlowHub/TensorFlowHub.csproj rename to src/TensorFlowNET.Hub/TensorFlowNET.Hub.csproj index 27bd3e5a..27b5128b 100644 --- a/src/TensorFlowHub/TensorFlowHub.csproj +++ b/src/TensorFlowNET.Hub/TensorFlowNET.Hub.csproj @@ -15,6 +15,7 @@ true https://avatars3.githubusercontent.com/u/44989469?s=200&v=4 + TensorFlow.Hub diff --git a/src/TensorFlowHub/Utils.cs b/src/TensorFlowNET.Hub/Utils.cs similarity index 100% rename from src/TensorFlowHub/Utils.cs rename to src/TensorFlowNET.Hub/Utils.cs diff --git a/src/TensorFlowText/README.md b/src/TensorFlowNET.Text/README.md similarity index 100% rename from src/TensorFlowText/README.md rename to src/TensorFlowNET.Text/README.md diff --git a/src/TensorFlowText/TensorFlowText.csproj b/src/TensorFlowNET.Text/TensorFlowNET.Text.csproj similarity index 91% rename from src/TensorFlowText/TensorFlowText.csproj rename to src/TensorFlowNET.Text/TensorFlowNET.Text.csproj index 92fee8a8..89ec8dd4 100644 --- a/src/TensorFlowText/TensorFlowText.csproj +++ b/src/TensorFlowNET.Text/TensorFlowNET.Text.csproj @@ -15,6 +15,8 @@ TensorFlow, SciSharp git https://avatars3.githubusercontent.com/u/44989469?s=200&v=4 + TensorFlow.Text + TensorFlow.Text diff --git a/src/TensorFlowText/Tokenizer.cs b/src/TensorFlowNET.Text/Tokenizer.cs similarity index 100% rename from src/TensorFlowText/Tokenizer.cs rename to src/TensorFlowNET.Text/Tokenizer.cs diff --git a/test/TensorFlowNET.UnitTest/TensorFlowNET.UnitTest.csproj b/test/TensorFlowNET.UnitTest/TensorFlowNET.UnitTest.csproj index 19003d8c..6cc1a87d 100644 --- a/test/TensorFlowNET.UnitTest/TensorFlowNET.UnitTest.csproj +++ b/test/TensorFlowNET.UnitTest/TensorFlowNET.UnitTest.csproj @@ -36,9 +36,11 @@ - - + + + + diff --git a/test/TensorFlowNET.UnitTest/nest_test/NestTest.cs b/test/TensorFlowNET.UnitTest/nest_test/NestTest.cs index 53334349..4e2e5871 100644 --- a/test/TensorFlowNET.UnitTest/nest_test/NestTest.cs +++ b/test/TensorFlowNET.UnitTest/nest_test/NestTest.cs @@ -1,6 +1,6 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; -using Colorful; using Microsoft.VisualStudio.TestTools.UnitTesting; using Newtonsoft.Json.Linq; using NumSharp;