diff --git a/Libraries/DirectMLX.h b/Libraries/DirectMLX.h index efd78f1a..50dd5605 100644 --- a/Libraries/DirectMLX.h +++ b/Libraries/DirectMLX.h @@ -1062,6 +1062,8 @@ namespace dml return output; } +#if DML_TARGET_VERSION >= 0x3100 + inline Expression ClipGrad(Expression input, Expression inputGradient, float min, float max) { detail::GraphBuilder* builder = input.Impl()->GetGraphBuilder(); @@ -1084,6 +1086,8 @@ namespace dml return output; } +#endif // DML_TARGET_VERSION >= 0x3100 + inline Expression Cos(Expression input, const Optional& scaleBias = NullOpt) { return detail::ElementWiseUnary(input, scaleBias); @@ -1254,11 +1258,15 @@ namespace dml return detail::ElementWiseUnary(input, scaleBias); } +#if DML_TARGET_VERSION >= 0x3100 + inline Expression DifferenceSquare(Expression a, Expression b) { return detail::ElementWiseBinary(a, b); } +#endif // DML_TARGET_VERSION >= 0x3100 + inline Expression Subtract(Expression a, Expression b) { return detail::ElementWiseBinary(a, b); @@ -2659,6 +2667,8 @@ namespace dml return output; } +#if DML_TARGET_VERSION >= 0x3100 + struct BatchNormalizationGradOutputs { Expression gradient; @@ -2684,29 +2694,31 @@ namespace dml TensorDesc outputScaleGradientTensor(meanTensor.dataType, meanTensor.sizes, builder->GetTensorPolicy()); TensorDesc outputBiasGradientTensor(meanTensor.dataType, meanTensor.sizes, builder->GetTensorPolicy()); - DML_BATCH_NORMALIZATION_GRAD_OPERATOR_DESC bng_desc = {}; - bng_desc.InputTensor = inputTensor.AsPtr(); - bng_desc.InputGradientTensor = inputGradientTensor.AsPtr(); - bng_desc.MeanTensor = meanTensor.AsPtr(); - bng_desc.VarianceTensor = varianceTensor.AsPtr(); - bng_desc.ScaleTensor = scaleTensor.AsPtr(); - bng_desc.Epsilon = epsilon; + DML_BATCH_NORMALIZATION_GRAD_OPERATOR_DESC desc = {}; + desc.InputTensor = inputTensor.AsPtr(); + desc.InputGradientTensor = inputGradientTensor.AsPtr(); + desc.MeanTensor = meanTensor.AsPtr(); + desc.VarianceTensor = varianceTensor.AsPtr(); + desc.ScaleTensor = scaleTensor.AsPtr(); + desc.Epsilon = epsilon; - bng_desc.OutputGradientTensor = outputGradientTensor.AsPtr(); - bng_desc.OutputScaleGradientTensor = outputScaleGradientTensor.AsPtr(); - bng_desc.OutputBiasGradientTensor = outputBiasGradientTensor.AsPtr(); + desc.OutputGradientTensor = outputGradientTensor.AsPtr(); + desc.OutputScaleGradientTensor = outputScaleGradientTensor.AsPtr(); + desc.OutputBiasGradientTensor = outputBiasGradientTensor.AsPtr(); dml::detail::NodeOutput* const inputs[] = { input.Impl(), inputGradient.Impl(), mean.Impl(), variance.Impl(), scale.Impl() }; - dml::detail::NodeID node = builder->CreateOperatorNode(DML_OPERATOR_BATCH_NORMALIZATION_GRAD, &bng_desc, inputs); + dml::detail::NodeID node = builder->CreateOperatorNode(DML_OPERATOR_BATCH_NORMALIZATION_GRAD, &desc, inputs); BatchNormalizationGradOutputs outputValues; - outputValues.gradient = builder->CreateNodeOutput(node, 0, *bng_desc.OutputGradientTensor); - outputValues.scaleGradient = builder->CreateNodeOutput(node, 1, *bng_desc.OutputScaleGradientTensor); - outputValues.biasGradient = builder->CreateNodeOutput(node, 2, *bng_desc.OutputBiasGradientTensor); + outputValues.gradient = builder->CreateNodeOutput(node, 0, *desc.OutputGradientTensor); + outputValues.scaleGradient = builder->CreateNodeOutput(node, 1, *desc.OutputScaleGradientTensor); + outputValues.biasGradient = builder->CreateNodeOutput(node, 2, *desc.OutputBiasGradientTensor); return outputValues; } +#endif // DML_TARGET_VERSION >= 0x3100 + inline Expression MeanVarianceNormalization( Expression input, Optional scale, diff --git a/Samples/DirectMLSuperResolution/DirectMLSuperResolution.sln b/Samples/DirectMLSuperResolution/DirectMLSuperResolution.sln index ec9c7758..fca961f4 100644 --- a/Samples/DirectMLSuperResolution/DirectMLSuperResolution.sln +++ b/Samples/DirectMLSuperResolution/DirectMLSuperResolution.sln @@ -14,32 +14,60 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectMLXSuperResolution", EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Debug|ARM.ActiveCfg = Debug|ARM + {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Debug|ARM.Build.0 = Debug|ARM + {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Debug|ARM64.Build.0 = Debug|ARM64 {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Debug|x64.ActiveCfg = Debug|x64 {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Debug|x64.Build.0 = Debug|x64 {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Debug|x86.ActiveCfg = Debug|Win32 {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Debug|x86.Build.0 = Debug|Win32 + {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Release|ARM.ActiveCfg = Release|ARM + {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Release|ARM.Build.0 = Release|ARM + {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Release|ARM64.ActiveCfg = Release|ARM64 + {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Release|ARM64.Build.0 = Release|ARM64 {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Release|x64.ActiveCfg = Release|x64 {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Release|x64.Build.0 = Release|x64 {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Release|x86.ActiveCfg = Release|Win32 {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Release|x86.Build.0 = Release|Win32 + {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|ARM.ActiveCfg = Debug|ARM + {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|ARM.Build.0 = Debug|ARM + {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|ARM64.Build.0 = Debug|ARM64 {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|x64.ActiveCfg = Debug|x64 {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|x64.Build.0 = Debug|x64 {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|x86.ActiveCfg = Debug|Win32 {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|x86.Build.0 = Debug|Win32 + {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|ARM.ActiveCfg = Release|ARM + {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|ARM.Build.0 = Release|ARM + {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|ARM64.ActiveCfg = Release|ARM64 + {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|ARM64.Build.0 = Release|ARM64 {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|x64.ActiveCfg = Release|x64 {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|x64.Build.0 = Release|x64 {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|x86.ActiveCfg = Release|Win32 {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|x86.Build.0 = Release|Win32 + {31C25314-96AE-4EF0-84B7-0026C14F12AD}.Debug|ARM.ActiveCfg = Debug|ARM + {31C25314-96AE-4EF0-84B7-0026C14F12AD}.Debug|ARM.Build.0 = Debug|ARM + {31C25314-96AE-4EF0-84B7-0026C14F12AD}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {31C25314-96AE-4EF0-84B7-0026C14F12AD}.Debug|ARM64.Build.0 = Debug|ARM64 {31C25314-96AE-4EF0-84B7-0026C14F12AD}.Debug|x64.ActiveCfg = Debug|x64 {31C25314-96AE-4EF0-84B7-0026C14F12AD}.Debug|x64.Build.0 = Debug|x64 {31C25314-96AE-4EF0-84B7-0026C14F12AD}.Debug|x86.ActiveCfg = Debug|Win32 {31C25314-96AE-4EF0-84B7-0026C14F12AD}.Debug|x86.Build.0 = Debug|Win32 + {31C25314-96AE-4EF0-84B7-0026C14F12AD}.Release|ARM.ActiveCfg = Release|ARM + {31C25314-96AE-4EF0-84B7-0026C14F12AD}.Release|ARM.Build.0 = Release|ARM + {31C25314-96AE-4EF0-84B7-0026C14F12AD}.Release|ARM64.ActiveCfg = Release|ARM64 + {31C25314-96AE-4EF0-84B7-0026C14F12AD}.Release|ARM64.Build.0 = Release|ARM64 {31C25314-96AE-4EF0-84B7-0026C14F12AD}.Release|x64.ActiveCfg = Release|x64 {31C25314-96AE-4EF0-84B7-0026C14F12AD}.Release|x64.Build.0 = Release|x64 {31C25314-96AE-4EF0-84B7-0026C14F12AD}.Release|x86.ActiveCfg = Release|Win32 diff --git a/Samples/DirectMLSuperResolution/DirectMLSuperResolution.vcxproj b/Samples/DirectMLSuperResolution/DirectMLSuperResolution.vcxproj index 2c50c6e7..d4b341c5 100644 --- a/Samples/DirectMLSuperResolution/DirectMLSuperResolution.vcxproj +++ b/Samples/DirectMLSuperResolution/DirectMLSuperResolution.vcxproj @@ -1,11 +1,27 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -33,6 +49,12 @@ v141 Unicode + + Application + true + v141 + Unicode + Application false @@ -40,12 +62,25 @@ true Unicode + + Application + false + v141 + true + Unicode + Application true v141 Unicode + + Application + true + v141 + Unicode + Application false @@ -53,6 +88,13 @@ true Unicode + + Application + false + v141 + true + Unicode + @@ -61,35 +103,67 @@ + + + + + + + + + + + + true - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ @@ -111,6 +185,26 @@ d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + + Use + Level4 + Disabled + true + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + pch.h + true + $(ProjectDir);Kits\DirectXTK12\Inc;Kits\ATGTK;$(ProjectDir)..\..\Libraries\;%(AdditionalIncludeDirectories) + stdcpp17 + 4100 + + + Windows + true + d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + Use @@ -131,6 +225,26 @@ d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + + Use + Level4 + Disabled + true + _DEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + pch.h + true + $(ProjectDir);Kits\DirectXTK12\Inc;Kits\ATGTK;$(ProjectDir)..\..\Libraries\;%(AdditionalIncludeDirectories) + stdcpp17 + 4100 + + + Windows + true + d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + Use @@ -155,6 +269,30 @@ d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + + Use + Level4 + MaxSpeed + true + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + pch.h + true + $(ProjectDir);Kits\DirectXTK12\Inc;Kits\ATGTK;$(ProjectDir)..\..\Libraries\;%(AdditionalIncludeDirectories) + stdcpp17 + 4100 + + + Windows + true + true + true + d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + Use @@ -179,6 +317,30 @@ d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + + Use + Level4 + MaxSpeed + true + true + true + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + pch.h + true + $(ProjectDir);Kits\DirectXTK12\Inc;Kits\ATGTK;$(ProjectDir)..\..\Libraries\;%(AdditionalIncludeDirectories) + stdcpp17 + 4100 + + + Windows + true + true + true + d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + @@ -202,9 +364,13 @@ Create + Create Create + Create Create + Create Create + Create @@ -214,15 +380,23 @@ $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets @@ -233,65 +407,117 @@ imageToTensor + imageToTensor Compute + Compute 5.1 + 5.1 imageToTensor + imageToTensor Compute + Compute 5.1 + 5.1 imageToTensor + imageToTensor Compute + Compute 5.1 + 5.1 imageToTensor + imageToTensor Compute + Compute 5.1 + 5.1 Pixel + Pixel 5.1 + 5.1 Pixel + Pixel 5.1 + 5.1 Pixel + Pixel 5.1 + 5.1 Pixel + Pixel 5.1 + 5.1 PsTensorRGB8ToSurf + PsTensorRGB8ToSurf Pixel + Pixel 5.1 + 5.1 PsTensorRGB8ToSurf + PsTensorRGB8ToSurf Pixel + Pixel 5.1 + 5.1 PsTensorRGB8ToSurf + PsTensorRGB8ToSurf Pixel + Pixel 5.1 + 5.1 PsTensorRGB8ToSurf + PsTensorRGB8ToSurf Pixel + Pixel 5.1 + 5.1 VsTensorToSurf + VsTensorToSurf Vertex + Vertex 5.1 + 5.1 VsTensorToSurf + VsTensorToSurf Vertex + Vertex 5.1 + 5.1 VsTensorToSurf + VsTensorToSurf Vertex + Vertex 5.1 + 5.1 VsTensorToSurf + VsTensorToSurf Vertex + Vertex 5.1 + 5.1 Vertex + Vertex 5.1 + 5.1 Vertex + Vertex 5.1 + 5.1 Vertex + Vertex 5.1 + 5.1 Vertex + Vertex 5.1 + 5.1 @@ -299,9 +525,13 @@ Document $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets @@ -318,22 +548,26 @@ Document $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets - - + + 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/DirectMLSuperResolution/DirectMLSuperResolution.vcxproj.filters b/Samples/DirectMLSuperResolution/DirectMLSuperResolution.vcxproj.filters index ff34f9d5..853ad4bc 100644 --- a/Samples/DirectMLSuperResolution/DirectMLSuperResolution.vcxproj.filters +++ b/Samples/DirectMLSuperResolution/DirectMLSuperResolution.vcxproj.filters @@ -130,9 +130,6 @@ Assets - - Assets - @@ -149,5 +146,8 @@ Assets + + Resource Files + \ No newline at end of file diff --git a/Samples/DirectMLSuperResolution/DirectMLXSuperResolution.vcxproj b/Samples/DirectMLSuperResolution/DirectMLXSuperResolution.vcxproj index f6f08022..938f2a08 100644 --- a/Samples/DirectMLSuperResolution/DirectMLXSuperResolution.vcxproj +++ b/Samples/DirectMLSuperResolution/DirectMLXSuperResolution.vcxproj @@ -1,11 +1,27 @@  - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -33,6 +49,12 @@ v141 Unicode + + Application + true + v141 + Unicode + Application false @@ -40,12 +62,25 @@ true Unicode + + Application + false + v141 + true + Unicode + Application true v141 Unicode + + Application + true + v141 + Unicode + Application false @@ -53,6 +88,13 @@ true Unicode + + Application + false + v141 + true + Unicode + @@ -61,35 +103,67 @@ + + + + + + + + + + + + true - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ @@ -111,6 +185,26 @@ d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + + Use + Level4 + Disabled + true + WIN32;USE_DMLX=1;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + pch.h + true + $(ProjectDir);Kits\DirectXTK12\Inc;Kits\ATGTK;$(ProjectDir)..\..\Libraries\;%(AdditionalIncludeDirectories) + stdcpp17 + 4100 + + + Windows + true + d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + Use @@ -132,6 +226,27 @@ d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + + Use + Level4 + Disabled + true + WIN32;USE_DMLX=1;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + pch.h + false + pch.h + true + $(ProjectDir);Kits\DirectXTK12\Inc;Kits\ATGTK;$(ProjectDir)..\..\Libraries\;%(AdditionalIncludeDirectories) + stdcpp17 + 4100 + + + Windows + true + d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + Use @@ -156,6 +271,30 @@ d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + + Use + Level4 + MaxSpeed + true + true + true + WIN32;USE_DMLX=1;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + pch.h + true + $(ProjectDir);Kits\DirectXTK12\Inc;Kits\ATGTK;$(ProjectDir)..\..\Libraries\;%(AdditionalIncludeDirectories) + stdcpp17 + 4100 + + + Windows + true + true + true + d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + Use @@ -180,6 +319,30 @@ d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + + Use + Level4 + MaxSpeed + true + true + true + WIN32;USE_DMLX=1;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + pch.h + true + $(ProjectDir);Kits\DirectXTK12\Inc;Kits\ATGTK;$(ProjectDir)..\..\Libraries\;%(AdditionalIncludeDirectories) + stdcpp17 + 4100 + + + Windows + true + true + true + d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + @@ -203,9 +366,13 @@ Create + Create Create + Create Create + Create Create + Create @@ -215,15 +382,23 @@ $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets @@ -234,65 +409,117 @@ imageToTensor + imageToTensor Compute + Compute 5.1 + 5.1 imageToTensor + imageToTensor Compute + Compute 5.1 + 5.1 imageToTensor + imageToTensor Compute + Compute 5.1 + 5.1 imageToTensor + imageToTensor Compute + Compute 5.1 + 5.1 Pixel + Pixel 5.1 + 5.1 Pixel + Pixel 5.1 + 5.1 Pixel + Pixel 5.1 + 5.1 Pixel + Pixel 5.1 + 5.1 PsTensorRGB8ToSurf + PsTensorRGB8ToSurf Pixel + Pixel 5.1 + 5.1 PsTensorRGB8ToSurf + PsTensorRGB8ToSurf Pixel + Pixel 5.1 + 5.1 PsTensorRGB8ToSurf + PsTensorRGB8ToSurf Pixel + Pixel 5.1 + 5.1 PsTensorRGB8ToSurf + PsTensorRGB8ToSurf Pixel + Pixel 5.1 + 5.1 VsTensorToSurf + VsTensorToSurf Vertex + Vertex 5.1 + 5.1 VsTensorToSurf + VsTensorToSurf Vertex + Vertex 5.1 + 5.1 VsTensorToSurf + VsTensorToSurf Vertex + Vertex 5.1 + 5.1 VsTensorToSurf + VsTensorToSurf Vertex + Vertex 5.1 + 5.1 Vertex + Vertex 5.1 + 5.1 Vertex + Vertex 5.1 + 5.1 Vertex + Vertex 5.1 + 5.1 Vertex + Vertex 5.1 + 5.1 @@ -300,9 +527,13 @@ Document $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets @@ -319,22 +550,26 @@ Document $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets - - + + 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/DirectMLSuperResolution/DirectMLXSuperResolution.vcxproj.filters b/Samples/DirectMLSuperResolution/DirectMLXSuperResolution.vcxproj.filters index 1ca3867c..679821a2 100644 --- a/Samples/DirectMLSuperResolution/DirectMLXSuperResolution.vcxproj.filters +++ b/Samples/DirectMLSuperResolution/DirectMLXSuperResolution.vcxproj.filters @@ -82,15 +82,8 @@ Assets - - Assets - - - Assets - - Assets @@ -108,9 +101,7 @@ Assets - - Assets - + @@ -143,8 +134,9 @@ - - Assets - + + + + \ No newline at end of file diff --git a/Samples/DirectMLSuperResolution/Kits/DirectXTK12/DirectXTK_Desktop_2017_Win10.vcxproj b/Samples/DirectMLSuperResolution/Kits/DirectXTK12/DirectXTK_Desktop_2017_Win10.vcxproj index 3556f5b3..bdef4a6b 100644 --- a/Samples/DirectMLSuperResolution/Kits/DirectXTK12/DirectXTK_Desktop_2017_Win10.vcxproj +++ b/Samples/DirectMLSuperResolution/Kits/DirectXTK12/DirectXTK_Desktop_2017_Win10.vcxproj @@ -1,6 +1,14 @@  + + Debug + ARM + + + Debug + ARM64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -102,9 +118,13 @@ Create + Create Create + Create Create + Create Create + Create @@ -460,60 +480,116 @@ v141 Unicode + + StaticLibrary + true + v141 + Unicode + StaticLibrary true v141 Unicode + + StaticLibrary + true + v141 + Unicode + StaticLibrary false v141 Unicode + + StaticLibrary + false + v141 + Unicode + StaticLibrary false v141 Unicode + + StaticLibrary + false + v141 + Unicode + + + + + + + + + + + + + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ DirectXTK12 + + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ + DirectXTK12 + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ DirectXTK12 + + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ + DirectXTK12 + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ DirectXTK12 + + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ + DirectXTK12 + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ DirectXTK12 + + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ + DirectXTK12 + Use @@ -536,6 +612,28 @@ directml.lib;%(AdditionalDependencies) + + + Use + EnableAllWarnings + Disabled + _WIN32_WINNT=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + pch.h + $(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories) + Fast + $(IntDir)$(TargetName).pdb + true + false + false + + + Windows + true + + + directml.lib;%(AdditionalDependencies) + + Use @@ -556,6 +654,26 @@ true + + + Use + EnableAllWarnings + Disabled + _WIN32_WINNT=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + pch.h + $(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories) + Fast + StreamingSIMDExtensions2 + $(IntDir)$(TargetName).pdb + true + false + false + + + Windows + true + + EnableAllWarnings @@ -579,6 +697,29 @@ directml.lib;%(AdditionalDependencies) + + + EnableAllWarnings + Use + MaxSpeed + _WIN32_WINNT=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + pch.h + $(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories) + Fast + $(IntDir)$(TargetName).pdb + true + false + + + Windows + true + true + true + + + directml.lib;%(AdditionalDependencies) + + EnableAllWarnings @@ -600,6 +741,27 @@ true + + + EnableAllWarnings + Use + MaxSpeed + _WIN32_WINNT=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + pch.h + $(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories) + Fast + StreamingSIMDExtensions2 + $(IntDir)$(TargetName).pdb + true + false + + + Windows + true + true + true + + diff --git a/Samples/DirectMLSuperResolution/packages.config b/Samples/DirectMLSuperResolution/packages.config index e3ab5d05..9ef97b3e 100644 --- a/Samples/DirectMLSuperResolution/packages.config +++ b/Samples/DirectMLSuperResolution/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Samples/HelloDirectML/HelloDirectML.sln b/Samples/HelloDirectML/HelloDirectML.sln index 8f1f9675..7a6f39e3 100644 --- a/Samples/HelloDirectML/HelloDirectML.sln +++ b/Samples/HelloDirectML/HelloDirectML.sln @@ -9,24 +9,44 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloDirectMLX", "HelloDire EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {13DB3BA1-0F18-40C6-8346-824A7F14DDD3}.Debug|ARM.ActiveCfg = Debug|ARM + {13DB3BA1-0F18-40C6-8346-824A7F14DDD3}.Debug|ARM.Build.0 = Debug|ARM + {13DB3BA1-0F18-40C6-8346-824A7F14DDD3}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {13DB3BA1-0F18-40C6-8346-824A7F14DDD3}.Debug|ARM64.Build.0 = Debug|ARM64 {13DB3BA1-0F18-40C6-8346-824A7F14DDD3}.Debug|x64.ActiveCfg = Debug|x64 {13DB3BA1-0F18-40C6-8346-824A7F14DDD3}.Debug|x64.Build.0 = Debug|x64 {13DB3BA1-0F18-40C6-8346-824A7F14DDD3}.Debug|x86.ActiveCfg = Debug|Win32 {13DB3BA1-0F18-40C6-8346-824A7F14DDD3}.Debug|x86.Build.0 = Debug|Win32 + {13DB3BA1-0F18-40C6-8346-824A7F14DDD3}.Release|ARM.ActiveCfg = Release|ARM + {13DB3BA1-0F18-40C6-8346-824A7F14DDD3}.Release|ARM.Build.0 = Release|ARM + {13DB3BA1-0F18-40C6-8346-824A7F14DDD3}.Release|ARM64.ActiveCfg = Release|ARM64 + {13DB3BA1-0F18-40C6-8346-824A7F14DDD3}.Release|ARM64.Build.0 = Release|ARM64 {13DB3BA1-0F18-40C6-8346-824A7F14DDD3}.Release|x64.ActiveCfg = Release|x64 {13DB3BA1-0F18-40C6-8346-824A7F14DDD3}.Release|x64.Build.0 = Release|x64 {13DB3BA1-0F18-40C6-8346-824A7F14DDD3}.Release|x86.ActiveCfg = Release|Win32 {13DB3BA1-0F18-40C6-8346-824A7F14DDD3}.Release|x86.Build.0 = Release|Win32 + {3E1FCFF4-7D64-41A3-967E-C0350365C0F3}.Debug|ARM.ActiveCfg = Debug|ARM + {3E1FCFF4-7D64-41A3-967E-C0350365C0F3}.Debug|ARM.Build.0 = Debug|ARM + {3E1FCFF4-7D64-41A3-967E-C0350365C0F3}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {3E1FCFF4-7D64-41A3-967E-C0350365C0F3}.Debug|ARM64.Build.0 = Debug|ARM64 {3E1FCFF4-7D64-41A3-967E-C0350365C0F3}.Debug|x64.ActiveCfg = Debug|x64 {3E1FCFF4-7D64-41A3-967E-C0350365C0F3}.Debug|x64.Build.0 = Debug|x64 {3E1FCFF4-7D64-41A3-967E-C0350365C0F3}.Debug|x86.ActiveCfg = Debug|Win32 {3E1FCFF4-7D64-41A3-967E-C0350365C0F3}.Debug|x86.Build.0 = Debug|Win32 + {3E1FCFF4-7D64-41A3-967E-C0350365C0F3}.Release|ARM.ActiveCfg = Release|ARM + {3E1FCFF4-7D64-41A3-967E-C0350365C0F3}.Release|ARM.Build.0 = Release|ARM + {3E1FCFF4-7D64-41A3-967E-C0350365C0F3}.Release|ARM64.ActiveCfg = Release|ARM64 + {3E1FCFF4-7D64-41A3-967E-C0350365C0F3}.Release|ARM64.Build.0 = Release|ARM64 {3E1FCFF4-7D64-41A3-967E-C0350365C0F3}.Release|x64.ActiveCfg = Release|x64 {3E1FCFF4-7D64-41A3-967E-C0350365C0F3}.Release|x64.Build.0 = Release|x64 {3E1FCFF4-7D64-41A3-967E-C0350365C0F3}.Release|x86.ActiveCfg = Release|Win32 diff --git a/Samples/HelloDirectML/HelloDirectML.vcxproj b/Samples/HelloDirectML/HelloDirectML.vcxproj index 06328e27..08db2b17 100644 --- a/Samples/HelloDirectML/HelloDirectML.vcxproj +++ b/Samples/HelloDirectML/HelloDirectML.vcxproj @@ -1,11 +1,27 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -23,9 +39,13 @@ Create + Create Create + Create Create + Create Create + Create @@ -48,6 +68,12 @@ v141 Unicode + + Application + true + v141 + Unicode + Application false @@ -55,12 +81,25 @@ true Unicode + + Application + false + v141 + true + Unicode + Application true v141 Unicode + + Application + true + v141 + Unicode + Application false @@ -68,6 +107,13 @@ true Unicode + + Application + false + v141 + true + Unicode + @@ -76,35 +122,67 @@ + + + + + + + + + + + + true - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ @@ -125,6 +203,25 @@ WindowsApp.lib;dxgi.lib;d3d12.lib;%(AdditionalDependencies) + + + Use + Level4 + Disabled + true + USE_DMLX=0;_DEBUG + false + $(SolutionDir)../../Libraries + stdcpp17 + pch.h + true + + + Console + true + WindowsApp.lib;dxgi.lib;d3d12.lib;%(AdditionalDependencies) + + Use @@ -144,6 +241,25 @@ WindowsApp.lib;dxgi.lib;d3d12.lib;%(AdditionalDependencies) + + + Use + Level4 + Disabled + true + USE_DMLX=0;_DEBUG;WIN32 + false + $(SolutionDir)../../Libraries + stdcpp17 + pch.h + true + + + Console + true + WindowsApp.lib;dxgi.lib;d3d12.lib;%(AdditionalDependencies) + + Use @@ -167,6 +283,29 @@ WindowsApp.lib;dxgi.lib;d3d12.lib;%(AdditionalDependencies) + + + Use + Level4 + MaxSpeed + true + true + true + USE_DMLX=0;WIN32;NDEBUG + false + $(SolutionDir)../../Libraries + stdcpp17 + pch.h + true + + + Console + true + true + true + WindowsApp.lib;dxgi.lib;d3d12.lib;%(AdditionalDependencies) + + Use @@ -190,15 +329,38 @@ WindowsApp.lib;dxgi.lib;d3d12.lib;%(AdditionalDependencies) + + + Use + Level4 + MaxSpeed + true + true + true + USE_DMLX=0;NDEBUG + false + $(SolutionDir)../../Libraries + stdcpp17 + pch.h + true + + + Console + true + true + true + WindowsApp.lib;dxgi.lib;d3d12.lib;%(AdditionalDependencies) + + - + 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/HelloDirectML/HelloDirectMLX.vcxproj b/Samples/HelloDirectML/HelloDirectMLX.vcxproj index 305f105b..dc8babc3 100644 --- a/Samples/HelloDirectML/HelloDirectMLX.vcxproj +++ b/Samples/HelloDirectML/HelloDirectMLX.vcxproj @@ -1,11 +1,27 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -23,9 +39,13 @@ Create + Create Create + Create Create + Create Create + Create @@ -48,6 +68,12 @@ v141 Unicode + + Application + true + v141 + Unicode + Application false @@ -55,12 +81,25 @@ true Unicode + + Application + false + v141 + true + Unicode + Application true v141 Unicode + + Application + true + v141 + Unicode + Application false @@ -68,6 +107,13 @@ true Unicode + + Application + false + v141 + true + Unicode + @@ -76,35 +122,67 @@ + + + + + + + + + + + + true - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ true - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ false - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\ + $(ProjectName)\$(Platform)\$(Configuration)\ @@ -125,6 +203,25 @@ WindowsApp.lib;dxgi.lib;d3d12.lib;%(AdditionalDependencies) + + + Use + Level4 + Disabled + true + USE_DMLX;_DEBUG + false + $(SolutionDir)../../Libraries + stdcpp17 + pch.h + true + + + Console + true + WindowsApp.lib;dxgi.lib;d3d12.lib;%(AdditionalDependencies) + + Use @@ -144,6 +241,25 @@ WindowsApp.lib;dxgi.lib;d3d12.lib;%(AdditionalDependencies) + + + Use + Level4 + Disabled + true + USE_DMLX;_DEBUG;WIN32 + false + $(SolutionDir)../../Libraries + stdcpp17 + pch.h + true + + + Console + true + WindowsApp.lib;dxgi.lib;d3d12.lib;%(AdditionalDependencies) + + Use @@ -167,6 +283,29 @@ WindowsApp.lib;dxgi.lib;d3d12.lib;%(AdditionalDependencies) + + + Use + Level4 + MaxSpeed + true + true + true + USE_DMLX;WIN32;NDEBUG + false + $(SolutionDir)../../Libraries + stdcpp17 + pch.h + true + + + Console + true + true + true + WindowsApp.lib;dxgi.lib;d3d12.lib;%(AdditionalDependencies) + + Use @@ -190,15 +329,38 @@ WindowsApp.lib;dxgi.lib;d3d12.lib;%(AdditionalDependencies) + + + Use + Level4 + MaxSpeed + true + true + true + USE_DMLX;NDEBUG + false + $(SolutionDir)../../Libraries + stdcpp17 + pch.h + true + + + Console + true + true + true + WindowsApp.lib;dxgi.lib;d3d12.lib;%(AdditionalDependencies) + + - + 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/HelloDirectML/packages.config b/Samples/HelloDirectML/packages.config index 58100a2b..e37e035b 100644 --- a/Samples/HelloDirectML/packages.config +++ b/Samples/HelloDirectML/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Samples/yolov4/Kits/DirectXTK12/DirectXTK_Desktop_2017_Win10.vcxproj b/Samples/yolov4/Kits/DirectXTK12/DirectXTK_Desktop_2017_Win10.vcxproj index 3556f5b3..bdef4a6b 100644 --- a/Samples/yolov4/Kits/DirectXTK12/DirectXTK_Desktop_2017_Win10.vcxproj +++ b/Samples/yolov4/Kits/DirectXTK12/DirectXTK_Desktop_2017_Win10.vcxproj @@ -1,6 +1,14 @@  + + Debug + ARM + + + Debug + ARM64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -102,9 +118,13 @@ Create + Create Create + Create Create + Create Create + Create @@ -460,60 +480,116 @@ v141 Unicode + + StaticLibrary + true + v141 + Unicode + StaticLibrary true v141 Unicode + + StaticLibrary + true + v141 + Unicode + StaticLibrary false v141 Unicode + + StaticLibrary + false + v141 + Unicode + StaticLibrary false v141 Unicode + + StaticLibrary + false + v141 + Unicode + + + + + + + + + + + + + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ DirectXTK12 + + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ + DirectXTK12 + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ DirectXTK12 + + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ + DirectXTK12 + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ DirectXTK12 + + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ + DirectXTK12 + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ DirectXTK12 + + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ + Bin\Desktop_2017_Win10\$(Platform)\$(Configuration)\ + DirectXTK12 + Use @@ -536,6 +612,28 @@ directml.lib;%(AdditionalDependencies) + + + Use + EnableAllWarnings + Disabled + _WIN32_WINNT=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + pch.h + $(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories) + Fast + $(IntDir)$(TargetName).pdb + true + false + false + + + Windows + true + + + directml.lib;%(AdditionalDependencies) + + Use @@ -556,6 +654,26 @@ true + + + Use + EnableAllWarnings + Disabled + _WIN32_WINNT=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + pch.h + $(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories) + Fast + StreamingSIMDExtensions2 + $(IntDir)$(TargetName).pdb + true + false + false + + + Windows + true + + EnableAllWarnings @@ -579,6 +697,29 @@ directml.lib;%(AdditionalDependencies) + + + EnableAllWarnings + Use + MaxSpeed + _WIN32_WINNT=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + pch.h + $(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories) + Fast + $(IntDir)$(TargetName).pdb + true + false + + + Windows + true + true + true + + + directml.lib;%(AdditionalDependencies) + + EnableAllWarnings @@ -600,6 +741,27 @@ true + + + EnableAllWarnings + Use + MaxSpeed + _WIN32_WINNT=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + pch.h + $(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories) + Fast + StreamingSIMDExtensions2 + $(IntDir)$(TargetName).pdb + true + false + + + Windows + true + true + true + + diff --git a/Samples/yolov4/packages.config b/Samples/yolov4/packages.config index e3ab5d05..9ef97b3e 100644 --- a/Samples/yolov4/packages.config +++ b/Samples/yolov4/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Samples/yolov4/yolov4.sln b/Samples/yolov4/yolov4.sln index 14b04db6..69148943 100644 --- a/Samples/yolov4/yolov4.sln +++ b/Samples/yolov4/yolov4.sln @@ -12,24 +12,44 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK12", "Kits\DirectX EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Debug|ARM.ActiveCfg = Debug|ARM + {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Debug|ARM.Build.0 = Debug|ARM + {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Debug|ARM64.Build.0 = Debug|ARM64 {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Debug|x64.ActiveCfg = Debug|x64 {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Debug|x64.Build.0 = Debug|x64 {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Debug|x86.ActiveCfg = Debug|Win32 {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Debug|x86.Build.0 = Debug|Win32 + {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Release|ARM.ActiveCfg = Release|ARM + {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Release|ARM.Build.0 = Release|ARM + {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Release|ARM64.ActiveCfg = Release|ARM64 + {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Release|ARM64.Build.0 = Release|ARM64 {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Release|x64.ActiveCfg = Release|x64 {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Release|x64.Build.0 = Release|x64 {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Release|x86.ActiveCfg = Release|Win32 {70CDBD87-F286-4EE0-87F1-5A1D09396CDA}.Release|x86.Build.0 = Release|Win32 + {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|ARM.ActiveCfg = Debug|ARM + {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|ARM.Build.0 = Debug|ARM + {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|ARM64.Build.0 = Debug|ARM64 {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|x64.ActiveCfg = Debug|x64 {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|x64.Build.0 = Debug|x64 {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|x86.ActiveCfg = Debug|Win32 {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|x86.Build.0 = Debug|Win32 + {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|ARM.ActiveCfg = Release|ARM + {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|ARM.Build.0 = Release|ARM + {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|ARM64.ActiveCfg = Release|ARM64 + {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|ARM64.Build.0 = Release|ARM64 {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|x64.ActiveCfg = Release|x64 {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|x64.Build.0 = Release|x64 {3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|x86.ActiveCfg = Release|Win32 diff --git a/Samples/yolov4/yolov4.vcxproj b/Samples/yolov4/yolov4.vcxproj index 81cf845e..6f11fffa 100644 --- a/Samples/yolov4/yolov4.vcxproj +++ b/Samples/yolov4/yolov4.vcxproj @@ -1,11 +1,27 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -33,6 +49,12 @@ v141 Unicode + + Application + true + v141 + Unicode + Application false @@ -40,12 +62,25 @@ true Unicode + + Application + false + v141 + true + Unicode + Application true v141 Unicode + + Application + true + v141 + Unicode + Application false @@ -53,6 +88,13 @@ true Unicode + + Application + false + v141 + true + Unicode + @@ -61,36 +103,60 @@ + + + + + + + + + + + + true $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + + true + true $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + + true + false $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + + false + false $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(PlatformTarget)\$(Configuration)\$(ProjectName)\ + + false + Use @@ -112,6 +178,30 @@ mkdir $(OutDir)data +copy $(ProjectDir)data\. $(OutDir)data + + + + + Use + Level4 + Disabled + true + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + pch.h + true + $(ProjectDir);Kits\DirectXTK12\Inc;Kits\ATGTK;$(ProjectDir)..\..\Libraries\;%(AdditionalIncludeDirectories) + stdcpp17 + 4238;4201;4100 + + + Windows + true + d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + + mkdir $(OutDir)data copy $(ProjectDir)data\. $(OutDir)data @@ -136,6 +226,30 @@ copy $(ProjectDir)data\. $(OutDir)data mkdir $(OutDir)data +copy $(ProjectDir)data\. $(OutDir)data + + + + + Use + Level4 + Disabled + true + _DEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + pch.h + true + $(ProjectDir);Kits\DirectXTK12\Inc;Kits\ATGTK;$(ProjectDir)..\..\Libraries\;%(AdditionalIncludeDirectories) + stdcpp17 + 4238;4201;4100 + + + Windows + true + d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + + mkdir $(OutDir)data copy $(ProjectDir)data\. $(OutDir)data @@ -164,6 +278,34 @@ copy $(ProjectDir)data\. $(OutDir)data mkdir $(OutDir)data +copy $(ProjectDir)data\. $(OutDir)data + + + + + Use + Level4 + MaxSpeed + true + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + pch.h + true + $(ProjectDir);Kits\DirectXTK12\Inc;Kits\ATGTK;$(ProjectDir)..\..\Libraries\;%(AdditionalIncludeDirectories) + stdcpp17 + 4238;4201;4100 + + + Windows + true + true + true + d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + + mkdir $(OutDir)data copy $(ProjectDir)data\. $(OutDir)data @@ -192,6 +334,34 @@ copy $(ProjectDir)data\. $(OutDir)data mkdir $(OutDir)data +copy $(ProjectDir)data\. $(OutDir)data + + + + + Use + Level4 + MaxSpeed + true + true + true + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + pch.h + true + $(ProjectDir);Kits\DirectXTK12\Inc;Kits\ATGTK;$(ProjectDir)..\..\Libraries\;%(AdditionalIncludeDirectories) + stdcpp17 + 4238;4201;4100 + + + Windows + true + true + true + d3d12.lib;dxgi.lib;dxguid.lib;d3d11.lib;uuid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;mfplat.lib;odbc32.lib;odbccp32.lib;runtimeobject.lib;%(AdditionalDependencies) + + + mkdir $(OutDir)data copy $(ProjectDir)data\. $(OutDir)data @@ -218,9 +388,13 @@ copy $(ProjectDir)data\. $(OutDir)data Create + Create Create + Create Create + Create Create + Create @@ -234,9 +408,13 @@ copy $(ProjectDir)data\. $(OutDir)data $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets @@ -247,65 +425,117 @@ copy $(ProjectDir)data\. $(OutDir)data imageToTensor + imageToTensor Compute + Compute 5.1 + 5.1 imageToTensor + imageToTensor Compute + Compute 5.1 + 5.1 imageToTensor + imageToTensor Compute + Compute 5.1 + 5.1 imageToTensor + imageToTensor Compute + Compute 5.1 + 5.1 Pixel + Pixel 5.1 + 5.1 Pixel + Pixel 5.1 + 5.1 Pixel + Pixel 5.1 + 5.1 Pixel + Pixel 5.1 + 5.1 PsTensorRGB8ToSurf + PsTensorRGB8ToSurf Pixel + Pixel 5.1 + 5.1 PsTensorRGB8ToSurf + PsTensorRGB8ToSurf Pixel + Pixel 5.1 + 5.1 PsTensorRGB8ToSurf + PsTensorRGB8ToSurf Pixel + Pixel 5.1 + 5.1 PsTensorRGB8ToSurf + PsTensorRGB8ToSurf Pixel + Pixel 5.1 + 5.1 VsTensorToSurf + VsTensorToSurf Vertex + Vertex 5.1 + 5.1 VsTensorToSurf + VsTensorToSurf Vertex + Vertex 5.1 + 5.1 VsTensorToSurf + VsTensorToSurf Vertex + Vertex 5.1 + 5.1 VsTensorToSurf + VsTensorToSurf Vertex + Vertex 5.1 + 5.1 Vertex + Vertex 5.1 + 5.1 Vertex + Vertex 5.1 + 5.1 Vertex + Vertex 5.1 + 5.1 Vertex + Vertex 5.1 + 5.1 @@ -324,15 +554,19 @@ copy $(ProjectDir)data\. $(OutDir)data Document $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets $(OutDir)\Assets + $(OutDir)\Assets - - + + @@ -343,8 +577,8 @@ copy $(ProjectDir)data\. $(OutDir)data 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/yolov4/yolov4.vcxproj.filters b/Samples/yolov4/yolov4.vcxproj.filters index 5a1fe68b..2ff8cac7 100644 --- a/Samples/yolov4/yolov4.vcxproj.filters +++ b/Samples/yolov4/yolov4.vcxproj.filters @@ -105,9 +105,6 @@ Assets - - Assets - @@ -151,8 +148,9 @@ - - Assets - + + Resource Files + + \ No newline at end of file