Skip to content
This repository was archived by the owner on Nov 27, 2024. It is now read-only.

Commit 648df54

Browse files
saddam213saddam213
committed
Make DirectML the default build
1 parent f10c73e commit 648df54

File tree

3 files changed

+18
-46
lines changed

3 files changed

+18
-46
lines changed

‎OnnxStack.Console/OnnxStack.Console.csproj

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>disable</Nullable>
88
<PlatformTarget>x64</PlatformTarget>
9-
<Configurations>Debug;Release;Debug-DirectML;Debug-Cuda;Debug-TensorRT;Release-DirectML;Release-Cuda;Release-TensorRT</Configurations>
9+
<Configurations>Debug;Release;Debug-Cuda;Debug-TensorRT;Release-Cuda;Release-TensorRT</Configurations>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
@@ -15,17 +15,16 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="OnnxStack.StableDiffusion" Version="0.14.0" Condition=" '$(Configuration)' == 'Release' OR '$(Configuration)' == 'Release-DirectML' OR '$(Configuration)' == 'Release-Cuda' OR '$(Configuration)' == 'Release-TensorRT'" />
19-
<PackageReference Include="OnnxStack.ImageUpscaler" Version="0.14.0" Condition=" '$(Configuration)' == 'Release' OR '$(Configuration)' == 'Release-DirectML' OR '$(Configuration)' == 'Release-Cuda' OR '$(Configuration)' == 'Release-TensorRT'" />
20-
<ProjectReference Include="..\OnnxStack.StableDiffusion\OnnxStack.StableDiffusion.csproj" Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Debug-DirectML' OR '$(Configuration)' == 'Debug-Cuda' OR '$(Configuration)' == 'Debug-TensorRT'" />
21-
<ProjectReference Include="..\OnnxStack.ImageUpscaler\OnnxStack.ImageUpscaler.csproj" Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Debug-DirectML' OR '$(Configuration)' == 'Debug-Cuda' OR '$(Configuration)' == 'Debug-TensorRT'" />
18+
<PackageReference Include="OnnxStack.StableDiffusion" Version="0.14.0" Condition=" '$(Configuration)' == 'Release' OR '$(Configuration)' == 'Release-Cuda' OR '$(Configuration)' == 'Release-TensorRT'" />
19+
<PackageReference Include="OnnxStack.ImageUpscaler" Version="0.14.0" Condition=" '$(Configuration)' == 'Release' OR '$(Configuration)' == 'Release-Cuda' OR '$(Configuration)' == 'Release-TensorRT'" />
20+
<ProjectReference Include="..\OnnxStack.StableDiffusion\OnnxStack.StableDiffusion.csproj" Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Debug-Cuda' OR '$(Configuration)' == 'Debug-TensorRT'" />
21+
<ProjectReference Include="..\OnnxStack.ImageUpscaler\OnnxStack.ImageUpscaler.csproj" Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Debug-Cuda' OR '$(Configuration)' == 'Debug-TensorRT'" />
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.16.3" Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Release' " />
25+
<PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.16.3" Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Release' " />
2626
<PackageReference Include="Microsoft.ML.OnnxRuntime.Gpu" Version="1.16.3" Condition=" '$(Configuration)' == 'Debug-TensorRT' OR '$(Configuration)' == 'Release-TensorRT'" />
2727
<PackageReference Include="Microsoft.ML.OnnxRuntime.Gpu" Version="1.16.3" Condition=" '$(Configuration)' == 'Debug-Cuda' OR '$(Configuration)' == 'Release-Cuda'" />
28-
<PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.16.3" Condition=" '$(Configuration)' == 'Debug-DirectML' OR '$(Configuration)' == 'Release-DirectML'" />
2928
</ItemGroup>
3029

3130
<ItemGroup>

‎OnnxStack.UI/OnnxStack.UI.csproj

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
<UseWPF>true</UseWPF>
99
<UseWindowsForms>true</UseWindowsForms>
1010
<PlatformTarget>x64</PlatformTarget>
11-
<Configurations>Debug;Release;Debug-DirectML;Debug-Cuda;Debug-TensorRT;Release-DirectML;Release-Cuda;Release-TensorRT</Configurations>
12-
</PropertyGroup>
13-
14-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-DirectML|AnyCPU'">
15-
<Optimize>True</Optimize>
11+
<Configurations>Debug;Release;Debug-Cuda;Debug-TensorRT;Release-Cuda;Release-TensorRT</Configurations>
1612
</PropertyGroup>
1713

1814
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Cuda|AnyCPU'">
@@ -53,17 +49,16 @@
5349
</ItemGroup>
5450

5551
<ItemGroup>
56-
<PackageReference Include="OnnxStack.StableDiffusion" Version="0.14.0" Condition=" '$(Configuration)' == 'Release' OR '$(Configuration)' == 'Release-DirectML' OR '$(Configuration)' == 'Release-Cuda' OR '$(Configuration)' == 'Release-TensorRT'" />
57-
<PackageReference Include="OnnxStack.ImageUpscaler" Version="0.14.0" Condition=" '$(Configuration)' == 'Release' OR '$(Configuration)' == 'Release-DirectML' OR '$(Configuration)' == 'Release-Cuda' OR '$(Configuration)' == 'Release-TensorRT'" />
58-
<ProjectReference Include="..\OnnxStack.StableDiffusion\OnnxStack.StableDiffusion.csproj" Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Debug-DirectML' OR '$(Configuration)' == 'Debug-Cuda' OR '$(Configuration)' == 'Debug-TensorRT'" />
59-
<ProjectReference Include="..\OnnxStack.ImageUpscaler\OnnxStack.ImageUpscaler.csproj" Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Debug-DirectML' OR '$(Configuration)' == 'Debug-Cuda' OR '$(Configuration)' == 'Debug-TensorRT'" />
52+
<PackageReference Include="OnnxStack.StableDiffusion" Version="0.14.0" Condition=" '$(Configuration)' == 'Release' OR '$(Configuration)' == 'Release-Cuda' OR '$(Configuration)' == 'Release-TensorRT'" />
53+
<PackageReference Include="OnnxStack.ImageUpscaler" Version="0.14.0" Condition=" '$(Configuration)' == 'Release' OR '$(Configuration)' == 'Release-Cuda' OR '$(Configuration)' == 'Release-TensorRT'" />
54+
<ProjectReference Include="..\OnnxStack.StableDiffusion\OnnxStack.StableDiffusion.csproj" Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Debug-Cuda' OR '$(Configuration)' == 'Debug-TensorRT'" />
55+
<ProjectReference Include="..\OnnxStack.ImageUpscaler\OnnxStack.ImageUpscaler.csproj" Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Debug-Cuda' OR '$(Configuration)' == 'Debug-TensorRT'" />
6056
</ItemGroup>
6157

6258
<ItemGroup>
63-
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.16.3" Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Release' " />
59+
<PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.16.3" Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Release' " />
6460
<PackageReference Include="Microsoft.ML.OnnxRuntime.Gpu" Version="1.16.3" Condition=" '$(Configuration)' == 'Debug-TensorRT' OR '$(Configuration)' == 'Release-TensorRT'" />
6561
<PackageReference Include="Microsoft.ML.OnnxRuntime.Gpu" Version="1.16.3" Condition=" '$(Configuration)' == 'Debug-Cuda' OR '$(Configuration)' == 'Release-Cuda'" />
66-
<PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.16.3" Condition=" '$(Configuration)' == 'Debug-DirectML' OR '$(Configuration)' == 'Release-DirectML'" />
6762
</ItemGroup>
6863

6964
<ItemGroup>

