Updated Onnx runtime

axodox · Apr 14, 2024 · 80e5a0c · 80e5a0c
1 parent 0370a10
commit 80e5a0c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Unpaint/Unpaint.vcxproj b/Unpaint/Unpaint.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Axodox.MachineLearning.OnnxRuntime.DirectML.1.16.1\build\native\Axodox.MachineLearning.OnnxRuntime.DirectML.props" Condition="Exists('..\packages\Axodox.MachineLearning.OnnxRuntime.DirectML.1.16.1\build\native\Axodox.MachineLearning.OnnxRuntime.DirectML.props')" />
+  <Import Project="..\packages\Axodox.MachineLearning.OnnxRuntime.DirectML.1.17.1.1\build\native\Axodox.MachineLearning.OnnxRuntime.DirectML.props" Condition="Exists('..\packages\Axodox.MachineLearning.OnnxRuntime.DirectML.1.17.1.1\build\native\Axodox.MachineLearning.OnnxRuntime.DirectML.props')" />
   <Import Project="..\packages\Microsoft.AI.DirectML.1.13.1\build\Microsoft.AI.DirectML.props" Condition="Exists('..\packages\Microsoft.AI.DirectML.1.13.1\build\Microsoft.AI.DirectML.props')" />
   <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.230524.4\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.230524.4\build\native\Microsoft.Windows.CppWinRT.props')" />
   <Import Project="..\packages\Microsoft.UI.Xaml.2.8.4\build\native\Microsoft.UI.Xaml.props" Condition="Exists('..\packages\Microsoft.UI.Xaml.2.8.4\build\native\Microsoft.UI.Xaml.props')" />
@@ -432,7 +432,7 @@
     <Import Project="..\packages\Axodox.MachineLearning.2.0.52\build\native\Axodox.MachineLearning.targets" Condition="Exists('..\packages\Axodox.MachineLearning.2.0.52\build\native\Axodox.MachineLearning.targets')" />
     <Import Project="..\packages\Axodox.Common.1.0.42\build\native\Axodox.Common.targets" Condition="Exists('..\packages\Axodox.Common.1.0.42\build\native\Axodox.Common.targets')" />
     <Import Project="..\packages\Microsoft.AI.DirectML.1.13.1\build\Microsoft.AI.DirectML.targets" Condition="Exists('..\packages\Microsoft.AI.DirectML.1.13.1\build\Microsoft.AI.DirectML.targets')" />
-    <Import Project="..\packages\Axodox.MachineLearning.OnnxRuntime.DirectML.1.16.1\build\native\Axodox.MachineLearning.OnnxRuntime.DirectML.targets" Condition="Exists('..\packages\Axodox.MachineLearning.OnnxRuntime.DirectML.1.16.1\build\native\Axodox.MachineLearning.OnnxRuntime.DirectML.targets')" />
+    <Import Project="..\packages\Axodox.MachineLearning.OnnxRuntime.DirectML.1.17.1.1\build\native\Axodox.MachineLearning.OnnxRuntime.DirectML.targets" Condition="Exists('..\packages\Axodox.MachineLearning.OnnxRuntime.DirectML.1.17.1.1\build\native\Axodox.MachineLearning.OnnxRuntime.DirectML.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -448,7 +448,7 @@
     <Error Condition="!Exists('..\packages\Axodox.Common.1.0.42\build\native\Axodox.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Axodox.Common.1.0.42\build\native\Axodox.Common.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.AI.DirectML.1.13.1\build\Microsoft.AI.DirectML.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.AI.DirectML.1.13.1\build\Microsoft.AI.DirectML.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.AI.DirectML.1.13.1\build\Microsoft.AI.DirectML.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.AI.DirectML.1.13.1\build\Microsoft.AI.DirectML.targets'))" />
-    <Error Condition="!Exists('..\packages\Axodox.MachineLearning.OnnxRuntime.DirectML.1.16.1\build\native\Axodox.MachineLearning.OnnxRuntime.DirectML.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Axodox.MachineLearning.OnnxRuntime.DirectML.1.16.1\build\native\Axodox.MachineLearning.OnnxRuntime.DirectML.props'))" />
-    <Error Condition="!Exists('..\packages\Axodox.MachineLearning.OnnxRuntime.DirectML.1.16.1\build\native\Axodox.MachineLearning.OnnxRuntime.DirectML.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Axodox.MachineLearning.OnnxRuntime.DirectML.1.16.1\build\native\Axodox.MachineLearning.OnnxRuntime.DirectML.targets'))" />
+    <Error Condition="!Exists('..\packages\Axodox.MachineLearning.OnnxRuntime.DirectML.1.17.1.1\build\native\Axodox.MachineLearning.OnnxRuntime.DirectML.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Axodox.MachineLearning.OnnxRuntime.DirectML.1.17.1.1\build\native\Axodox.MachineLearning.OnnxRuntime.DirectML.props'))" />
+    <Error Condition="!Exists('..\packages\Axodox.MachineLearning.OnnxRuntime.DirectML.1.17.1.1\build\native\Axodox.MachineLearning.OnnxRuntime.DirectML.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Axodox.MachineLearning.OnnxRuntime.DirectML.1.17.1.1\build\native\Axodox.MachineLearning.OnnxRuntime.DirectML.targets'))" />
   </Target>
 </Project>
diff --git a/Unpaint/Unpaint.vcxproj.filters b/Unpaint/Unpaint.vcxproj.filters
@@ -330,7 +330,6 @@
       <Filter>Data</Filter>
     </None>
     <None Include="key.pfx" />
-    <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\onnxruntime.dll" />
     <None Include="concrt140.dll" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Unpaint/packages.config b/Unpaint/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Axodox.Common" version="1.0.42" targetFramework="native" />
   <package id="Axodox.MachineLearning" version="2.0.52" targetFramework="native" />
-  <package id="Axodox.MachineLearning.OnnxRuntime.DirectML" version="1.16.1" targetFramework="native" />
+  <package id="Axodox.MachineLearning.OnnxRuntime.DirectML" version="1.17.1.1" targetFramework="native" />
   <package id="Microsoft.AI.DirectML" version="1.13.1" targetFramework="native" />
   <package id="Microsoft.UI.Xaml" version="2.8.4" targetFramework="native" />
   <package id="Microsoft.Web.WebView2" version="1.0.1774.30" targetFramework="native" />