Skip to content

Commit 45d6d14

Browse files
ChrisMaunderChrisMaunder
committed
Merge branch 'v2.9.0'
2 parents 08c8e4c + d2cd97c commit 45d6d14

31 files changed

+318
-156
lines changed

‎.vscode/launch.docker.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@
9393
},
9494
"name": "ALPR",
9595
"type": "python",
96-
// "python": "/app/modules/ALPR/bin/ubuntu/python38/venv/bin/python",
97-
"python": "/app/modules/ALPR/bin/debian/python38/venv/bin/python",
96+
"python": "/app/modules/ALPR/bin/ubuntu/python38/venv/bin/python",
97+
// "python": "/app/modules/ALPR/bin/debian/python38/venv/bin/python",
9898
"request": "launch",
9999
"program": "ALPR_adapter.py",
100100
"console": "integratedTerminal",

‎.vscode/settings.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
"logicaldisk",
9696
"logvals",
9797
"lproj",
98+
"Matplotlib",
9899
"maxs",
99100
"megas",
100101
"megaunit",
@@ -133,6 +134,7 @@
133134
"postprocess",
134135
"prerm",
135136
"pstree",
137+
"psutil",
136138
"pushd",
137139
"pycoral",
138140
"pypi",
@@ -175,6 +177,7 @@
175177
"statuseseses",
176178
"subshell",
177179
"Systemmd",
180+
"TDQM",
178181
"Tegra",
179182
"tegrastats",
180183
"tempstore",
@@ -188,6 +191,7 @@
188191
"totalspacebytes",
189192
"tpus",
190193
"ufeff",
194+
"Ultralytics",
191195
"unclip",
192196
"uninstallexe",
193197
"upsampling",

‎devops/build/create_packages.bat‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ set useJq=false
2323
:: This saves time to allow for quick packaging of the easier, non-compiled modules
2424
set includeDotNet=true
2525

26+
:: Sometimes we want to skip this one because it's long and painful
27+
set includeObjectDetectionNet=true
28+
2629
:: Width of lines
2730
set lineWidth=70
2831

@@ -215,15 +218,34 @@ REM Creates a package for a module
215218