‎OnnxStack.sln

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,92 +17,70 @@ Global
1717
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1818
Debug|Any CPU = Debug|Any CPU
1919
Debug-Cuda|Any CPU = Debug-Cuda|Any CPU
20-
Debug-DirectML|Any CPU = Debug-DirectML|Any CPU
2120
Debug-TensorRT|Any CPU = Debug-TensorRT|Any CPU
2221
Release|Any CPU = Release|Any CPU
2322
Release-Cuda|Any CPU = Release-Cuda|Any CPU
24-
Release-DirectML|Any CPU = Release-DirectML|Any CPU
2523
Release-TensorRT|Any CPU = Release-TensorRT|Any CPU
2624
EndGlobalSection
2725
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2826
{02404CEB-207F-4D19-894C-11D51394F1D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2927
{02404CEB-207F-4D19-894C-11D51394F1D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
3028
{02404CEB-207F-4D19-894C-11D51394F1D5}.Debug-Cuda|Any CPU.ActiveCfg = Debug|Any CPU
3129
{02404CEB-207F-4D19-894C-11D51394F1D5}.Debug-Cuda|Any CPU.Build.0 = Debug|Any CPU
32-
{02404CEB-207F-4D19-894C-11D51394F1D5}.Debug-DirectML|Any CPU.ActiveCfg = Debug|Any CPU
33-
{02404CEB-207F-4D19-894C-11D51394F1D5}.Debug-DirectML|Any CPU.Build.0 = Debug|Any CPU
3430
{02404CEB-207F-4D19-894C-11D51394F1D5}.Debug-TensorRT|Any CPU.ActiveCfg = Debug|Any CPU
3531
{02404CEB-207F-4D19-894C-11D51394F1D5}.Debug-TensorRT|Any CPU.Build.0 = Debug|Any CPU
3632
{02404CEB-207F-4D19-894C-11D51394F1D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
3733
{02404CEB-207F-4D19-894C-11D51394F1D5}.Release|Any CPU.Build.0 = Release|Any CPU
3834
{02404CEB-207F-4D19-894C-11D51394F1D5}.Release-Cuda|Any CPU.ActiveCfg = Release|Any CPU
3935
{02404CEB-207F-4D19-894C-11D51394F1D5}.Release-Cuda|Any CPU.Build.0 = Release|Any CPU
40-
{02404CEB-207F-4D19-894C-11D51394F1D5}.Release-DirectML|Any CPU.ActiveCfg = Release|Any CPU
41-
{02404CEB-207F-4D19-894C-11D51394F1D5}.Release-DirectML|Any CPU.Build.0 = Release|Any CPU
4236
{02404CEB-207F-4D19-894C-11D51394F1D5}.Release-TensorRT|Any CPU.ActiveCfg = Release|Any CPU
4337
{02404CEB-207F-4D19-894C-11D51394F1D5}.Release-TensorRT|Any CPU.Build.0 = Release|Any CPU
4438
{EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4539
{EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Debug|Any CPU.Build.0 = Debug|Any CPU
4640
{EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Debug-Cuda|Any CPU.ActiveCfg = Debug|Any CPU
4741
{EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Debug-Cuda|Any CPU.Build.0 = Debug|Any CPU
48-
{EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Debug-DirectML|Any CPU.ActiveCfg = Debug|Any CPU
49-
{EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Debug-DirectML|Any CPU.Build.0 = Debug|Any CPU
5042
{EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Debug-TensorRT|Any CPU.ActiveCfg = Debug|Any CPU
5143
{EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Debug-TensorRT|Any CPU.Build.0 = Debug|Any CPU
5244
{EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Release|Any CPU.ActiveCfg = Release|Any CPU
5345
{EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Release|Any CPU.Build.0 = Release|Any CPU
5446
{EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Release-Cuda|Any CPU.ActiveCfg = Release|Any CPU
5547
{EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Release-Cuda|Any CPU.Build.0 = Release|Any CPU
56-
{EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Release-DirectML|Any CPU.ActiveCfg = Release|Any CPU
57-
{EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Release-DirectML|Any CPU.Build.0 = Release|Any CPU
5848
{EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Release-TensorRT|Any CPU.ActiveCfg = Release|Any CPU
5949
{EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Release-TensorRT|Any CPU.Build.0 = Release|Any CPU
60-
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Debug|Any CPU.ActiveCfg = Debug-DirectML|Any CPU
61-
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Debug|Any CPU.Build.0 = Debug-DirectML|Any CPU
50+
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
51+
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Debug|Any CPU.Build.0 = Debug|Any CPU
6252
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Debug-Cuda|Any CPU.ActiveCfg = Debug-Cuda|Any CPU
6353
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Debug-Cuda|Any CPU.Build.0 = Debug-Cuda|Any CPU
64-
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Debug-DirectML|Any CPU.ActiveCfg = Debug-DirectML|Any CPU
65-
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Debug-DirectML|Any CPU.Build.0 = Debug-DirectML|Any CPU
6654
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Debug-TensorRT|Any CPU.ActiveCfg = Debug-TensorRT|Any CPU
6755
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Debug-TensorRT|Any CPU.Build.0 = Debug-TensorRT|Any CPU
6856
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Release|Any CPU.ActiveCfg = Release|Any CPU
6957
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Release|Any CPU.Build.0 = Release|Any CPU
70-
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Release-Cuda|Any CPU.ActiveCfg = Release|Any CPU
71-
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Release-Cuda|Any CPU.Build.0 = Release|Any CPU
72-
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Release-DirectML|Any CPU.ActiveCfg = Release|Any CPU
73-
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Release-DirectML|Any CPU.Build.0 = Release|Any CPU
74-
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Release-TensorRT|Any CPU.ActiveCfg = Release|Any CPU
75-
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Release-TensorRT|Any CPU.Build.0 = Release|Any CPU
58+
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Release-Cuda|Any CPU.ActiveCfg = Release-Cuda|Any CPU
59+
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Release-Cuda|Any CPU.Build.0 = Release-Cuda|Any CPU
60+
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Release-TensorRT|Any CPU.ActiveCfg = Release-TensorRT|Any CPU
61+
{46A43C80-A440-4461-B7EB-81FA998FB24B}.Release-TensorRT|Any CPU.Build.0 = Release-TensorRT|Any CPU
7662
{85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7763
{85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Debug|Any CPU.Build.0 = Debug|Any CPU
7864
{85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Debug-Cuda|Any CPU.ActiveCfg = Debug-Cuda|Any CPU
7965
{85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Debug-Cuda|Any CPU.Build.0 = Debug-Cuda|Any CPU
80-
{85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Debug-DirectML|Any CPU.ActiveCfg = Debug-DirectML|Any CPU
81-
{85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Debug-DirectML|Any CPU.Build.0 = Debug-DirectML|Any CPU
8266
{85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Debug-TensorRT|Any CPU.ActiveCfg = Debug-TensorRT|Any CPU
8367
{85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Debug-TensorRT|Any CPU.Build.0 = Debug-TensorRT|Any CPU
8468
{85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Release|Any CPU.ActiveCfg = Release|Any CPU
8569
{85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Release|Any CPU.Build.0 = Release|Any CPU
8670
{85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Release-Cuda|Any CPU.ActiveCfg = Release-Cuda|Any CPU
8771
{85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Release-Cuda|Any CPU.Build.0 = Release-Cuda|Any CPU
88-
{85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Release-DirectML|Any CPU.ActiveCfg = Release-DirectML|Any CPU
89-
{85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Release-DirectML|Any CPU.Build.0 = Release-DirectML|Any CPU
9072
{85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Release-TensorRT|Any CPU.ActiveCfg = Release-TensorRT|Any CPU
9173
{85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Release-TensorRT|Any CPU.Build.0 = Release-TensorRT|Any CPU
9274
{A33D08BF-7881-4910-8439-5AE46646C1DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9375
{A33D08BF-7881-4910-8439-5AE46646C1DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
9476
{A33D08BF-7881-4910-8439-5AE46646C1DD}.Debug-Cuda|Any CPU.ActiveCfg = Debug|Any CPU
9577
{A33D08BF-7881-4910-8439-5AE46646C1DD}.Debug-Cuda|Any CPU.Build.0 = Debug|Any CPU
96-
{A33D08BF-7881-4910-8439-5AE46646C1DD}.Debug-DirectML|Any CPU.ActiveCfg = Debug|Any CPU
97-
{A33D08BF-7881-4910-8439-5AE46646C1DD}.Debug-DirectML|Any CPU.Build.0 = Debug|Any CPU
9878
{A33D08BF-7881-4910-8439-5AE46646C1DD}.Debug-TensorRT|Any CPU.ActiveCfg = Debug|Any CPU
9979
{A33D08BF-7881-4910-8439-5AE46646C1DD}.Debug-TensorRT|Any CPU.Build.0 = Debug|Any CPU
10080
{A33D08BF-7881-4910-8439-5AE46646C1DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
10181
{A33D08BF-7881-4910-8439-5AE46646C1DD}.Release|Any CPU.Build.0 = Release|Any CPU
10282
{A33D08BF-7881-4910-8439-5AE46646C1DD}.Release-Cuda|Any CPU.ActiveCfg = Release|Any CPU
10383
{A33D08BF-7881-4910-8439-5AE46646C1DD}.Release-Cuda|Any CPU.Build.0 = Release|Any CPU
104-
{A33D08BF-7881-4910-8439-5AE46646C1DD}.Release-DirectML|Any CPU.ActiveCfg = Release|Any CPU
105-
{A33D08BF-7881-4910-8439-5AE46646C1DD}.Release-DirectML|Any CPU.Build.0 = Release|Any CPU
10684
{A33D08BF-7881-4910-8439-5AE46646C1DD}.Release-TensorRT|Any CPU.ActiveCfg = Release|Any CPU
10785
{A33D08BF-7881-4910-8439-5AE46646C1DD}.Release-TensorRT|Any CPU.Build.0 = Release|Any CPU
10886
EndGlobalSection

0 commit comments

Comments
 (0)