Skip to content

Commit

Permalink
Progress towards beta release #1
Browse files Browse the repository at this point in the history
  • Loading branch information
@ToddThomson
ToddThomson committed Jan 28, 2022
1 parent 60ad215 commit f1ec60d
Show file tree
Hide file tree
Showing 41 changed files with 73 additions and 103 deletions.
65 changes: 32 additions & 33 deletions Mila/Mila.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,49 +21,48 @@
<ClCompile Include="Source\Dnn\Core\Core.Version.ixx" />
<ClCompile Include="Source\Dnn\Core\Core.Logger.ixx" />
<ClCompile Include="Source\Dnn\Cuda\Cuda.ixx" />
<ClCompile Include="Source\Dnn\Cuda\CudaDevice.ixx" />
<ClCompile Include="Source\Dnn\Cuda\CudaDeviceProps.ixx" />
<ClCompile Include="Source\Dnn\Cuda\Cuda.Device.ixx" />
<ClCompile Include="Source\Dnn\Cuda\Cuda.DeviceProps.ixx" />
<ClCompile Include="Source\Dnn\Cuda\CudaEnv.ixx" />
<ClCompile Include="Source\Dnn\Cuda\CudaError.ixx" />
<ClCompile Include="Source\Dnn\Cuda\CudaHelpers.ixx" />
<ClCompile Include="Source\Dnn\Cuda\CudaMemory.ixx" />
<ClCompile Include="Source\Dnn\Cuda\CudaProfiler.ixx" />
<ClCompile Include="Source\Dnn\Cuda\Cuda.Error.ixx" />
<ClCompile Include="Source\Dnn\Cuda\Cuda.Helpers.ixx" />
<ClCompile Include="Source\Dnn\Cuda\Cuda.Memory.ixx" />
<ClCompile Include="Source\Dnn\Cuda\Cuda.Profiler.ixx" />
<ClCompile Include="Source\Dnn\Cuda\CudaStream.ixx" />
<ClCompile Include="Source\Dnn\Cuda\CudaUniqueHandle.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnnContext.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnnDescriptor.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnnError.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.Context.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.Descriptor.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.Error.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\fp16_emu.cpp" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnnHelpers.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnnOpaqueDescriptor.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnnOpaqueDescriptorType.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnnOpaqueHandle.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnnStatus.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnnUtils.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.Helpers.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.OpaqueDescriptor.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.OpaqueDescriptorType.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.OpaqueHandle.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.Status.ixx" />
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.Utils.ixx" />
<ClCompile Include="Source\Dnn\Data\Data.ixx" />
<ClCompile Include="Source\Dnn\Data\DataDataset.ixx" />
<ClCompile Include="Source\Dnn\Data\Data.Dataset.ixx" />
<ClCompile Include="Source\Dnn\Data\H5\DataH5DataTypeMapper.ixx" />
<ClCompile Include="Source\Dnn\DnnModel.ixx" />
<ClCompile Include="Source\Dnn\DnnModelBuilder.ixx" />
<ClCompile Include="Source\Dnn\DnnModelOptions.ixx" />
<ClCompile Include="Source\Dnn\DnnDropoutDescriptor.ixx" />
<ClCompile Include="Source\Dnn\Dnn.Model.ixx" />
<ClCompile Include="Source\Dnn\Dnn.ModelBuilder.ixx" />
<ClCompile Include="Source\Dnn\Dnn.ModelOptions.ixx" />
<ClCompile Include="Source\Dnn\Dnn.DropoutDescriptor.ixx" />
<ClCompile Include="Source\Dnn\Dnn.ixx" />
<ClCompile Include="Source\Dnn\DnnNeuralNetType.ixx" />
<ClCompile Include="Source\Dnn\DnnRnnDataSetDescriptor.ixx" />
<ClCompile Include="Source\Dnn\DnnRnnLayerCollection.ixx" />
<ClCompile Include="Source\Dnn\DnnRnnLinearLayer.ixx" />
<ClCompile Include="Source\Dnn\DnnRnnModel.ixx" />
<ClCompile Include="Source\Dnn\DnnRnnModelOptions.ixx" />
<ClCompile Include="Source\Dnn\DnnRnnOpDescriptor.ixx" />
<ClCompile Include="Source\Dnn\DnnStateTensorDescriptor.ixx" />
<ClCompile Include="Source\Dnn\DnnTensorDescriptor.ixx" />
<ClCompile Include="Source\Dnn\Data\DataDatasetType.ixx" />
<ClCompile Include="Source\Dnn\Data\FileStream.ixx" />
<ClCompile Include="Source\Dnn\Dnn.NeuralNetType.ixx" />
<ClCompile Include="Source\Dnn\Dnn.RnnDataSetDescriptor.ixx" />
<ClCompile Include="Source\Dnn\Dnn.RnnLayerCollection.ixx" />
<ClCompile Include="Source\Dnn\Dnn.RnnLinearLayer.ixx" />
<ClCompile Include="Source\Dnn\Dnn.RnnModel.ixx" />
<ClCompile Include="Source\Dnn\Dnn.RnnModelOptions.ixx" />
<ClCompile Include="Source\Dnn\Dnn.RnnOpDescriptor.ixx" />
<ClCompile Include="Source\Dnn\Dnn.StateTensorDescriptor.ixx" />
<ClCompile Include="Source\Dnn\Dnn.TensorDescriptor.ixx" />
<ClCompile Include="Source\Dnn\Data\Data.DatasetType.ixx" />
<ClCompile Include="Source\Dnn\Data\H5\DataH5DatasetReader.ixx" />
<ClCompile Include="Source\Dnn\Data\H5\DataH5DatasetWriter.ixx" />
<ClCompile Include="Source\Dnn\Data\DataCategoryVectorEncoder.ixx" />
<ClCompile Include="Source\Dnn\Data\DataCharDatasetGenerator.ixx" />
<ClCompile Include="Source\Dnn\Data\Data.CategoryVectorEncoder.ixx" />
<ClCompile Include="Source\Dnn\Data\Data.CharDatasetGenerator.ixx" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Source\Dnn\CuDNN\fp16_emu.h" />
Expand Down
67 changes: 32 additions & 35 deletions Mila/Mila.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,55 +32,55 @@
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.ixx">
<Filter>Dnn\CuDnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\CuDNN\CuDnnContext.ixx">
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.Context.ixx">
<Filter>Dnn\CuDnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\CuDNN\CuDnnDescriptor.ixx">
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.Descriptor.ixx">
<Filter>Dnn\CuDnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\CuDNN\CuDnnError.ixx">
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.Error.ixx">
<Filter>Dnn\CuDnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\CuDNN\CuDnnHelpers.ixx">
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.Helpers.ixx">
<Filter>Dnn\CuDnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\CuDNN\CuDnnOpaqueDescriptor.ixx">
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.OpaqueDescriptor.ixx">
<Filter>Dnn\CuDnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\CuDNN\CuDnnOpaqueDescriptorType.ixx">
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.OpaqueDescriptorType.ixx">
<Filter>Dnn\CuDnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\CuDNN\CuDnnOpaqueHandle.ixx">
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.OpaqueHandle.ixx">
<Filter>Dnn\CuDnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\CuDNN\CuDnnStatus.ixx">
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.Status.ixx">
<Filter>Dnn\CuDnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\CuDNN\CuDnnUtils.ixx">
<ClCompile Include="Source\Dnn\CuDNN\CuDnn.Utils.ixx">
<Filter>Dnn\CuDnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Cuda\Cuda.ixx">
<Filter>Dnn\Cuda</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Cuda\CudaDevice.ixx">
<ClCompile Include="Source\Dnn\Cuda\Cuda.Device.ixx">
<Filter>Dnn\Cuda</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Cuda\CudaDeviceProps.ixx">
<ClCompile Include="Source\Dnn\Cuda\Cuda.DeviceProps.ixx">
<Filter>Dnn\Cuda</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Cuda\CudaEnv.ixx">
<Filter>Dnn\Cuda</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Cuda\CudaError.ixx">
<ClCompile Include="Source\Dnn\Cuda\Cuda.Error.ixx">
<Filter>Dnn\Cuda</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Cuda\CudaHelpers.ixx">
<ClCompile Include="Source\Dnn\Cuda\Cuda.Helpers.ixx">
<Filter>Dnn\Cuda</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Cuda\CudaMemory.ixx">
<ClCompile Include="Source\Dnn\Cuda\Cuda.Memory.ixx">
<Filter>Dnn\Cuda</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Cuda\CudaProfiler.ixx">
<ClCompile Include="Source\Dnn\Cuda\Cuda.Profiler.ixx">
<Filter>Dnn\Cuda</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Cuda\CudaStream.ixx">
Expand All @@ -89,46 +89,46 @@
<ClCompile Include="Source\Dnn\Cuda\CudaUniqueHandle.ixx">
<Filter>Dnn\Cuda</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\DnnModel.ixx">
<ClCompile Include="Source\Dnn\Dnn.Model.ixx">
<Filter>Dnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\DnnModelBuilder.ixx">
<ClCompile Include="Source\Dnn\Dnn.ModelBuilder.ixx">
<Filter>Dnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\DnnModelOptions.ixx">
<ClCompile Include="Source\Dnn\Dnn.ModelOptions.ixx">
<Filter>Dnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\DnnDropoutDescriptor.ixx">
<ClCompile Include="Source\Dnn\Dnn.DropoutDescriptor.ixx">
<Filter>Dnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Dnn.ixx">
<Filter>Dnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\DnnNeuralNetType.ixx">
<ClCompile Include="Source\Dnn\Dnn.NeuralNetType.ixx">
<Filter>Dnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\DnnRnnDataSetDescriptor.ixx">
<ClCompile Include="Source\Dnn\Dnn.RnnDataSetDescriptor.ixx">
<Filter>Dnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\DnnRnnLayerCollection.ixx">
<ClCompile Include="Source\Dnn\Dnn.RnnLayerCollection.ixx">
<Filter>Dnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\DnnRnnLinearLayer.ixx">
<ClCompile Include="Source\Dnn\Dnn.RnnLinearLayer.ixx">
<Filter>Dnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\DnnRnnModel.ixx">
<ClCompile Include="Source\Dnn\Dnn.RnnModel.ixx">
<Filter>Dnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\DnnRnnModelOptions.ixx">
<ClCompile Include="Source\Dnn\Dnn.RnnModelOptions.ixx">
<Filter>Dnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\DnnRnnOpDescriptor.ixx">
<ClCompile Include="Source\Dnn\Dnn.RnnOpDescriptor.ixx">
<Filter>Dnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\DnnStateTensorDescriptor.ixx">
<ClCompile Include="Source\Dnn\Dnn.StateTensorDescriptor.ixx">
<Filter>Dnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\DnnTensorDescriptor.ixx">
<ClCompile Include="Source\Dnn\Dnn.TensorDescriptor.ixx">
<Filter>Dnn</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Data\H5\DataH5DatasetReader.ixx">
Expand All @@ -137,16 +137,13 @@
<ClCompile Include="Source\Dnn\Data\H5\DataH5DatasetWriter.ixx">
<Filter>Dnn\Data\H5</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Data\DataDatasetType.ixx">
<ClCompile Include="Source\Dnn\Data\Data.DatasetType.ixx">
<Filter>Dnn\Data</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Data\FileStream.ixx">
<ClCompile Include="Source\Dnn\Data\Data.CategoryVectorEncoder.ixx">
<Filter>Dnn\Data</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Data\DataCategoryVectorEncoder.ixx">
<Filter>Dnn\Data</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Data\DataCharDatasetGenerator.ixx">
<ClCompile Include="Source\Dnn\Data\Data.CharDatasetGenerator.ixx">
<Filter>Dnn\Data</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Core\Core.Version.ixx">
Expand All @@ -159,7 +156,7 @@
<ClCompile Include="Source\Dnn\Data\H5\DataH5DataTypeMapper.ixx">
<Filter>Dnn\Data\H5</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Data\DataDataset.ixx">
<ClCompile Include="Source\Dnn\Data\Data.Dataset.ixx">
<Filter>Dnn\Data</Filter>
</ClCompile>
<ClCompile Include="Source\Dnn\Data\Data.ixx" />
Expand Down
0 Mila/Source/Dnn/CuDNN/CudnnContext.ixx → Mila/Source/Dnn/CuDNN/CuDnn.Context.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/CuDNN/CuDnnDescriptor.ixx → Mila/Source/Dnn/CuDNN/CuDnn.Descriptor.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/CuDNN/CuDnnError.ixx → Mila/Source/Dnn/CuDNN/CuDnn.Error.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/CuDNN/CuDnnHelpers.ixx → Mila/Source/Dnn/CuDNN/CuDnn.Helpers.ixx
View file
File renamed without changes.
0 ...ource/Dnn/CuDNN/CuDnnOpaqueDescriptor.ixx → ...urce/Dnn/CuDNN/CuDnn.OpaqueDescriptor.ixx
View file
File renamed without changes.
0 ...e/Dnn/CuDNN/CuDnnOpaqueDescriptorType.ixx → .../Dnn/CuDNN/CuDnn.OpaqueDescriptorType.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/CuDNN/CuDnnOpaqueHandle.ixx → Mila/Source/Dnn/CuDNN/CuDnn.OpaqueHandle.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/CuDNN/CuDnnStatus.ixx → Mila/Source/Dnn/CuDNN/CuDnn.Status.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/CuDNN/CuDnnUtils.ixx → Mila/Source/Dnn/CuDNN/CuDnn.Utils.ixx
View file
File renamed without changes.
3 changes: 1 addition & 2 deletions Mila/Source/Dnn/CuDNN/CuDnn.ixx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
0 Mila/Source/Dnn/Cuda/CudaDevice.ixx → Mila/Source/Dnn/Cuda/Cuda.Device.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/Cuda/CudaDeviceProps.ixx → Mila/Source/Dnn/Cuda/Cuda.DeviceProps.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/Cuda/CudaError.ixx → Mila/Source/Dnn/Cuda/Cuda.Error.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/Cuda/CudaHelpers.ixx → Mila/Source/Dnn/Cuda/Cuda.Helpers.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/Cuda/CudaMemory.ixx → Mila/Source/Dnn/Cuda/Cuda.Memory.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/Cuda/CudaProfiler.ixx → Mila/Source/Dnn/Cuda/Cuda.Profiler.ixx
View file
File renamed without changes.
1 change: 1 addition & 0 deletions Mila/Source/Dnn/Cuda/Cuda.ixx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
0 ...ce/Dnn/Data/DataCategoryVectorEncoder.ixx → ...e/Dnn/Data/Data.CategoryVectorEncoder.ixx
View file
File renamed without changes.
0 ...rce/Dnn/Data/DataCharDatasetGenerator.ixx → ...ce/Dnn/Data/Data.CharDatasetGenerator.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/Data/DataDataset.ixx → Mila/Source/Dnn/Data/Data.Dataset.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/Data/DataDatasetType.ixx → Mila/Source/Dnn/Data/Data.DatasetType.ixx
View file
File renamed without changes.
29 changes: 0 additions & 29 deletions Mila/Source/Dnn/Data/FileStream.ixx
View file

