Merge branch 'v2.9.0'

codeproject · Dec 1, 2024 · 28eb4fe · 28eb4fe
2 parents d99790a + 3fce07d
commit 28eb4fe
Show file tree

Hide file tree

Showing 75 changed files with 836 additions and 620 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,6 +3,7 @@
 ###############################################################################
 * text=auto
 *.sh text eol=lf
+*.bat text eol=crlf
 
 ###############################################################################
 # Set default behavior for command prompt diff.

diff --git a/.vscode/launch.docker.json b/.vscode/launch.docker.json
@@ -93,7 +93,8 @@
             },
             "name": "ALPR",
             "type": "python",
-            "python": "/app/modules/ALPR/bin/linux/python38/venv/bin/python",
+            // "python": "/app/modules/ALPR/bin/ubuntu/python38/venv/bin/python",
+            "python": "/app/modules/ALPR/bin/debian/python38/venv/bin/python",
             "request": "launch",
             "program": "ALPR_adapter.py",
             "console": "integratedTerminal",

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -233,7 +233,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build-yolo-net",
-            "program": "${workspaceFolder}/modules/ObjectDetectionYOLOv5Net/bin/Debug/9.0/ObjectDetectionYOLOv5Net",
+            "program": "${workspaceFolder}/modules/ObjectDetectionYOLOv5Net/bin/Debug/net9.0/ObjectDetectionYOLOv5Net.exe",
             "linux": {
                 "program": "${workspaceFolder}/modules/ObjectDetectionYOLOv5Net/bin/Debug/net9.0/ObjectDetectionYOLOv5Net.dll",
             },
@@ -259,12 +259,13 @@
             },
             "name": "Object Detect YOLOv5 6.2",
             "type": "debugpy",
