Skip to content

Commit 28eb4fe

Browse files
author
Chris Maunder
committed
Merge branch 'v2.9.0'
2 parents d99790a + 3fce07d commit 28eb4fe

File tree

75 files changed

+836
-620
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+836
-620
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
###############################################################################
44
* text=auto
55
*.sh text eol=lf
6+
*.bat text eol=crlf
67

78
###############################################################################
89
# Set default behavior for command prompt diff.

‎.vscode/launch.docker.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@
9393
},
9494
"name": "ALPR",
9595
"type": "python",
96-
"python": "/app/modules/ALPR/bin/linux/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",
9798
"request": "launch",
9899
"program": "ALPR_adapter.py",
99100
"console": "integratedTerminal",

‎.vscode/launch.json

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
"type": "coreclr",
234234
"request": "launch",
235235
"preLaunchTask": "build-yolo-net",
236-
"program": "${workspaceFolder}/modules/ObjectDetectionYOLOv5Net/bin/Debug/9.0/ObjectDetectionYOLOv5Net",
236+
"program": "${workspaceFolder}/modules/ObjectDetectionYOLOv5Net/bin/Debug/net9.0/ObjectDetectionYOLOv5Net.exe",
237237
"linux": {
238238
"program": "${workspaceFolder}/modules/ObjectDetectionYOLOv5Net/bin/Debug/net9.0/ObjectDetectionYOLOv5Net.dll",
239239
},
@@ -259,12 +259,13 @@
259259
},
260260
"name": "Object Detect YOLOv5 6.2",
261261
"type": "debugpy",
262-
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
262+
"python": "${workspaceFolder}/runtimes/bin/windows/python37/venv/Scripts/python",
263263
"windows": {
264264
"python": "${workspaceFolder}/runtimes/bin/windows/python37/venv/Scripts/python"
265265
},
266266
"linux": {
267-
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
267+
"python": "${workspaceFolder}/runtimes/bin/ubuntu/python38/venv/bin/python",
268+
// "python": "${workspaceFolder}/runtimes/bin/debian/python38/venv/bin/python",
268269
},
269270
"osx": {
270271
"python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
@@ -335,7 +336,7 @@
335336
"type": "coreclr",
336337
"request": "launch",
337338
"preLaunchTask": "build-parsejson",
338-
"program": "${workspaceFolder}/utils/ParseJSON/bin/Debug/9.0/ParseJSON",
339+
"program": "${workspaceFolder}/utils/ParseJSON/bin/Debug/net9.0/ParseJSON",
339340
"linux": {
340341
"program": "${workspaceFolder}/utils/ParseJSON/bin/Debug/net9.0/ParseJSON.dll",
341342
},
@@ -416,7 +417,7 @@
416417
"program": "object-detect.exe",
417418
"args": [ "run" ],
418419
"cwd": "${workspaceFolder}/src/demos/clients/Rust/object-detect/target/debug",
419-
"preLaunchTask": "build-deno-rust",
420+
"preLaunchTask": "build-demo-rust",
420421
"stopOnEntry": false,
421422
"env": {
422423
},
@@ -501,7 +502,8 @@
501502
"python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python.exe"
502503
},
503504
"linux": {
504-
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
505+
"python": "${workspaceFolder}/runtimes/bin/ubuntu/python38/venv/bin/python",
506+
// "python": "${workspaceFolder}/runtimes/bin/debian/python38/venv/bin/python",
505507
},
506508
"osx": {
507509
"python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
@@ -528,12 +530,13 @@
528530

529531
"name": "Python Simple Module",
530532
"type": "debugpy",
531-
"python": "${workspaceFolder}/runtimes/bin/linux/python39/venv/bin/python",
533+
"python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python",
532534
"windows": {
533535
"python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python"
534536
},
535537
"linux": {
536-
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
538+
"python": "${workspaceFolder}/runtimes/bin/ubuntu/python38/venv/bin/python",
539+
// "python": "${workspaceFolder}/runtimes/bin/debian/python38/venv/bin/python",
537540
},
538541
"osx": {
539542
"python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
@@ -563,12 +566,13 @@
563566

564567
"name": "Python Long Process Module",
565568
"type": "debugpy",
566-
"python": "${workspaceFolder}/runtimes/bin/linux/python39/venv/bin/python",
569+
"python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python",
567570
"windows": {
568571
"python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python"
569572
},
570573
"linux": {
571-
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
574+
"python": "${workspaceFolder}/runtimes/bin/ubuntu/python38/venv/bin/python",
575+
// "python": "${workspaceFolder}/runtimes/bin/debian/python38/venv/bin/python",
572576
},
573577
"osx": {
574578
"python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
@@ -596,7 +600,7 @@
596600
"name": ".NET Simple Module",
597601
"type": "coreclr",
598602
"request": "launch",
599-
"preLaunchTask": "build-demo-net",
603+
"preLaunchTask": "demo_module_dotnetsimple",
600604
"program": "${workspaceFolder}/src/demos/modules/DotNetSimple/bin/Debug/net9.0/DotNetSimple",
601605
"linux": {
602606
"program": "${workspaceFolder}/src/demos/modules/DotNetSimple/bin/Debug/net9.0/DotNetSimple.dll",

‎.vscode/settings.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@
2626
"colour",
2727
"colourised",
2828
"colours",
29+
"computecap",
2930
"Consolas",
3031
"consoleloggerparameters",
3132
"CPAI",
3233
"createallsubdirs",
3334
"Crockford",
3435
"Cuda",
36+
"cuDNN",
3537
"CUDNN",
3638
"Darkmode",
3739
"Denoising",
@@ -61,6 +63,9 @@
6163
"fouo",
6264
"generalise",
6365
"getframe",
66+
"giga",
67+
"gigaunit",
68+
"gpuname",
6469
"HKCU",
6570
"HKLM",
6671
"hostbuilder",
@@ -82,18 +87,28 @@
8287
"Jetson",
8388
"keypair",
8489
"keypoints",
90+
"kilounit",
8591
"labelledby",
8692
"Lanczos",
8793
"licence",
8894
"LOCALAPPDATA",
8995
"logicaldisk",
9096
"logvals",
97+
"lproj",
9198
"maxs",
99+
"megas",
100+
"megaunit",
92101
"membuffer",
102+
"memfree",
103+
"memsize",
104+
"memtotal",
93105
"memused",
94106
"millidegree",
107+
"moduleid",
95108
"modulesettings",
96109
"nbsp",
110+
"NETBIOS",
111+
"noheader",
97112
"norestart",
98113
"normalises",
99114
"noscroll",
@@ -109,8 +124,10 @@
109124
"paddleocr",
110125
"parsejson",
111126
"peasy",
127+
"physmem",
112128
"platenumber",
113129
"pluralise",
130+
"PMIC",
114131
"popd",
115132
"postinst",
116133
"postprocess",
@@ -139,6 +156,7 @@
139156
"reqtype",
140157
"reso",
141158
"RKNN",
159+
"Rockchip",
142160
"rocm",
143161
"rocminfo",
144162
"runhidden",
@@ -160,6 +178,9 @@
160178
"Tegra",
161179
"tegrastats",
162180
"tempstore",
181+
"tera",
182+
"teras",
183+
"teraunit",
163184
"textreader",
164185
"tflite",
165186
"topbanner",
@@ -172,7 +193,10 @@
172193
"upsampling",
173194
"usebackq",
174195
"userid",
196+
"usermem",
197+
"utilisation",
175198
"utilise",
199+
"vcgencmd",
176200
"venv",
177201
"vggish",
178202
"waitretry",

‎.vscode/tasks.json

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,19 @@
2626
}
2727
},
2828

29+
{
30+
"label": "build-modules",
31+
"group": "build",
32+
"dependsOrder": "sequence",
33+
"dependsOn": [
34+
"build-yolo-net",
35+
"build-portraitfilter",
36+
"build-sentimentanalysis",
37+
"build-demo_module_dotnetlongprocess",
38+
"demo_module_dotnetsimple"
39+
]
40+
},
41+
2942
// Build individual projects ===============================================================
3043

3144
{
@@ -96,7 +109,8 @@
96109
"build",
97110
"${workspaceFolder}/modules/ObjectDetectionYOLOv5Net",
98111
"/property:GenerateFullPaths=true",
99-
"/consoleloggerparameters:NoSummary"
112+
"/consoleloggerparameters:NoSummary",
113+
"--configuration", "Debug"
100114
],
101115
"problemMatcher": "$msCompile"
102116
},
@@ -116,7 +130,7 @@
116130
},
117131