This file was deleted.

0 Mila/Source/Dnn/DnnDropoutDescriptor.ixx → Mila/Source/Dnn/Dnn.DropoutDescriptor.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/DnnModel.ixx → Mila/Source/Dnn/Dnn.Model.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/DnnModelBuilder.ixx → Mila/Source/Dnn/Dnn.ModelBuilder.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/DnnModelOptions.ixx → Mila/Source/Dnn/Dnn.ModelOptions.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/DnnNeuralNetType.ixx → Mila/Source/Dnn/Dnn.NeuralNetType.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/DnnRnnDataSetDescriptor.ixx → Mila/Source/Dnn/Dnn.RnnDataSetDescriptor.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/DnnRnnLayerCollection.ixx → Mila/Source/Dnn/Dnn.RnnLayerCollection.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/DnnRnnLinearLayer.ixx → Mila/Source/Dnn/Dnn.RnnLinearLayer.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/DnnRnnModel.ixx → Mila/Source/Dnn/Dnn.RnnModel.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/DnnRnnModelOptions.ixx → Mila/Source/Dnn/Dnn.RnnModelOptions.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/DnnRnnOpDescriptor.ixx → Mila/Source/Dnn/Dnn.RnnOpDescriptor.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/DnnStateTensorDescriptor.ixx → .../Source/Dnn/Dnn.StateTensorDescriptor.ixx
View file
File renamed without changes.
0 Mila/Source/Dnn/DnnTensorDescriptor.ixx → Mila/Source/Dnn/Dnn.TensorDescriptor.ixx
View file
File renamed without changes.
1 change: 1 addition & 0 deletions Mila/Source/Dnn/Dnn.ixx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export module Dnn;

