diff --git a/Mila/Mila.vcxproj b/Mila/Mila.vcxproj index e553463..cc8eb25 100644 --- a/Mila/Mila.vcxproj +++ b/Mila/Mila.vcxproj @@ -21,49 +21,48 @@ - - + + - - - - + + + + - - - + + + - - - - - - + + + + + + - + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + - - + + diff --git a/Mila/Mila.vcxproj.filters b/Mila/Mila.vcxproj.filters index 4ee337b..f4d230a 100644 --- a/Mila/Mila.vcxproj.filters +++ b/Mila/Mila.vcxproj.filters @@ -32,55 +32,55 @@ Dnn\CuDnn - + Dnn\CuDnn - + Dnn\CuDnn - + Dnn\CuDnn - + Dnn\CuDnn - + Dnn\CuDnn - + Dnn\CuDnn - + Dnn\CuDnn - + Dnn\CuDnn - + Dnn\CuDnn Dnn\Cuda - + Dnn\Cuda - + Dnn\Cuda Dnn\Cuda - + Dnn\Cuda - + Dnn\Cuda - + Dnn\Cuda - + Dnn\Cuda @@ -89,46 +89,46 @@ Dnn\Cuda - + Dnn - + Dnn - + Dnn - + Dnn Dnn - + Dnn - + Dnn - + Dnn - + Dnn - + Dnn - + Dnn - + Dnn - + Dnn - + Dnn @@ -137,16 +137,13 @@ Dnn\Data\H5 - + Dnn\Data - + Dnn\Data - - Dnn\Data - - + Dnn\Data @@ -159,7 +156,7 @@ Dnn\Data\H5 - + Dnn\Data diff --git a/Mila/Source/Dnn/CuDNN/CudnnContext.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.Context.ixx similarity index 100% rename from Mila/Source/Dnn/CuDNN/CudnnContext.ixx rename to Mila/Source/Dnn/CuDNN/CuDnn.Context.ixx diff --git a/Mila/Source/Dnn/CuDNN/CuDnnDescriptor.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.Descriptor.ixx similarity index 100% rename from Mila/Source/Dnn/CuDNN/CuDnnDescriptor.ixx rename to Mila/Source/Dnn/CuDNN/CuDnn.Descriptor.ixx diff --git a/Mila/Source/Dnn/CuDNN/CuDnnError.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.Error.ixx similarity index 100% rename from Mila/Source/Dnn/CuDNN/CuDnnError.ixx rename to Mila/Source/Dnn/CuDNN/CuDnn.Error.ixx diff --git a/Mila/Source/Dnn/CuDNN/CuDnnHelpers.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.Helpers.ixx similarity index 100% rename from Mila/Source/Dnn/CuDNN/CuDnnHelpers.ixx rename to Mila/Source/Dnn/CuDNN/CuDnn.Helpers.ixx diff --git a/Mila/Source/Dnn/CuDNN/CuDnnOpaqueDescriptor.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.OpaqueDescriptor.ixx similarity index 100% rename from Mila/Source/Dnn/CuDNN/CuDnnOpaqueDescriptor.ixx rename to Mila/Source/Dnn/CuDNN/CuDnn.OpaqueDescriptor.ixx diff --git a/Mila/Source/Dnn/CuDNN/CuDnnOpaqueDescriptorType.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.OpaqueDescriptorType.ixx similarity index 100% rename from Mila/Source/Dnn/CuDNN/CuDnnOpaqueDescriptorType.ixx rename to Mila/Source/Dnn/CuDNN/CuDnn.OpaqueDescriptorType.ixx diff --git a/Mila/Source/Dnn/CuDNN/CuDnnOpaqueHandle.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.OpaqueHandle.ixx similarity index 100% rename from Mila/Source/Dnn/CuDNN/CuDnnOpaqueHandle.ixx rename to Mila/Source/Dnn/CuDNN/CuDnn.OpaqueHandle.ixx diff --git a/Mila/Source/Dnn/CuDNN/CuDnnStatus.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.Status.ixx similarity index 100% rename from Mila/Source/Dnn/CuDNN/CuDnnStatus.ixx rename to Mila/Source/Dnn/CuDNN/CuDnn.Status.ixx diff --git a/Mila/Source/Dnn/CuDNN/CuDnnUtils.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.Utils.ixx similarity index 100% rename from Mila/Source/Dnn/CuDNN/CuDnnUtils.ixx rename to Mila/Source/Dnn/CuDNN/CuDnn.Utils.ixx diff --git a/Mila/Source/Dnn/CuDNN/CuDnn.ixx b/Mila/Source/Dnn/CuDNN/CuDnn.ixx index f041e41..f95d242 100644 --- a/Mila/Source/Dnn/CuDNN/CuDnn.ixx +++ b/Mila/Source/Dnn/CuDNN/CuDnn.ixx @@ -19,13 +19,12 @@ * DEALINGS IN THE SOFTWARE. */ -export module Cudnn; +export module CuDnn; export import CuDnn.Context; export import CuDnn.Descriptor; export import CuDnn.Error; export import CuDnn.Helpers; -export import CuDnn.Error; export import CuDnn.OpaqueDescriptor; export import CuDnn.OpaqueDescriptorType; export import CuDnn.OpaqueHandle; diff --git a/Mila/Source/Dnn/Cuda/CudaDevice.ixx b/Mila/Source/Dnn/Cuda/Cuda.Device.ixx similarity index 100% rename from Mila/Source/Dnn/Cuda/CudaDevice.ixx rename to Mila/Source/Dnn/Cuda/Cuda.Device.ixx diff --git a/Mila/Source/Dnn/Cuda/CudaDeviceProps.ixx b/Mila/Source/Dnn/Cuda/Cuda.DeviceProps.ixx similarity index 100% rename from Mila/Source/Dnn/Cuda/CudaDeviceProps.ixx rename to Mila/Source/Dnn/Cuda/Cuda.DeviceProps.ixx diff --git a/Mila/Source/Dnn/Cuda/CudaError.ixx b/Mila/Source/Dnn/Cuda/Cuda.Error.ixx similarity index 100% rename from Mila/Source/Dnn/Cuda/CudaError.ixx rename to Mila/Source/Dnn/Cuda/Cuda.Error.ixx diff --git a/Mila/Source/Dnn/Cuda/CudaHelpers.ixx b/Mila/Source/Dnn/Cuda/Cuda.Helpers.ixx similarity index 100% rename from Mila/Source/Dnn/Cuda/CudaHelpers.ixx rename to Mila/Source/Dnn/Cuda/Cuda.Helpers.ixx diff --git a/Mila/Source/Dnn/Cuda/CudaMemory.ixx b/Mila/Source/Dnn/Cuda/Cuda.Memory.ixx similarity index 100% rename from Mila/Source/Dnn/Cuda/CudaMemory.ixx rename to Mila/Source/Dnn/Cuda/Cuda.Memory.ixx diff --git a/Mila/Source/Dnn/Cuda/CudaProfiler.ixx b/Mila/Source/Dnn/Cuda/Cuda.Profiler.ixx similarity index 100% rename from Mila/Source/Dnn/Cuda/CudaProfiler.ixx rename to Mila/Source/Dnn/Cuda/Cuda.Profiler.ixx diff --git a/Mila/Source/Dnn/Cuda/Cuda.ixx b/Mila/Source/Dnn/Cuda/Cuda.ixx index bca0607..b2b7da5 100644 --- a/Mila/Source/Dnn/Cuda/Cuda.ixx +++ b/Mila/Source/Dnn/Cuda/Cuda.ixx @@ -26,4 +26,5 @@ export import Cuda.Error; export import Cuda.Helpers; export import Cuda.Device; export import Cuda.DeviceProps; +export import Cuda.Memory; export import Cuda.Profiler; diff --git a/Mila/Source/Dnn/Data/DataCategoryVectorEncoder.ixx b/Mila/Source/Dnn/Data/Data.CategoryVectorEncoder.ixx similarity index 100% rename from Mila/Source/Dnn/Data/DataCategoryVectorEncoder.ixx rename to Mila/Source/Dnn/Data/Data.CategoryVectorEncoder.ixx diff --git a/Mila/Source/Dnn/Data/DataCharDatasetGenerator.ixx b/Mila/Source/Dnn/Data/Data.CharDatasetGenerator.ixx similarity index 100% rename from Mila/Source/Dnn/Data/DataCharDatasetGenerator.ixx rename to Mila/Source/Dnn/Data/Data.CharDatasetGenerator.ixx diff --git a/Mila/Source/Dnn/Data/DataDataset.ixx b/Mila/Source/Dnn/Data/Data.Dataset.ixx similarity index 100% rename from Mila/Source/Dnn/Data/DataDataset.ixx rename to Mila/Source/Dnn/Data/Data.Dataset.ixx diff --git a/Mila/Source/Dnn/Data/DataDatasetType.ixx b/Mila/Source/Dnn/Data/Data.DatasetType.ixx similarity index 100% rename from Mila/Source/Dnn/Data/DataDatasetType.ixx rename to Mila/Source/Dnn/Data/Data.DatasetType.ixx diff --git a/Mila/Source/Dnn/Data/FileStream.ixx b/Mila/Source/Dnn/Data/FileStream.ixx deleted file mode 100644 index 3d80e1f..0000000 --- a/Mila/Source/Dnn/Data/FileStream.ixx +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2021 Todd Thomson, Achilles Software. All rights reserved. - * - * Please refer to the Mila end user license agreement (EULA) associated - * with this source code for terms and conditions that govern your use of - * this software. Any use, reproduction, disclosure, or distribution of - * this software and related documentation outside the terms of the EULA - * is strictly prohibited. - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -export module Dnn.Data.FileStream; - -namespace Mila::Dnn::Data -{ - export class FileStream - { - }; -} \ No newline at end of file diff --git a/Mila/Source/Dnn/DnnDropoutDescriptor.ixx b/Mila/Source/Dnn/Dnn.DropoutDescriptor.ixx similarity index 100% rename from Mila/Source/Dnn/DnnDropoutDescriptor.ixx rename to Mila/Source/Dnn/Dnn.DropoutDescriptor.ixx diff --git a/Mila/Source/Dnn/DnnModel.ixx b/Mila/Source/Dnn/Dnn.Model.ixx similarity index 100% rename from Mila/Source/Dnn/DnnModel.ixx rename to Mila/Source/Dnn/Dnn.Model.ixx diff --git a/Mila/Source/Dnn/DnnModelBuilder.ixx b/Mila/Source/Dnn/Dnn.ModelBuilder.ixx similarity index 100% rename from Mila/Source/Dnn/DnnModelBuilder.ixx rename to Mila/Source/Dnn/Dnn.ModelBuilder.ixx diff --git a/Mila/Source/Dnn/DnnModelOptions.ixx b/Mila/Source/Dnn/Dnn.ModelOptions.ixx similarity index 100% rename from Mila/Source/Dnn/DnnModelOptions.ixx rename to Mila/Source/Dnn/Dnn.ModelOptions.ixx diff --git a/Mila/Source/Dnn/DnnNeuralNetType.ixx b/Mila/Source/Dnn/Dnn.NeuralNetType.ixx similarity index 100% rename from Mila/Source/Dnn/DnnNeuralNetType.ixx rename to Mila/Source/Dnn/Dnn.NeuralNetType.ixx diff --git a/Mila/Source/Dnn/DnnRnnDataSetDescriptor.ixx b/Mila/Source/Dnn/Dnn.RnnDataSetDescriptor.ixx similarity index 100% rename from Mila/Source/Dnn/DnnRnnDataSetDescriptor.ixx rename to Mila/Source/Dnn/Dnn.RnnDataSetDescriptor.ixx diff --git a/Mila/Source/Dnn/DnnRnnLayerCollection.ixx b/Mila/Source/Dnn/Dnn.RnnLayerCollection.ixx similarity index 100% rename from Mila/Source/Dnn/DnnRnnLayerCollection.ixx rename to Mila/Source/Dnn/Dnn.RnnLayerCollection.ixx diff --git a/Mila/Source/Dnn/DnnRnnLinearLayer.ixx b/Mila/Source/Dnn/Dnn.RnnLinearLayer.ixx similarity index 100% rename from Mila/Source/Dnn/DnnRnnLinearLayer.ixx rename to Mila/Source/Dnn/Dnn.RnnLinearLayer.ixx diff --git a/Mila/Source/Dnn/DnnRnnModel.ixx b/Mila/Source/Dnn/Dnn.RnnModel.ixx similarity index 100% rename from Mila/Source/Dnn/DnnRnnModel.ixx rename to Mila/Source/Dnn/Dnn.RnnModel.ixx diff --git a/Mila/Source/Dnn/DnnRnnModelOptions.ixx b/Mila/Source/Dnn/Dnn.RnnModelOptions.ixx similarity index 100% rename from Mila/Source/Dnn/DnnRnnModelOptions.ixx rename to Mila/Source/Dnn/Dnn.RnnModelOptions.ixx diff --git a/Mila/Source/Dnn/DnnRnnOpDescriptor.ixx b/Mila/Source/Dnn/Dnn.RnnOpDescriptor.ixx similarity index 100% rename from Mila/Source/Dnn/DnnRnnOpDescriptor.ixx rename to Mila/Source/Dnn/Dnn.RnnOpDescriptor.ixx diff --git a/Mila/Source/Dnn/DnnStateTensorDescriptor.ixx b/Mila/Source/Dnn/Dnn.StateTensorDescriptor.ixx similarity index 100% rename from Mila/Source/Dnn/DnnStateTensorDescriptor.ixx rename to Mila/Source/Dnn/Dnn.StateTensorDescriptor.ixx diff --git a/Mila/Source/Dnn/DnnTensorDescriptor.ixx b/Mila/Source/Dnn/Dnn.TensorDescriptor.ixx similarity index 100% rename from Mila/Source/Dnn/DnnTensorDescriptor.ixx rename to Mila/Source/Dnn/Dnn.TensorDescriptor.ixx diff --git a/Mila/Source/Dnn/Dnn.ixx b/Mila/Source/Dnn/Dnn.ixx index 803ff65..bac27c3 100644 --- a/Mila/Source/Dnn/Dnn.ixx +++ b/Mila/Source/Dnn/Dnn.ixx @@ -1,5 +1,6 @@ export module Dnn; +export import Dnn.RnnModel; export import Dnn.Model; export import Dnn.ModelBuilder; export import Dnn.ModelOptions; diff --git a/Mila/Source/Mila.ixx b/Mila/Source/Mila.ixx index 2779a42..98fba30 100644 --- a/Mila/Source/Mila.ixx +++ b/Mila/Source/Mila.ixx @@ -23,8 +23,10 @@ export module Mila; export import Core; export import Dnn; +export import Data; -//export import Mila.Cudnn; +export import Cuda; +export import CuDnn; export namespace Mila { diff --git a/Samples/MilaPackage/MilaPackage.vcxproj b/Samples/MilaPackage/MilaPackage.vcxproj index 619dcfa..bb6498b 100644 --- a/Samples/MilaPackage/MilaPackage.vcxproj +++ b/Samples/MilaPackage/MilaPackage.vcxproj @@ -86,12 +86,12 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/Samples/MilaPackage/packages.config b/Samples/MilaPackage/packages.config index 3104de1..c7c5443 100644 --- a/Samples/MilaPackage/packages.config +++ b/Samples/MilaPackage/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file