216219
if exist "!packageModuleDirPath!\package.bat" (
217220

221+
set isDotNet=false
222+
223+
if /i "!packageModuleId!" == "ObjectDetectionYOLOv5Net" set isDotNet=true
224+
if /i "!packageModuleId!" == "PortraitFilter" set isDotNet=true
225+
if /i "!packageModuleId!" == "SentimentAnalysis" set isDotNet=true
226+
218227
set doPackage=true
219228

220-
if "!includeDotNet!" == "false" if /i "!packageModuleId!" == "ObjectDetectionYOLOv5Net" set doPackage=false
221-
if "!includeDotNet!" == "false" if /i "!packageModuleId!" == "PortraitFilter" set doPackage=false
222-
if "!includeDotNet!" == "false" if /i "!packageModuleId!" == "SentimentAnalysis" set doPackage=false
229+
if "!isDotNet!" == "true" (
230+
if "!includeDotNet!" == "true" (
231+
if "!includeObjectDetectionNet!" == "false" if /i "!packageModuleId!" == "ObjectDetectionYOLOv5Net" (
232+
set doPackage=false
233+
call "!utilsScript!" WriteLine "Skipping Object Detection .NET module !packageModuleId!..." "Gray"
234+
)
235+
if "!doPackage!" == "true" (
236+
echo. >NUL
237+
REM Modules' package.bat will do the building. No need to do it here.
238+
REM pushd !packageModuleDirPath!
239+
REM dotnet build -c Release
240+
REM popd
241+
)
242+
) else (
243+
set doPackage=false
244+
call "!utilsScript!" WriteLine "Skipping packaging .NET module !packageModuleId!..." "Gray"
245+
)
246+
)
223247

224-
if "!doPackage!" == "false" (
225-
call "!utilsScript!" WriteLine "Skipping packaging .NET module !packageModuleId!..." "Gray"
226-
) else (
248+
if "!doPackage!" == "true" (
227249
REM Read the version from the modulesettings.json file and then pass this
228250
REM version to the package.bat file.
229251
call "!utilsScript!" Write "Preparing !packageModuleId!..."

‎modules/ObjectDetectionYOLOv5-6.2/requirements.linux.txt‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,42 @@
11
#! Python3.7
22

3-
Pandas # Installing Pandas, a data analysis / data manipulation tool
4-
CoreMLTools # Installing CoreMLTools, for working with .mlmodel format models
5-
OpenCV-Python # Installing OpenCV, the Open source Computer Vision library
6-
Pillow<10.0.0 # Installing Pillow, a Python Image Library
7-
SciPy # Installing SciPy, a library for mathematics, science, and engineering
8-
PyYAML # Installing PyYAML, a library for reading configuration files
3+
opencv-python-headless==4.8.1.78 # Installing OpenCV (headless), the Open source Computer Vision library
4+
numpy==1.26.0 # Installing NumPy, a package for scientific computing
5+
matplotlib>=3.3.0 # Installing Matplotlib, the Python plotting package
6+
opencv-python>=4.6.0 # Installing OpenCV, the Open source Computer Vision library
7+
pillow>=7.1.2 # Installing Pillow, a Python Image Library
8+
pyyaml>=5.3.1 # Installing PyYAML, a library for reading configuration files
9+
requests>=2.23.0 # Installing Requests, the HTTP library
10+
scipy>=1.4.1 # Installing SciPy, a library for mathematics, science, and engineering
11+
tqdm>=4.64.0 # Installing TDQM, the Fast, Extensible Progress Meter
12+
pandas>=1.1.4 # Installing Pandas, a data analysis / data manipulation tool
13+
psutil # Installing psutil, a tool to check system utilization
14+
dill # Installing dill, for serializing and de-serializing Python objects
15+
py-cpuinfo # Installing py-cpuinfo to allow us to query CPU info
16+
ipython # Installing ipython, for interactive notebooks
917

1018
# PyTorch-DirectML not working for this module
1119
# torch-directml # Installing the PyTorch DirectML plugin
1220

13-
--extra-index-url https://download.pytorch.org/whl/cpu
14-
Torch # Installing Torch, for Tensor computation and Deep neural networks
15-
--extra-index-url https://download.pytorch.org/whl/cpu
16-
TorchVision # Installing TorchVision, for Computer Vision based AI
21+
# CPU specific Torch 1.8.0. Size ~531Mb
22+
-f https://download.pytorch.org/whl/cpu/torch_stable.html
23+
torch==1.8.0+cpu # Installing PyTorch, for Tensor computation and Deep neural networks
24+
-f https://download.pytorch.org/whl/cpu/torch_stable.html
25+
torchvision==0.9.0+cpu # Installing TorchVision, for Computer Vision based AI
1726

18-
# We'll lock down to Torch 1.X, CPU-only to play it safe
19-
#--extra-index-url https://download.pytorch.org/whl/cpu
20-
#torch==1.13.1+cpu `# Installing Torch, for Tensor computation and Deep neural networks
21-
#--extra-index-url https://download.pytorch.org/whl/cpu
22-
#torchvision==0.14.1+cpu `# Installing TorchVision, for Computer Vision based AI
27+
# CPU specific Torch 1.13.0. Size ~830Mb
28+
# --extra-index-url https://download.pytorch.org/whl/cpu
29+
# torch==1.13.0+cpu # Installing PyTorch, for Tensor computation and Deep neural networks
30+
# --extra-index-url https://download.pytorch.org/whl/cpu
31+
# torchvision==0.14.0+cpu # Installing TorchVision, for Computer Vision based AI
2332

24-
yolov5==6.2.3 # Installing Ultralytics YoloV5 package for object detection in images
33+
# Explicitly install ultralytics without optional dependencies (like CUDA).
34+
--no-deps
35+
yolov5==6.2.3 # Installing Ultralytics YoloV5 package for object detection in images
2536

26-
# We need this, but we don't need this.
27-
Seaborn # Installing Seaborn, a data visualization library based on matplotlib
37+
# CoreMLTools # Installing CoreMLTools, for working with .mlmodel format models
2838

29-
CodeProject-AI-SDK # Installing the CodeProject.AI SDK
39+
40+
CodeProject-AI-SDK # Installing the CodeProject.AI SDK
3041

3142
# last line empty.

‎modules/ObjectDetectionYOLOv5Net/ObjectDetectionYOLOv5Net.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,16 @@
8686
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.16.3" Condition="'$(GpuType)'=='CPU'" />
8787
<PackageReference Include="Microsoft.ML.OnnxRuntime.Gpu" Version="1.19.2" Condition="'$(GpuType)'=='CUDA'" />
8888
<PackageReference Include="Microsoft.ML.OnnxRuntime.OpenVino" Version="1.13.1-dev-20221026-1209-861125ccb" Condition="'$(GpuType)'=='OpenVINO'" />
89-
<PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.19.2" Condition="'$(GpuType)'=='DirectML'" />
89+
<PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.20.1" Condition="'$(GpuType)'=='DirectML'" />
9090
<PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.16.3" Condition="'$(GpuType)'=='MPS'" />
9191

9292
<!-- https://github.com/microsoft/onnxruntime/issues/12677#issuecomment-1443802719 -->
93-
<PackageReference Include="Microsoft.AI.DirectML" Version="1.15.2" Condition="'$(GpuType)'=='DirectML'" />
93+
<PackageReference Include="Microsoft.AI.DirectML" Version="1.15.4" Condition="'$(GpuType)'=='DirectML'" />
9494

9595
<PackageReference Include="SkiaSharp" Version="2.88.8" />
96-
<PackageReference Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'" Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
97-
<PackageReference Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'" Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
96+
97+
<PackageReference Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'" Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
98+
<PackageReference Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'" Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
9899
</ItemGroup>
99100

100101
<!-- Output the settings based on what we've determined above -->

‎modules/ObjectDetectionYOLOv5Net/install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fi
4848
getFromServer "models/" "yolonet-models.zip" "assets" "Downloading YOLO ONNX models..."
4949
getFromServer "models/" "yolonet-custom-models.zip" "custom-models" "Downloading Custom YOLO ONNX models..."
5050

51-
# Install ONNX runtime
51+
# Install ONNX runtime in macOS
5252
if [ "$os" = "macos" ]; then
5353
if [ "${verbosity}" = "quiet" ]; then
5454

‎modules/ObjectDetectionYOLOv5Net/modulesettings.development.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
"ObjectDetectionYOLOv5Net": {
55
"LaunchSettings": {
6-
"FilePath": "bin\\Debug\\net9.0\\ObjectDetectionYOLOv5Net.dll"
6+
"FilePath": "bin/Debug/net9.0/ObjectDetectionYOLOv5Net.dll"
77
}
88
}
99
}

‎modules/ObjectDetectionYOLOv5Net/modulesettings.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
"ObjectDetectionYOLOv5Net": {
55
"Name": "Object Detection (YOLOv5 .NET)",
6-
"Version": "1.13.0",
6+
"Version": "1.14.0",
77

88
"PublishingInfo" : {
99
"Description": "Provides Object Detection using YOLOv5 ONNX models with DirectML. This module is best for those on Windows and Linux without CUDA enabled GPUs",
@@ -71,7 +71,8 @@
7171
{ "ModuleVersion": "1.10.2", "ServerVersionRange": [ "2.6.5", "2.7.0" ], "ReleaseDate": "2024-02-26", "ReleaseNotes": "Corrections for backwards compatibility for 2.6.5" },
7272
{ "ModuleVersion": "1.11.0", "ServerVersionRange": [ "2.8.0", "2.9.0" ], "ReleaseDate": "2024-08-02", "ReleaseNotes": "Updated for server 2.8" },
7373
{ "ModuleVersion": "1.12.0", "ServerVersionRange": [ "2.9.1", "2.9.1" ], "ReleaseDate": "2024-11-17", "ReleaseNotes": "Updated to .NET 9" },
74-
{ "ModuleVersion": "1.13.0", "ServerVersionRange": [ "2.9.2", "" ], "ReleaseDate": "2024-11-24", "ReleaseNotes": "Updated to reflect updated CodeProject.AI SDK" }
74+
{ "ModuleVersion": "1.13.0", "ServerVersionRange": [ "2.9.2", "2.9.3" ], "ReleaseDate": "2024-11-24", "ReleaseNotes": "Updated to reflect updated CodeProject.AI SDK" },
75+
{ "ModuleVersion": "1.14.0", "ServerVersionRange": [ "2.9.4", "" ], "ReleaseDate": "2024-12-03", "ReleaseNotes": "Bumped .NET dependencies to 9.0" }
7576
]
7677
},
7778

‎modules/ObjectDetectionYOLOv5Net/modulesettings.windows.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
"ObjectDetectionYOLOv5Net": {
55
"LaunchSettings": {
6-
"FilePath": "bin\\ObjectDetectionYOLOv5Net.exe"
6+
"FilePath": "bin/ObjectDetectionYOLOv5Net.exe"
77
}
88
}
99
}

‎src/SDK/NET/NET.csproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,23 @@
3434
</PropertyGroup>
3535

3636
<ItemGroup Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'"> <!-- Mac Apple Silicon -->
37-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
38-
<PackageReference Include="System.Text.Json" Version="8.0.0" />
39-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
40-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
41-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
42-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
43-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
37+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0" />
38+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
39+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
40+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
41+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
42+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
43+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
4444
</ItemGroup>
4545

4646
<ItemGroup Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'"> <!-- Everything else -->
47-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
48-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
49-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
50-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
51-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
52-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
53-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
47+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0" />
48+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
49+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
50+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
51+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
52+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
53+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
5454
</ItemGroup>
5555

5656
<ItemGroup>
@@ -59,7 +59,7 @@
5959
<PackageReference Include="SkiaSharp" Version="2.88.8" />
6060
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.8" />
6161
<PackageReference Include="SkiaSharp.Views.Desktop.Common" Version="2.88.8" />
62-
<PackageReference Include="System.Management" Version="8.0.0" />
62+
<PackageReference Include="System.Management" Version="9.0.0" />
6363
</ItemGroup>
6464

6565
<ItemGroup>

0 commit comments

Comments
 (0)