118132
{
119-
"label": "build-demo-net", // Builds ONLY the demo .NET analysis module
133+
"label": "demo_module_dotnetsimple", // Builds ONLY the demo .NET analysis module
120134
"type": "process",
121135
"group": "build",
122136
"command": "dotnet",
@@ -154,7 +168,7 @@
154168
},
155169

156170
{
157-
"label": "build-deno-rust",
171+
"label": "build-demo-rust",
158172
"type": "shell",
159173
"command": "cd \"${workspaceFolder}\\src\\demos\\clients\\Rust\\object-detect\" & cargo build",
160174
"group": {
@@ -166,7 +180,7 @@
166180
},
167181

168182
{
169-
"label": "run-deno-rust",
183+
"label": "run-demo-rust",
170184
"type": "shell",
171185
"command": "cd \"${workspaceFolder}\\src\\demos\\clients\\Rust\\object-detect\" & cargo run",
172186
"group": {
@@ -184,7 +198,7 @@
184198
"command": "dotnet",
185199
"args": [
186200
"build",
187-
"${workspaceFolder}/../CodeProject.AI-Modules/PortraitFilter",
201+
"${workspaceFolder}/../CodeProject.AI-Modules/CodeProject.AI-PortraitFilter",
188202
"/property:GenerateFullPaths=true",
189203
"/consoleloggerparameters:NoSummary"
190204
],
@@ -198,7 +212,7 @@
198212
"command": "dotnet",
199213
"args": [
200214
"build",
201-
"${workspaceFolder}/../CodeProject.AI-Modules/SentimentAnalysis",
215+
"${workspaceFolder}/../CodeProject.AI-Modules/CodeProject.AI-SentimentAnalysis",
202216
"/property:GenerateFullPaths=true",
203217
"/consoleloggerparameters:NoSummary"
204218
],

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ The current release provides support for CPU on each platform, DirectML on Windo
129129

130130
- [Installing CodeProject.AI on your machine](https://codeproject.github.io/codeproject.ai/why/install_on_windows.html). For those who have CodeProject.AI integrated with Home Assist or Blue Iris
131131
- [Setting up the development environment](https://codeproject.github.io/codeproject.ai/devguide/install_dev.html) (spoiler: it's easy!)
132-
- [Running in Docker](https://codeproject.github.io/codeproject.ai/why/running_in_docker.html)
133-
- Setup or install issues? See [Common Errors](https://codeproject.github.io/codeproject.ai/devguide/common_errors.html)
132+
- [Running in Docker](https://codeproject.github.io/codeproject.ai/install/running_in_docker.html)
133+
- Setup or install issues? See the [FAQs](https://codeproject.github.io/codeproject.ai/faq/index.html)
134134

135135
I'll add this to the docs:
136136

‎devops/install/clean.sh

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ useColor=true
1111
doDebug=false
1212
lineWidth=70
1313

14+
bash ../utils/stop_all.sh
15+
16+
1417
# List of modules we'll look after =======================++====================
1518

1619
dotNetModules=( "ObjectDetectionYOLOv5Net" )
@@ -369,11 +372,6 @@ if [ "$cleanBuild" = true ]; then
369372
rm "${rootDir}/src/demos/modules/${dirName}/${dirName}-*"
370373
done
371374

372-
cleanSubDirs "${rootDir}/Installers/Windows" "bin/Debug/"
373-
cleanSubDirs "${rootDir}/Installers/Windows" "bin/Release/"
374-
cleanSubDirs "${rootDir}/Installers/Windows" "obj/Debug/"
375-
cleanSubDirs "${rootDir}/Installers/Windows" "obj/Release/"
376-
377375
removeDir "${rootDir}/utils/ParseJSON/bin"
378376
removeDir "${rootDir}/utils/ParseJSON/obj"
379377
rm "${rootDir}/utils/ParseJSON/ParseJSON.deps.json"
@@ -424,20 +422,20 @@ if [ "$cleanInstallCurrentOS" = true ]; then
424422
writeLine
425423

426424
# Clean shared python venvs
427-
removeDir "${rootDir}/runtimes/bin/${os}/"
425+
removeDir "${rootDir}/runtimes/bin/${platform_dir}/"
428426

429427
# Clean module python venvs
430428
for dirName in "${pythonModules[@]}"
431429
do
432-
removeDir "${rootDir}/modules/${dirName}/bin/${os}/"
430+
removeDir "${rootDir}/modules/${dirName}/bin/${platform_dir}/"
433431
done
434432
for dirName in "${pythonExternalModules[@]}"
435433
do
436-
removeDir "${externalModulesDir}/${dirName}/bin/${os}/"
434+
removeDir "${externalModulesDir}/${dirName}/bin/${platform_dir}/"
437435
done
438436
for dirName in "${pythonDemoModules[@]}"
439437
do
440-
removeDir "${rootDir}/src/demos/modules/${dirName}/bin/${os}/"
438+
removeDir "${rootDir}/src/demos/modules/${dirName}/bin/${platform_dir}/"
441439
done
442440
fi
443441

@@ -472,20 +470,20 @@ if [ "$cleanLibraries" = true ]; then
472470
writeLine
473471

474472
# Clean shared python venvs
475-
delPattern "${rootDir}/runtimes/bin/${os}/python*/venv/lib/python*/site-packages/*"
473+
delPattern "${rootDir}/runtimes/bin/${platform_dir}/python*/venv/lib/python*/site-packages/*"
476474

477475
# Clean module python venvs
478476
for dirName in "${pythonModules[@]}"
479477
do
480-
delPattern "${rootDir}/modules/${dirName}/bin/${os}/python*/venv/lib/python*/site-packages/*"
478+
delPattern "${rootDir}/modules/${dirName}/bin/${platform_dir}/python*/venv/lib/python*/site-packages/*"
481479
done
482480
for dirName in "${pythonExternalModules[@]}"
483481
do
484-
delPattern "${externalModulesDir}/${dirName}/bin/${os}/python*/venv/lib/python*/site-packages/*"
482+
delPattern "${externalModulesDir}/${dirName}/bin/${platform_dir}/python*/venv/lib/python*/site-packages/*"
485483
done
486484
for dirName in "${pythonDemoModules[@]}"
487485
do
488-
delPattern "${rootDir}/src/demos/modules/${dirName}/bin/${os}/python*/venv/lib/python*/site-packages/*"
486+
delPattern "${rootDir}/src/demos/modules/${dirName}/bin/${platform_dir}/python*/venv/lib/python*/site-packages/*"
489487
done
490488
fi
491489

0 commit comments

Comments
 (0)