v2.4.8: Mesh and module renaming

Author: ChrisMaunder

.gitignore

@@ -311,13 +311,25 @@ MigrationBackup/
 
 /src/server/installconfig.json
 
+# The compiled form of the ParseJSON utility. We move the compiled files to its base dir it for convenience
+/src/SDK/Utilities/ParseJSON/ParseJSON
+/src/SDK/Utilities/ParseJSON/ParseJSON.exe
+/src/SDK/Utilities/ParseJSON/ParseJSON.deps.json
+/src/SDK/Utilities/ParseJSON/ParseJSON.dll
+/src/SDK/Utilities/ParseJSON/ParseJSON.runtimeconfig.json
+/src/SDK/Utilities/ParseJSON/ParseJSON.xml
+
 # keep the folder structure but don't git commit the cached downloads
 !/src/downloads
 /src/downloads/*
 !/src/downloads/modules
 /src/downloads/modules/*
 !/src/downloads/modules/readme.txt
 
+# Generated exe packages
+/src/modules/ObjectDetectionYOLOv5Net/ObjectDetectionYOLOv5Net-*-[0-9].[0-9].zip
+/src/modules/ObjectDetectionYOLOv5Net/ObjectDetectionYOLOv5Net-*-[0-9].[0-9].[0-9].zip
+
 # Downloaded assets for modules
 /src/modules/ALPR/paddleocr
 /src/modules/ALPR/plate.png
@@ -331,37 +343,26 @@ MigrationBackup/
 /src/modules/ObjectDetectionCoral/assets
 src/modules/ObjectDetectionCoral/edgetpu_runtime
 src/modules/ObjectDetectionCoral/libedgetpu.*
-/src/modules/ObjectDetectionNet/assets/
-/src/modules/ObjectDetectionNet/custom-models
-/src/modules/ObjectDetectionNet/LocalNugets
 src/modules/ObjectDetectionYoloRKNN/assets
 src/modules/ObjectDetectionYoloRKNN/custom-models
-/src/modules/ObjectDetectionYolo/assets
-/src/modules/ObjectDetectionYolo/custom-models
+/src/modules/ObjectDetectionYOLOv5Net/assets/
+/src/modules/ObjectDetectionYOLOv5Net/custom-models
+/src/modules/ObjectDetectionYOLOv5Net/LocalNugets
+/src/modules/ObjectDetectionYOLOv5-3.1/custom-models
+/src/modules/ObjectDetectionYOLOv5-3.1/assets
+/src/modules/ObjectDetectionYOLOv5-6.2/assets
+/src/modules/ObjectDetectionYOLOv5-6.2/custom-models
+/src/modules/ObjectDetectionYOLOv8/assets
+/src/modules/ObjectDetectionYOLOv8/custom-models
+/src/modules/ObjectDetectionYOLOv8/torchvision/
+/src/modules/ObjectDetectionYOLOv8/ultralytics/
 /src/modules/OCR/paddleocr
 /src/modules/PortraitFilter/runtimeconfig.template.Designer.cs
 /src/modules/SceneClassifier/assets
-/src/modules/TrainingYoloV5/assets
-/src/modules/TrainingYoloV5/datasets
-/src/modules/TrainingYoloV5/fiftyone
-/src/modules/TrainingYoloV5/training
-/src/modules/TrainingYoloV5/train
-/src/modules/TrainingYoloV5/zoo
-/src/modules/YOLOv5-3.1/custom-models
-/src/modules/YOLOv5-3.1/assets
-/src/modules/YOLOv5-3.1/windows_packages_cpu
-/src/modules/YOLOv5-3.1/windows_packages_gpu
-
-# Generated exe packages
-/src/modules/ObjectDetectionNet/ObjectDetectionNet-*-[0-9].[0-9].zip
-/src/modules/ObjectDetectionNet/ObjectDetectionNet-*-[0-9].[0-9].[0-9].zip
-/src/modules/ObjectDetectionYolo/ObjectDetectionYolo-[0-9].[0-9].zip
-/src/modules/ObjectDetectionYolo/ObjectDetectionYolo-[0-9].[0-9].[0-9].zip
-
-# The compiled form of the ParseJSON utility. We move it for convenience
-/src/SDK/Utilities/ParseJSON/ParseJSON
-/src/SDK/Utilities/ParseJSON/ParseJSON.exe
-src/SDK/Utilities/ParseJSON/ParseJSON.deps.json
-src/SDK/Utilities/ParseJSON/ParseJSON.dll
-src/SDK/Utilities/ParseJSON/ParseJSON.runtimeconfig.json
-src/SDK/Utilities/ParseJSON/ParseJSON.xml
+/src/modules/SoundClassifierTF/data/
+/src/modules/TrainingObjectDetectionYOLOv5/assets
+/src/modules/TrainingObjectDetectionYOLOv5/datasets
+/src/modules/TrainingObjectDetectionYOLOv5/fiftyone
+/src/modules/TrainingObjectDetectionYOLOv5/training
+/src/modules/TrainingObjectDetectionYOLOv5/train
+/src/modules/TrainingObjectDetectionYOLOv5/zoo

.vscode/launch.docker.json

@@ -151,9 +151,9 @@
             "name": "Object Detect .NET",
             "type": "coreclr",
             "request": "launch",
-            "program": "/app/preinstalled-modules/ObjectDetectionNet/ObjectDetectionNet.dll",
+            "program": "/app/preinstalled-modules/ObjectDetectionYOLOv5Net/ObjectDetectionYOLOv5Net.dll",
             "args": [],
-            "cwd": "/app/modules/ObjectDetectionNet",
+            "cwd": "/app/preinstalled-modules/ObjectDetectionYOLOv5Net",
             "stopAtEntry": false,
             "console": "internalConsole",
             "requireExactSource": false,
@@ -166,6 +166,29 @@
             }
         },
 
+        {
+            "presentation": {
+                "group": "5 Launch Individual",
+                "hidden": false
+            },
+            "name": "Object Detect Coral",
+            "type": "python",
+            "python": "/app/modules/ObjectDetectionCoral/bin/linux/python39/venv/bin/python",
+            "request": "launch",
+            "program": "objectdetection_coral_adapter.py",
+            // "args": [ "--selftest" ],
+            "console": "integratedTerminal",
+            "cwd": "/app/modules/ObjectDetectionCoral",
+            "justMyCode": false,
+            "env": {
+                "DEBUG_IN_VSCODE": "True",
+                "RUNNING_IN_VSCODE": "True",
+                "CPAI_PORT": "32168",
+                "CPAI_MODULE_QUEUENAME": "objectdetection_queue"
+            }
+        },
+
+
         {
             "presentation": {
                 "group": "5 Launch Individual",
@@ -177,7 +200,7 @@
             "request": "launch",
             "program": "detect_adapter.py",
             "console": "integratedTerminal",
-            "cwd": "/app/preinstalled-modules/ObjectDetectionYolo",
+            "cwd": "/app/preinstalled-modules/ObjectDetectionYOLOv5-6.2",
             "justMyCode": false,
             "env": {
                 "DEBUG_IN_VSCODE": "True",
@@ -194,11 +217,11 @@
             },
             "name": "Object Detect YOLO 3.1",
             "type": "python",
-            "python": "/app/modules/YOLOv5-3.1/bin/linux/python38/venv/bin/python",
+            "python": "/app/modules/ObjectDetectionYOLOv5-3.1/bin/linux/python38/venv/bin/python",
             "request": "launch",
-            "program": "yolo_adapter.py",
+            "program": "detect_adapter.py",
             "console": "integratedTerminal",
-            "cwd": "/app/modules/YOLOv5-3.1",
+            "cwd": "/app/modules/ObjectDetectionYOLOv5-3.1",
             "justMyCode": false,
             "env": {
                 "DEBUG_IN_VSCODE": "True",