From c1a550bfef290e733a097855b0c039b929572ed0 Mon Sep 17 00:00:00 2001 From: Kiryuumaru Date: Wed, 27 Jan 2021 21:07:21 +0800 Subject: [PATCH 1/3] Updated DefaultYoloSystemValidator for latest Microsoft Visual C++ 2015-2019 Redistributable versions --- src/Alturos.Yolo/DefaultYoloSystemValidator.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Alturos.Yolo/DefaultYoloSystemValidator.cs b/src/Alturos.Yolo/DefaultYoloSystemValidator.cs index ef9198b..0477faa 100644 --- a/src/Alturos.Yolo/DefaultYoloSystemValidator.cs +++ b/src/Alturos.Yolo/DefaultYoloSystemValidator.cs @@ -62,7 +62,10 @@ private bool IsMicrosoftVisualCPlusPlus2017Available() { @"Installer\Dependencies\VC,redist.x64,amd64,14.23,bundle", "Microsoft Visual C++ 2015-2019 Redistributable (x64)" }, { @"Installer\Dependencies\VC,redist.x64,amd64,14.24,bundle", "Microsoft Visual C++ 2015-2019 Redistributable (x64)" }, { @"Installer\Dependencies\VC,redist.x64,amd64,14.25,bundle", "Microsoft Visual C++ 2015-2019 Redistributable (x64)" }, - { @"Installer\Dependencies\VC,redist.x64,amd64,14.26,bundle", "Microsoft Visual C++ 2015-2019 Redistributable (x64)" } + { @"Installer\Dependencies\VC,redist.x64,amd64,14.26,bundle", "Microsoft Visual C++ 2015-2019 Redistributable (x64)" }, + { @"Installer\Dependencies\VC,redist.x64,amd64,14.27,bundle", "Microsoft Visual C++ 2015-2019 Redistributable (x64)" }, + { @"Installer\Dependencies\VC,redist.x64,amd64,14.28,bundle", "Microsoft Visual C++ 2015-2019 Redistributable (x64)" }, + { @"Installer\Dependencies\VC,redist.x64,amd64,14.29,bundle", "Microsoft Visual C++ 2015-2019 Redistributable (x64)" } }; foreach (var checkKey in checkKeys) From 173989e993e0bc6993bd198bc56c591f391ad195 Mon Sep 17 00:00:00 2001 From: Kiryuumaru Date: Wed, 27 Jan 2021 21:58:03 +0800 Subject: [PATCH 2/3] Fixed NullPointerException in YoloWrapper if custom IYoloSystemValidator is supplied --- src/Alturos.Yolo/YoloWrapper.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Alturos.Yolo/YoloWrapper.cs b/src/Alturos.Yolo/YoloWrapper.cs index 7dc344f..c5d9f49 100644 --- a/src/Alturos.Yolo/YoloWrapper.cs +++ b/src/Alturos.Yolo/YoloWrapper.cs @@ -74,6 +74,10 @@ public YoloWrapper(YoloConfiguration yoloConfiguration, GpuConfig gpuConfig = nu { this._yoloSystemValidator = new DefaultYoloSystemValidator(); } + else + { + this._yoloSystemValidator = yoloSystemValidator; + } this.Initialize(yoloConfiguration.ConfigFile, yoloConfiguration.WeightsFile, yoloConfiguration.NamesFile, gpuConfig); } @@ -94,6 +98,10 @@ public YoloWrapper(string configurationFilename, string weightsFilename, string { this._yoloSystemValidator = new DefaultYoloSystemValidator(); } + else + { + this._yoloSystemValidator = yoloSystemValidator; + } this.Initialize(configurationFilename, weightsFilename, namesFilename, gpuConfig); } From 4e7dad91c9b3d49108f91e64ac5d287cbe0aef9d Mon Sep 17 00:00:00 2001 From: Kiryuumaru Date: Wed, 27 Jan 2021 22:57:42 +0800 Subject: [PATCH 3/3] Remove other build configurations except x64 --- .../Alturos.Yolo.TestConsole.csproj | 27 +++--- .../Alturos.Yolo.TestUI.csproj | 28 +++--- .../Alturos.Yolo.UnitTest.csproj | 28 +++--- .../Alturos.Yolo.WebService.csproj | 27 +++--- src/Alturos.Yolo.sln | 86 +++++-------------- src/Alturos.Yolo/Alturos.Yolo.csproj | 10 +++ 6 files changed, 87 insertions(+), 119 deletions(-) diff --git a/src/Alturos.Yolo.TestConsole/Alturos.Yolo.TestConsole.csproj b/src/Alturos.Yolo.TestConsole/Alturos.Yolo.TestConsole.csproj index 5cfbbee..e83d674 100644 --- a/src/Alturos.Yolo.TestConsole/Alturos.Yolo.TestConsole.csproj +++ b/src/Alturos.Yolo.TestConsole/Alturos.Yolo.TestConsole.csproj @@ -3,7 +3,7 @@ Debug - AnyCPU + x64 {C6A638E4-40ED-4F73-8F78-B9465FBE475D} Exe Alturos.Yolo.TestConsole @@ -14,24 +14,25 @@ - - x64 + true - full - false - bin\Debug\ + bin\x64\Debug\ DEBUG;TRACE + full + x64 + 7.3 prompt - 4 + true - - x64 - pdbonly - true - bin\Release\ + + bin\x64\Release\ TRACE + true + pdbonly + x64 + 7.3 prompt - 4 + true diff --git a/src/Alturos.Yolo.TestUI/Alturos.Yolo.TestUI.csproj b/src/Alturos.Yolo.TestUI/Alturos.Yolo.TestUI.csproj index 15d569f..96d1e99 100644 --- a/src/Alturos.Yolo.TestUI/Alturos.Yolo.TestUI.csproj +++ b/src/Alturos.Yolo.TestUI/Alturos.Yolo.TestUI.csproj @@ -3,7 +3,7 @@ Debug - AnyCPU + x64 {2923401A-6C84-455A-A6CC-A13A70E13D63} WinExe Alturos.Yolo.TestUI @@ -14,25 +14,25 @@ - - x64 + true - full - false - bin\Debug\ + bin\x64\Debug\ DEBUG;TRACE + full + x64 + 7.3 prompt - 4 - false + true - - x64 - pdbonly - true - bin\Release\ + + bin\x64\Release\ TRACE + true + pdbonly + x64 + 7.3 prompt - 4 + true diff --git a/src/Alturos.Yolo.UnitTest/Alturos.Yolo.UnitTest.csproj b/src/Alturos.Yolo.UnitTest/Alturos.Yolo.UnitTest.csproj index 13e5629..538f329 100644 --- a/src/Alturos.Yolo.UnitTest/Alturos.Yolo.UnitTest.csproj +++ b/src/Alturos.Yolo.UnitTest/Alturos.Yolo.UnitTest.csproj @@ -3,7 +3,7 @@ Debug - AnyCPU + x64 {850159D7-0908-41D8-A8BA-E0E44FC4DD36} Library Properties @@ -20,25 +20,25 @@ - + true - full - false - bin\Debug\ + bin\x64\Debug\ DEBUG;TRACE - prompt - 4 - x64 true + full + x64 + 7.3 + prompt - - pdbonly - true - bin\Release\ + + bin\x64\Release\ TRACE - prompt - 4 true + true + pdbonly + x64 + 7.3 + prompt diff --git a/src/Alturos.Yolo.WebService/Alturos.Yolo.WebService.csproj b/src/Alturos.Yolo.WebService/Alturos.Yolo.WebService.csproj index 23c901b..9cabfa6 100644 --- a/src/Alturos.Yolo.WebService/Alturos.Yolo.WebService.csproj +++ b/src/Alturos.Yolo.WebService/Alturos.Yolo.WebService.csproj @@ -3,7 +3,7 @@ Debug - AnyCPU + x64 {AC917731-93FA-414F-88F4-0D3298F1FDE3} Exe Alturos.Yolo.WebService @@ -15,24 +15,25 @@ - - x64 + true - full - false - bin\Debug\ + bin\x64\Debug\ DEBUG;TRACE + full + x64 + 7.3 prompt - 4 + true - - AnyCPU - pdbonly - true - bin\Release\ + + bin\x64\Release\ TRACE + true + pdbonly + x64 + 7.3 prompt - 4 + true diff --git a/src/Alturos.Yolo.sln b/src/Alturos.Yolo.sln index 8dcf4fb..ff4369b 100644 --- a/src/Alturos.Yolo.sln +++ b/src/Alturos.Yolo.sln @@ -11,78 +11,34 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alturos.Yolo.UnitTest", "Al EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alturos.Yolo.WebService", "Alturos.Yolo.WebService\Alturos.Yolo.WebService.csproj", "{AC917731-93FA-414F-88F4-0D3298F1FDE3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alturos.Yolo", "Alturos.Yolo\Alturos.Yolo.csproj", "{2C530266-A3DA-4175-8311-06E5A2378F22}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Alturos.Yolo", "Alturos.Yolo\Alturos.Yolo.csproj", "{2C530266-A3DA-4175-8311-06E5A2378F22}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2923401A-6C84-455A-A6CC-A13A70E13D63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2923401A-6C84-455A-A6CC-A13A70E13D63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2923401A-6C84-455A-A6CC-A13A70E13D63}.Debug|x64.ActiveCfg = Debug|Any CPU - {2923401A-6C84-455A-A6CC-A13A70E13D63}.Debug|x64.Build.0 = Debug|Any CPU - {2923401A-6C84-455A-A6CC-A13A70E13D63}.Debug|x86.ActiveCfg = Debug|Any CPU - {2923401A-6C84-455A-A6CC-A13A70E13D63}.Debug|x86.Build.0 = Debug|Any CPU - {2923401A-6C84-455A-A6CC-A13A70E13D63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2923401A-6C84-455A-A6CC-A13A70E13D63}.Release|Any CPU.Build.0 = Release|Any CPU - {2923401A-6C84-455A-A6CC-A13A70E13D63}.Release|x64.ActiveCfg = Release|Any CPU - {2923401A-6C84-455A-A6CC-A13A70E13D63}.Release|x64.Build.0 = Release|Any CPU - {2923401A-6C84-455A-A6CC-A13A70E13D63}.Release|x86.ActiveCfg = Release|Any CPU - {2923401A-6C84-455A-A6CC-A13A70E13D63}.Release|x86.Build.0 = Release|Any CPU - {C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Debug|x64.ActiveCfg = Debug|Any CPU - {C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Debug|x64.Build.0 = Debug|Any CPU - {C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Debug|x86.ActiveCfg = Debug|Any CPU - {C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Debug|x86.Build.0 = Debug|Any CPU - {C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Release|Any CPU.Build.0 = Release|Any CPU - {C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Release|x64.ActiveCfg = Release|Any CPU - {C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Release|x64.Build.0 = Release|Any CPU - {C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Release|x86.ActiveCfg = Release|Any CPU - {C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Release|x86.Build.0 = Release|Any CPU - {850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Debug|x64.ActiveCfg = Debug|Any CPU - {850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Debug|x64.Build.0 = Debug|Any CPU - {850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Debug|x86.ActiveCfg = Debug|Any CPU - {850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Debug|x86.Build.0 = Debug|Any CPU - {850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Release|Any CPU.Build.0 = Release|Any CPU - {850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Release|x64.ActiveCfg = Release|Any CPU - {850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Release|x64.Build.0 = Release|Any CPU - {850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Release|x86.ActiveCfg = Release|Any CPU - {850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Release|x86.Build.0 = Release|Any CPU - {AC917731-93FA-414F-88F4-0D3298F1FDE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC917731-93FA-414F-88F4-0D3298F1FDE3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC917731-93FA-414F-88F4-0D3298F1FDE3}.Debug|x64.ActiveCfg = Debug|Any CPU - {AC917731-93FA-414F-88F4-0D3298F1FDE3}.Debug|x64.Build.0 = Debug|Any CPU - {AC917731-93FA-414F-88F4-0D3298F1FDE3}.Debug|x86.ActiveCfg = Debug|Any CPU - {AC917731-93FA-414F-88F4-0D3298F1FDE3}.Debug|x86.Build.0 = Debug|Any CPU - {AC917731-93FA-414F-88F4-0D3298F1FDE3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC917731-93FA-414F-88F4-0D3298F1FDE3}.Release|Any CPU.Build.0 = Release|Any CPU - {AC917731-93FA-414F-88F4-0D3298F1FDE3}.Release|x64.ActiveCfg = Release|Any CPU - {AC917731-93FA-414F-88F4-0D3298F1FDE3}.Release|x64.Build.0 = Release|Any CPU - {AC917731-93FA-414F-88F4-0D3298F1FDE3}.Release|x86.ActiveCfg = Release|Any CPU - {AC917731-93FA-414F-88F4-0D3298F1FDE3}.Release|x86.Build.0 = Release|Any CPU - {2C530266-A3DA-4175-8311-06E5A2378F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C530266-A3DA-4175-8311-06E5A2378F22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C530266-A3DA-4175-8311-06E5A2378F22}.Debug|x64.ActiveCfg = Debug|Any CPU - {2C530266-A3DA-4175-8311-06E5A2378F22}.Debug|x64.Build.0 = Debug|Any CPU - {2C530266-A3DA-4175-8311-06E5A2378F22}.Debug|x86.ActiveCfg = Debug|Any CPU - {2C530266-A3DA-4175-8311-06E5A2378F22}.Debug|x86.Build.0 = Debug|Any CPU - {2C530266-A3DA-4175-8311-06E5A2378F22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C530266-A3DA-4175-8311-06E5A2378F22}.Release|Any CPU.Build.0 = Release|Any CPU - {2C530266-A3DA-4175-8311-06E5A2378F22}.Release|x64.ActiveCfg = Release|Any CPU - {2C530266-A3DA-4175-8311-06E5A2378F22}.Release|x64.Build.0 = Release|Any CPU - {2C530266-A3DA-4175-8311-06E5A2378F22}.Release|x86.ActiveCfg = Release|Any CPU - {2C530266-A3DA-4175-8311-06E5A2378F22}.Release|x86.Build.0 = Release|Any CPU + {2923401A-6C84-455A-A6CC-A13A70E13D63}.Debug|x64.ActiveCfg = Debug|x64 + {2923401A-6C84-455A-A6CC-A13A70E13D63}.Debug|x64.Build.0 = Debug|x64 + {2923401A-6C84-455A-A6CC-A13A70E13D63}.Release|x64.ActiveCfg = Release|x64 + {2923401A-6C84-455A-A6CC-A13A70E13D63}.Release|x64.Build.0 = Release|x64 + {C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Debug|x64.ActiveCfg = Debug|x64 + {C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Debug|x64.Build.0 = Debug|x64 + {C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Release|x64.ActiveCfg = Release|x64 + {C6A638E4-40ED-4F73-8F78-B9465FBE475D}.Release|x64.Build.0 = Release|x64 + {850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Debug|x64.ActiveCfg = Debug|x64 + {850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Debug|x64.Build.0 = Debug|x64 + {850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Release|x64.ActiveCfg = Release|x64 + {850159D7-0908-41D8-A8BA-E0E44FC4DD36}.Release|x64.Build.0 = Release|x64 + {AC917731-93FA-414F-88F4-0D3298F1FDE3}.Debug|x64.ActiveCfg = Debug|x64 + {AC917731-93FA-414F-88F4-0D3298F1FDE3}.Debug|x64.Build.0 = Debug|x64 + {AC917731-93FA-414F-88F4-0D3298F1FDE3}.Release|x64.ActiveCfg = Release|x64 + {AC917731-93FA-414F-88F4-0D3298F1FDE3}.Release|x64.Build.0 = Release|x64 + {2C530266-A3DA-4175-8311-06E5A2378F22}.Debug|x64.ActiveCfg = Debug|x64 + {2C530266-A3DA-4175-8311-06E5A2378F22}.Debug|x64.Build.0 = Debug|x64 + {2C530266-A3DA-4175-8311-06E5A2378F22}.Release|x64.ActiveCfg = Release|x64 + {2C530266-A3DA-4175-8311-06E5A2378F22}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Alturos.Yolo/Alturos.Yolo.csproj b/src/Alturos.Yolo/Alturos.Yolo.csproj index 118256f..82498ed 100644 --- a/src/Alturos.Yolo/Alturos.Yolo.csproj +++ b/src/Alturos.Yolo/Alturos.Yolo.csproj @@ -16,6 +16,16 @@ 3.0.6-alpha 3.0.6 3.0.6 + x64 + + + + x64 + DEBUG;TRACE + + + + x64