export import Dnn.RnnModel;
export import Dnn.Model;
export import Dnn.ModelBuilder;
export import Dnn.ModelOptions;
Expand Down
4 changes: 3 additions & 1 deletion Mila/Source/Mila.ixx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions Samples/MilaPackage/MilaPackage.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\packages\Achilles.Mila.0.9.4-alpha\build\native\Achilles.Mila.targets" Condition="Exists('..\..\packages\Achilles.Mila.0.9.4-alpha\build\native\Achilles.Mila.targets')" />
<Import Project="..\..\packages\Achilles.Mila.0.9.5-alpha\build\native\Achilles.Mila.targets" Condition="Exists('..\..\packages\Achilles.Mila.0.9.5-alpha\build\native\Achilles.Mila.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\Achilles.Mila.0.9.4-alpha\build\native\Achilles.Mila.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Achilles.Mila.0.9.4-alpha\build\native\Achilles.Mila.targets'))" />
<Error Condition="!Exists('..\..\packages\Achilles.Mila.0.9.5-alpha\build\native\Achilles.Mila.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Achilles.Mila.0.9.5-alpha\build\native\Achilles.Mila.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion Samples/MilaPackage/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Achilles.Mila" version="0.9.4-alpha" targetFramework="native" />
<package id="Achilles.Mila" version="0.9.5-alpha" targetFramework="native" />
</packages>

0 comments on commit f1ec60d

Please sign in to comment.