-            "python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
+            "python": "${workspaceFolder}/runtimes/bin/windows/python37/venv/Scripts/python",
             "windows": {
                 "python": "${workspaceFolder}/runtimes/bin/windows/python37/venv/Scripts/python"
             },
             "linux": {
-                "python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
+                "python": "${workspaceFolder}/runtimes/bin/ubuntu/python38/venv/bin/python",
+                // "python": "${workspaceFolder}/runtimes/bin/debian/python38/venv/bin/python",
             },
             "osx": {
                 "python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
@@ -335,7 +336,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build-parsejson",
-            "program": "${workspaceFolder}/utils/ParseJSON/bin/Debug/9.0/ParseJSON",
+            "program": "${workspaceFolder}/utils/ParseJSON/bin/Debug/net9.0/ParseJSON",
             "linux": {
                 "program": "${workspaceFolder}/utils/ParseJSON/bin/Debug/net9.0/ParseJSON.dll",
             },
@@ -416,7 +417,7 @@
             "program": "object-detect.exe",
             "args": [ "run" ],
             "cwd": "${workspaceFolder}/src/demos/clients/Rust/object-detect/target/debug",
-            "preLaunchTask": "build-deno-rust",
+            "preLaunchTask": "build-demo-rust",
             "stopOnEntry": false,
             "env": {
             },
@@ -501,7 +502,8 @@
                 "python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python.exe"
             },
             "linux": {
-                "python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
+                "python": "${workspaceFolder}/runtimes/bin/ubuntu/python38/venv/bin/python",
+                // "python": "${workspaceFolder}/runtimes/bin/debian/python38/venv/bin/python",
             },
             "osx": {
                 "python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
@@ -528,12 +530,13 @@
 
             "name": "Python Simple Module",
             "type": "debugpy",
-            "python": "${workspaceFolder}/runtimes/bin/linux/python39/venv/bin/python",
+            "python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python",
             "windows": {
                 "python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python"
             },
             "linux": {
-                "python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
+                "python": "${workspaceFolder}/runtimes/bin/ubuntu/python38/venv/bin/python",
+                // "python": "${workspaceFolder}/runtimes/bin/debian/python38/venv/bin/python",
             },
             "osx": {
                 "python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
@@ -563,12 +566,13 @@
 
             "name": "Python Long Process Module",
             "type": "debugpy",
-            "python": "${workspaceFolder}/runtimes/bin/linux/python39/venv/bin/python",
+            "python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python",
             "windows": {
                 "python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python"
             },
             "linux": {
-                "python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
+                "python": "${workspaceFolder}/runtimes/bin/ubuntu/python38/venv/bin/python",
+                // "python": "${workspaceFolder}/runtimes/bin/debian/python38/venv/bin/python",
             },
             "osx": {
                 "python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
@@ -596,7 +600,7 @@
             "name": ".NET Simple Module",
             "type": "coreclr",
             "request": "launch",
-            "preLaunchTask": "build-demo-net",
+            "preLaunchTask": "demo_module_dotnetsimple",
             "program": "${workspaceFolder}/src/demos/modules/DotNetSimple/bin/Debug/net9.0/DotNetSimple",
             "linux": {
                 "program": "${workspaceFolder}/src/demos/modules/DotNetSimple/bin/Debug/net9.0/DotNetSimple.dll",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -26,12 +26,14 @@
         "colour",
         "colourised",
         "colours",
+        "computecap",
         "Consolas",
         "consoleloggerparameters",
         "CPAI",
         "createallsubdirs",
         "Crockford",
         "Cuda",
+        "cuDNN",
         "CUDNN",
         "Darkmode",
         "Denoising",
@@ -61,6 +63,9 @@
         "fouo",
         "generalise",
         "getframe",
+        "giga",
+        "gigaunit",
+        "gpuname",
         "HKCU",
         "HKLM",
         "hostbuilder",
@@ -82,18 +87,28 @@
         "Jetson",
         "keypair",
         "keypoints",
+        "kilounit",
         "labelledby",
         "Lanczos",
         "licence",
         "LOCALAPPDATA",
         "logicaldisk",
         "logvals",
+        "lproj",
         "maxs",
+        "megas",
+        "megaunit",
         "membuffer",
+        "memfree",
+        "memsize",
+        "memtotal",
         "memused",
         "millidegree",
+        "moduleid",
         "modulesettings",
         "nbsp",
+        "NETBIOS",
+        "noheader",
         "norestart",
         "normalises",
         "noscroll",
@@ -109,8 +124,10 @@
         "paddleocr",
         "parsejson",
         "peasy",
+        "physmem",
         "platenumber",
         "pluralise",
+        "PMIC",
         "popd",
         "postinst",
         "postprocess",
@@ -139,6 +156,7 @@
         "reqtype",
         "reso",
         "RKNN",
+        "Rockchip",
         "rocm",
         "rocminfo",
         "runhidden",
@@ -160,6 +178,9 @@
         "Tegra",
         "tegrastats",
         "tempstore",
+        "tera",
+        "teras",
+        "teraunit",
         "textreader",
         "tflite",
         "topbanner",
@@ -172,7 +193,10 @@
         "upsampling",
         "usebackq",
         "userid",
+        "usermem",
+        "utilisation",
         "utilise",
+        "vcgencmd",
         "venv",
         "vggish",
         "waitretry",

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -26,6 +26,19 @@
             }
         },
 
+        {
+            "label": "build-modules", 
+            "group": "build",
+            "dependsOrder": "sequence",
+            "dependsOn": [
+                "build-yolo-net",
+                "build-portraitfilter",
+                "build-sentimentanalysis",
+                "build-demo_module_dotnetlongprocess",
+                "demo_module_dotnetsimple"
+            ]
+        },
+
         // Build individual projects ===============================================================
 
         {
@@ -96,7 +109,8 @@
                 "build",
                 "${workspaceFolder}/modules/ObjectDetectionYOLOv5Net",
                 "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
+                "/consoleloggerparameters:NoSummary",
+                "--configuration", "Debug"
             ],
             "problemMatcher": "$msCompile"
         },   
@@ -116,7 +130,7 @@
         },   
 
         {
-            "label": "build-demo-net",      // Builds ONLY the demo .NET analysis module
+            "label": "demo_module_dotnetsimple",      // Builds ONLY the demo .NET analysis module
             "type": "process",
             "group": "build",
             "command": "dotnet",
@@ -154,7 +168,7 @@
         },
 
         {
-            "label": "build-deno-rust",
+            "label": "build-demo-rust",
             "type": "shell",
             "command": "cd \"${workspaceFolder}\\src\\demos\\clients\\Rust\\object-detect\" & cargo build",
             "group": {
@@ -166,7 +180,7 @@
         },
 
         {
-            "label": "run-deno-rust",
+            "label": "run-demo-rust",
             "type": "shell",
             "command": "cd \"${workspaceFolder}\\src\\demos\\clients\\Rust\\object-detect\" & cargo run",
             "group": {
@@ -184,7 +198,7 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "${workspaceFolder}/../CodeProject.AI-Modules/PortraitFilter",
+                "${workspaceFolder}/../CodeProject.AI-Modules/CodeProject.AI-PortraitFilter",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -198,7 +212,7 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "${workspaceFolder}/../CodeProject.AI-Modules/SentimentAnalysis",
+                "${workspaceFolder}/../CodeProject.AI-Modules/CodeProject.AI-SentimentAnalysis",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],

diff --git a/README.md b/README.md
@@ -129,8 +129,8 @@ The current release provides support for CPU on each platform, DirectML on Windo
 
  - [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
  - [Setting up the development environment](https://codeproject.github.io/codeproject.ai/devguide/install_dev.html) (spoiler: it's easy!)
- - [Running in Docker](https://codeproject.github.io/codeproject.ai/why/running_in_docker.html)
- - Setup or install issues? See [Common Errors](https://codeproject.github.io/codeproject.ai/devguide/common_errors.html)
+ - [Running in Docker](https://codeproject.github.io/codeproject.ai/install/running_in_docker.html)
+ - Setup or install issues? See the [FAQs](https://codeproject.github.io/codeproject.ai/faq/index.html)
 
 I'll add this to the docs:
 

diff --git a/devops/install/clean.sh b/devops/install/clean.sh
@@ -11,6 +11,9 @@ useColor=true
 doDebug=false
 lineWidth=70
 
+ bash ../utils/stop_all.sh
+
+
 # List of modules we'll look after =======================++====================
 
 dotNetModules=( "ObjectDetectionYOLOv5Net"  )
@@ -369,11 +372,6 @@ if [ "$cleanBuild" = true ]; then
         rm "${rootDir}/src/demos/modules/${dirName}/${dirName}-*"
     done
 
-    cleanSubDirs "${rootDir}/Installers/Windows" "bin/Debug/"
-    cleanSubDirs "${rootDir}/Installers/Windows" "bin/Release/"
-    cleanSubDirs "${rootDir}/Installers/Windows" "obj/Debug/"
-    cleanSubDirs "${rootDir}/Installers/Windows" "obj/Release/"
-
     removeDir "${rootDir}/utils/ParseJSON/bin"
     removeDir "${rootDir}/utils/ParseJSON/obj"
     rm "${rootDir}/utils/ParseJSON/ParseJSON.deps.json"
@@ -424,20 +422,20 @@ if [ "$cleanInstallCurrentOS" = true ]; then
     writeLine 
 
     # Clean shared python venvs
-    removeDir "${rootDir}/runtimes/bin/${os}/"
+    removeDir "${rootDir}/runtimes/bin/${platform_dir}/"
 
     # Clean module python venvs
     for dirName in "${pythonModules[@]}"
     do
-        removeDir "${rootDir}/modules/${dirName}/bin/${os}/"
+        removeDir "${rootDir}/modules/${dirName}/bin/${platform_dir}/"
     done
     for dirName in "${pythonExternalModules[@]}"
     do
-        removeDir "${externalModulesDir}/${dirName}/bin/${os}/"
+        removeDir "${externalModulesDir}/${dirName}/bin/${platform_dir}/"
     done
     for dirName in "${pythonDemoModules[@]}"
     do
-        removeDir "${rootDir}/src/demos/modules/${dirName}/bin/${os}/"
+        removeDir "${rootDir}/src/demos/modules/${dirName}/bin/${platform_dir}/"
     done
 fi
 
@@ -472,20 +470,20 @@ if [ "$cleanLibraries" = true ]; then
     writeLine 
 
     # Clean shared python venvs
-    delPattern "${rootDir}/runtimes/bin/${os}/python*/venv/lib/python*/site-packages/*"
+    delPattern "${rootDir}/runtimes/bin/${platform_dir}/python*/venv/lib/python*/site-packages/*"
 
     # Clean module python venvs
     for dirName in "${pythonModules[@]}"
     do
-        delPattern "${rootDir}/modules/${dirName}/bin/${os}/python*/venv/lib/python*/site-packages/*"
+        delPattern "${rootDir}/modules/${dirName}/bin/${platform_dir}/python*/venv/lib/python*/site-packages/*"
     done
     for dirName in "${pythonExternalModules[@]}"
     do
-        delPattern "${externalModulesDir}/${dirName}/bin/${os}/python*/venv/lib/python*/site-packages/*"
+        delPattern "${externalModulesDir}/${dirName}/bin/${platform_dir}/python*/venv/lib/python*/site-packages/*"
     done
     for dirName in "${pythonDemoModules[@]}"
     do
-        delPattern "${rootDir}/src/demos/modules/${dirName}/bin/${os}/python*/venv/lib/python*/site-packages/*"
+        delPattern "${rootDir}/src/demos/modules/${dirName}/bin/${platform_dir}/python*/venv/lib/python*/site-packages/*"
     done
 fi