diff --git a/OnnxStack.Console/OnnxStack.Console.csproj b/OnnxStack.Console/OnnxStack.Console.csproj index 0a8ab0c..32a815a 100644 --- a/OnnxStack.Console/OnnxStack.Console.csproj +++ b/OnnxStack.Console/OnnxStack.Console.csproj @@ -6,7 +6,7 @@ enable disable x64 - Debug;Release;Debug-Cuda;Debug-TensorRT;Release-Cuda;Release-TensorRT + Debug;Release;Debug-Nvidia;Release-Nvidia x64 @@ -16,18 +16,17 @@ - - - - - - + + + + + + - - + diff --git a/OnnxStack.Core/OnnxStack.Core.csproj b/OnnxStack.Core/OnnxStack.Core.csproj index 0ae92ed..e065df2 100644 --- a/OnnxStack.Core/OnnxStack.Core.csproj +++ b/OnnxStack.Core/OnnxStack.Core.csproj @@ -25,6 +25,7 @@ True True OnnxStack - 128x128.png + Debug;Release x64 diff --git a/OnnxStack.FeatureExtractor/OnnxStack.FeatureExtractor.csproj b/OnnxStack.FeatureExtractor/OnnxStack.FeatureExtractor.csproj index bded978..5b2a5c6 100644 --- a/OnnxStack.FeatureExtractor/OnnxStack.FeatureExtractor.csproj +++ b/OnnxStack.FeatureExtractor/OnnxStack.FeatureExtractor.csproj @@ -35,8 +35,8 @@ - - + + diff --git a/OnnxStack.ImageUpscaler/OnnxStack.ImageUpscaler.csproj b/OnnxStack.ImageUpscaler/OnnxStack.ImageUpscaler.csproj index f9feb9c..ec26b62 100644 --- a/OnnxStack.ImageUpscaler/OnnxStack.ImageUpscaler.csproj +++ b/OnnxStack.ImageUpscaler/OnnxStack.ImageUpscaler.csproj @@ -23,6 +23,7 @@ True True OnnxStack - 128x128.png + Debug;Release x64 @@ -34,8 +35,8 @@ - - + + diff --git a/OnnxStack.StableDiffusion/OnnxStack.StableDiffusion.csproj b/OnnxStack.StableDiffusion/OnnxStack.StableDiffusion.csproj index c86e565..ebd0959 100644 --- a/OnnxStack.StableDiffusion/OnnxStack.StableDiffusion.csproj +++ b/OnnxStack.StableDiffusion/OnnxStack.StableDiffusion.csproj @@ -25,7 +25,9 @@ True True OnnxStack - 128x128.png + Debug;Release x64 + Debug;Release @@ -44,8 +46,8 @@ - - + + diff --git a/OnnxStack.UI/Models/OnnxStackUIConfig.cs b/OnnxStack.UI/Models/OnnxStackUIConfig.cs index 8019032..9a73449 100644 --- a/OnnxStack.UI/Models/OnnxStackUIConfig.cs +++ b/OnnxStack.UI/Models/OnnxStackUIConfig.cs @@ -27,10 +27,8 @@ public class OnnxStackUIConfig : IConfigSection public ExecutionProvider GetSupportedExecutionProvider() { -#if DEBUG_CUDA || RELEASE_CUDA +#if DEBUG_NVIDIA || RELEASE_NVIDIA return ExecutionProvider.Cuda; -#elif DEBUG_TENSORRT || RELEASE_TENSORRT - return ExecutionProvider.TensorRT; #else return ExecutionProvider.DirectML; #endif diff --git a/OnnxStack.UI/OnnxStack.UI.csproj b/OnnxStack.UI/OnnxStack.UI.csproj index 5fce823..1a78c94 100644 --- a/OnnxStack.UI/OnnxStack.UI.csproj +++ b/OnnxStack.UI/OnnxStack.UI.csproj @@ -8,16 +8,12 @@ true true x64 - Debug;Release;Debug-Cuda;Debug-TensorRT;Release-Cuda;Release-TensorRT + Debug;Release;Debug-Nvidia;Release-Nvidia x64 True - - True - - - + True @@ -51,18 +47,17 @@ - - - - - - + + + + + + - - + diff --git a/OnnxStack.sln b/OnnxStack.sln index 00f7630..379223b 100644 --- a/OnnxStack.sln +++ b/OnnxStack.sln @@ -20,67 +20,67 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 - Debug-Cuda|x64 = Debug-Cuda|x64 + Debug-Nvidia|x64 = Debug-Nvidia|x64 Release|x64 = Release|x64 - Release-Cuda|x64 = Release-Cuda|x64 + Release-Nvidia|x64 = Release-Nvidia|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {02404CEB-207F-4D19-894C-11D51394F1D5}.Debug|x64.ActiveCfg = Debug|x64 {02404CEB-207F-4D19-894C-11D51394F1D5}.Debug|x64.Build.0 = Debug|x64 - {02404CEB-207F-4D19-894C-11D51394F1D5}.Debug-Cuda|x64.ActiveCfg = Debug|x64 - {02404CEB-207F-4D19-894C-11D51394F1D5}.Debug-Cuda|x64.Build.0 = Debug|x64 + {02404CEB-207F-4D19-894C-11D51394F1D5}.Debug-Nvidia|x64.ActiveCfg = Debug|x64 + {02404CEB-207F-4D19-894C-11D51394F1D5}.Debug-Nvidia|x64.Build.0 = Debug|x64 {02404CEB-207F-4D19-894C-11D51394F1D5}.Release|x64.ActiveCfg = Release|x64 {02404CEB-207F-4D19-894C-11D51394F1D5}.Release|x64.Build.0 = Release|x64 - {02404CEB-207F-4D19-894C-11D51394F1D5}.Release-Cuda|x64.ActiveCfg = Release|x64 - {02404CEB-207F-4D19-894C-11D51394F1D5}.Release-Cuda|x64.Build.0 = Release|x64 + {02404CEB-207F-4D19-894C-11D51394F1D5}.Release-Nvidia|x64.ActiveCfg = Release|x64 + {02404CEB-207F-4D19-894C-11D51394F1D5}.Release-Nvidia|x64.Build.0 = Release|x64 {EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Debug|x64.ActiveCfg = Debug|x64 {EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Debug|x64.Build.0 = Debug|x64 - {EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Debug-Cuda|x64.ActiveCfg = Debug|x64 - {EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Debug-Cuda|x64.Build.0 = Debug|x64 + {EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Debug-Nvidia|x64.ActiveCfg = Debug|x64 + {EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Debug-Nvidia|x64.Build.0 = Debug|x64 {EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Release|x64.ActiveCfg = Release|x64 {EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Release|x64.Build.0 = Release|x64 - {EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Release-Cuda|x64.ActiveCfg = Release|x64 - {EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Release-Cuda|x64.Build.0 = Release|x64 + {EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Release-Nvidia|x64.ActiveCfg = Release|x64 + {EA1F61D0-490B-42EC-96F5-7DCCAB94457A}.Release-Nvidia|x64.Build.0 = Release|x64 {46A43C80-A440-4461-B7EB-81FA998FB24B}.Debug|x64.ActiveCfg = Debug|x64 {46A43C80-A440-4461-B7EB-81FA998FB24B}.Debug|x64.Build.0 = Debug|x64 - {46A43C80-A440-4461-B7EB-81FA998FB24B}.Debug-Cuda|x64.ActiveCfg = Debug-Cuda|x64 - {46A43C80-A440-4461-B7EB-81FA998FB24B}.Debug-Cuda|x64.Build.0 = Debug-Cuda|x64 + {46A43C80-A440-4461-B7EB-81FA998FB24B}.Debug-Nvidia|x64.ActiveCfg = Debug-Nvidia|x64 + {46A43C80-A440-4461-B7EB-81FA998FB24B}.Debug-Nvidia|x64.Build.0 = Debug-Nvidia|x64 {46A43C80-A440-4461-B7EB-81FA998FB24B}.Release|x64.ActiveCfg = Release|x64 {46A43C80-A440-4461-B7EB-81FA998FB24B}.Release|x64.Build.0 = Release|x64 - {46A43C80-A440-4461-B7EB-81FA998FB24B}.Release-Cuda|x64.ActiveCfg = Release-Cuda|x64 - {46A43C80-A440-4461-B7EB-81FA998FB24B}.Release-Cuda|x64.Build.0 = Release-Cuda|x64 + {46A43C80-A440-4461-B7EB-81FA998FB24B}.Release-Nvidia|x64.ActiveCfg = Release-Nvidia|x64 + {46A43C80-A440-4461-B7EB-81FA998FB24B}.Release-Nvidia|x64.Build.0 = Release-Nvidia|x64 {85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Debug|x64.ActiveCfg = Debug|x64 {85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Debug|x64.Build.0 = Debug|x64 - {85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Debug-Cuda|x64.ActiveCfg = Debug-Cuda|x64 - {85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Debug-Cuda|x64.Build.0 = Debug-Cuda|x64 + {85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Debug-Nvidia|x64.ActiveCfg = Debug-Nvidia|x64 + {85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Debug-Nvidia|x64.Build.0 = Debug-Nvidia|x64 {85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Release|x64.ActiveCfg = Release|x64 {85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Release|x64.Build.0 = Release|x64 - {85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Release-Cuda|x64.ActiveCfg = Release-Cuda|x64 - {85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Release-Cuda|x64.Build.0 = Release-Cuda|x64 + {85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Release-Nvidia|x64.ActiveCfg = Release-Nvidia|x64 + {85BB1855-8C3B-4049-A2DD-1130FA6CD846}.Release-Nvidia|x64.Build.0 = Release-Nvidia|x64 {A33D08BF-7881-4910-8439-5AE46646C1DD}.Debug|x64.ActiveCfg = Debug|x64 {A33D08BF-7881-4910-8439-5AE46646C1DD}.Debug|x64.Build.0 = Debug|x64 - {A33D08BF-7881-4910-8439-5AE46646C1DD}.Debug-Cuda|x64.ActiveCfg = Debug|x64 - {A33D08BF-7881-4910-8439-5AE46646C1DD}.Debug-Cuda|x64.Build.0 = Debug|x64 + {A33D08BF-7881-4910-8439-5AE46646C1DD}.Debug-Nvidia|x64.ActiveCfg = Debug|x64 + {A33D08BF-7881-4910-8439-5AE46646C1DD}.Debug-Nvidia|x64.Build.0 = Debug|x64 {A33D08BF-7881-4910-8439-5AE46646C1DD}.Release|x64.ActiveCfg = Release|x64 {A33D08BF-7881-4910-8439-5AE46646C1DD}.Release|x64.Build.0 = Release|x64 - {A33D08BF-7881-4910-8439-5AE46646C1DD}.Release-Cuda|x64.ActiveCfg = Release|x64 - {A33D08BF-7881-4910-8439-5AE46646C1DD}.Release-Cuda|x64.Build.0 = Release|x64 + {A33D08BF-7881-4910-8439-5AE46646C1DD}.Release-Nvidia|x64.ActiveCfg = Release|x64 + {A33D08BF-7881-4910-8439-5AE46646C1DD}.Release-Nvidia|x64.Build.0 = Release|x64 {5A64FC26-6926-4A45-ACCE-1FE173166990}.Debug|x64.ActiveCfg = Debug|x64 {5A64FC26-6926-4A45-ACCE-1FE173166990}.Debug|x64.Build.0 = Debug|x64 - {5A64FC26-6926-4A45-ACCE-1FE173166990}.Debug-Cuda|x64.ActiveCfg = Debug|x64 - {5A64FC26-6926-4A45-ACCE-1FE173166990}.Debug-Cuda|x64.Build.0 = Debug|x64 + {5A64FC26-6926-4A45-ACCE-1FE173166990}.Debug-Nvidia|x64.ActiveCfg = Debug|x64 + {5A64FC26-6926-4A45-ACCE-1FE173166990}.Debug-Nvidia|x64.Build.0 = Debug|x64 {5A64FC26-6926-4A45-ACCE-1FE173166990}.Release|x64.ActiveCfg = Release|x64 {5A64FC26-6926-4A45-ACCE-1FE173166990}.Release|x64.Build.0 = Release|x64 - {5A64FC26-6926-4A45-ACCE-1FE173166990}.Release-Cuda|x64.ActiveCfg = Release|x64 - {5A64FC26-6926-4A45-ACCE-1FE173166990}.Release-Cuda|x64.Build.0 = Release|x64 + {5A64FC26-6926-4A45-ACCE-1FE173166990}.Release-Nvidia|x64.ActiveCfg = Release|x64 + {5A64FC26-6926-4A45-ACCE-1FE173166990}.Release-Nvidia|x64.Build.0 = Release|x64 {0E8095A4-83EF-48AD-9BD1-0CC2893050F6}.Debug|x64.ActiveCfg = Debug|x64 {0E8095A4-83EF-48AD-9BD1-0CC2893050F6}.Debug|x64.Build.0 = Debug|x64 - {0E8095A4-83EF-48AD-9BD1-0CC2893050F6}.Debug-Cuda|x64.ActiveCfg = Debug|x64 - {0E8095A4-83EF-48AD-9BD1-0CC2893050F6}.Debug-Cuda|x64.Build.0 = Debug|x64 + {0E8095A4-83EF-48AD-9BD1-0CC2893050F6}.Debug-Nvidia|x64.ActiveCfg = Debug|x64 + {0E8095A4-83EF-48AD-9BD1-0CC2893050F6}.Debug-Nvidia|x64.Build.0 = Debug|x64 {0E8095A4-83EF-48AD-9BD1-0CC2893050F6}.Release|x64.ActiveCfg = Release|x64 {0E8095A4-83EF-48AD-9BD1-0CC2893050F6}.Release|x64.Build.0 = Release|x64 - {0E8095A4-83EF-48AD-9BD1-0CC2893050F6}.Release-Cuda|x64.ActiveCfg = Release|x64 - {0E8095A4-83EF-48AD-9BD1-0CC2893050F6}.Release-Cuda|x64.Build.0 = Release|x64 + {0E8095A4-83EF-48AD-9BD1-0CC2893050F6}.Release-Nvidia|x64.ActiveCfg = Release|x64 + {0E8095A4-83EF-48AD-9BD1-0CC2893050F6}.Release-Nvidia|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE