Skip to content

Commit

Permalink
Updated to v2.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisMaunder committed Sep 27, 2023
1 parent 31ad131 commit 382027b
Show file tree
Hide file tree
Showing 343 changed files with 7,051 additions and 4,719 deletions.
120 changes: 65 additions & 55 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-server",
"postDebugTask": "stop-all",
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server",
// "postDebugTask": "stop-all",
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server",
"linux": {
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server.dll",
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server.dll",
},
"args": [],
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
"cwd": "${workspaceFolder}/src/server/",
"stopAtEntry": false,
"requireExactSource": false,
"serverReadyAction": {
Expand All @@ -37,18 +37,35 @@
"group": "3 Server"
},

"name": "Build Server only",
"name": "Build Server Debug",

"type": "python",
"code":"#", // dummy command
"code": "#", // dummy command
"console": "internalConsole",
"request": "launch",
"preLaunchTask": "build-server",
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
"cwd": "${workspaceFolder}/src/server/",
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
{
"presentation": {
"group": "3 Server"
},

"name": "Build Server Release",

"type": "python",
"code": "#", // dummy command
"console": "internalConsole",
"request": "launch",
"preLaunchTask": "build-server-release",
"cwd": "${workspaceFolder}/src/server/",
"env": {
"ASPNETCORE_ENVIRONMENT": "Production"
}
},

// Build x64 --------------------------------------------------------------

Expand All @@ -60,13 +77,13 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-all",
"postDebugTask": "stop-all",
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server",
// "postDebugTask": "stop-all",
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server",
"linux": {
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server.dll",
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server.dll",
},
"args": [],
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
"cwd": "${workspaceFolder}/src/server/",
"stopAtEntry": false,
"requireExactSource": false,
"serverReadyAction": {
Expand Down Expand Up @@ -104,7 +121,7 @@
// "args": [ "--version" ], // dummy command

"preLaunchTask": "build-all",
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
"cwd": "${workspaceFolder}/src/server/",
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
Expand All @@ -121,13 +138,13 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-all-arm64",
"postDebugTask": "stop-all",
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server",
// "postDebugTask": "stop-all",
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server",
"linux": {
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server.dll",
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server.dll",
},
"args": [],
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
"cwd": "${workspaceFolder}/src/server/",
"stopAtEntry": false,
"requireExactSource": false,
"serverReadyAction": {
Expand Down Expand Up @@ -164,7 +181,7 @@
// "args": [ "--version" ], // dummy command

"preLaunchTask": "build-all-arm64",
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
"cwd": "${workspaceFolder}/src/server/",
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
Expand All @@ -181,12 +198,12 @@
"name": "Launch Server",
"type": "coreclr",
"request": "launch",
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server",
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server",
"linux": {
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server.dll",
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server.dll",
},
"args": [],
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
"cwd": "${workspaceFolder}/src/server/",
"stopAtEntry": false,
"requireExactSource": false,
"serverReadyAction": {
Expand Down Expand Up @@ -235,14 +252,14 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-server",
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server.exe",
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server.exe",
"linux": {
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server.dll",
"program": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server.dll",
},
"args": [
"--ModuleOptions:LaunchModules=false"
],
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/",
"cwd": "${workspaceFolder}/src/server/bin/Debug/net7.0/",
"stopAtEntry": false,
"serverReadyAction": {
"action": "openExternally",
Expand Down Expand Up @@ -332,7 +349,8 @@
"env": {
"DEBUG_IN_VSCODE": "True",
"RUNNING_IN_VSCODE": "True",
"CPAI_PORT": "32168"
"CPAI_PORT": "32168",
"U2NET_HOME": "${workspaceFolder}/src/modules/BackgroundRemover/models"
},
"windows": {
"python": "${workspaceFolder}/src/modules/BackgroundRemover/bin/windows/python39/venv/Scripts/python.exe",
Expand Down Expand Up @@ -494,37 +512,6 @@
}
},

{
"presentation": {
"group": "5 Launch Individual",
"hidden": false
},
"name": "Object Detect TFLite",
"type": "python",
"request": "launch",
"python": "${workspaceFolder}/src/modules/ObjectDetectionTFLite/bin/windows/python39/venv/Scripts/python.exe",
"program": "objectdetection_tflite_adapter.py",
"cwd": "${workspaceFolder}/src/modules/ObjectDetectionTFLite",
"console": "integratedTerminal",
"justMyCode": false,
"env": {
"DEBUG_IN_VSCODE": "True",
"RUNNING_IN_VSCODE": "True",
"CPAI_PORT": "32168",
"CPAI_MODULE_QUEUENAME": "objectdetection_queue",
"MODEL_SIZE": "tiny"
},
"windows": {
"python": "${workspaceFolder}/src/modules/ObjectDetectionTFLite/bin/windows/python39/venv/Scripts/python.exe",
},
"linux": {
"python": "${workspaceFolder}/src/modules/ObjectDetectionTFLite/bin/linux/python39/venv/bin/python",
},
"osx": {
"python": "${workspaceFolder}/src/modules/ObjectDetectionTFLite/bin/macos/python39/venv/bin/python",
}
},

{
"presentation": {
"group": "5 Launch Individual",
Expand Down Expand Up @@ -615,6 +602,29 @@
*/
},

{
"presentation": {
"group": "5 Launch Individual",
"hidden": false
},
"name": "Portrait Filter",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-portraitfilter",
"program": "${workspaceFolder}/src/modules/PortraitFilter/bin/Debug/net7.0/PortraitFilter",
"args": [],
"cwd": "${workspaceFolder}/src/modules/PortraitFilter",
"stopAtEntry": false,
"console": "internalConsole",
"requireExactSource": false,
"justMyCode": false,
"env": {
"ASPNETCORE_ENVIRONMENT": "Development",
"RUNNING_IN_VSCODE": "true",
"DOTNET_NOLOGO": "true"
}
},

{
"presentation": {
"group": "5 Launch Individual",
Expand Down
51 changes: 42 additions & 9 deletions .vscode/tasks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependsOn": [
"build-server",
"build-analysisservices",
"build-tests"
"build-tests"
],
"windows": {
"dependsOn": [
Expand All @@ -28,7 +28,7 @@
"dependsOn": [
"build-server",
"build-analysisservices-arm64",
"build-tests"
"build-tests"
],
"windows": {
"dependsOn": [
Expand All @@ -47,7 +47,7 @@
"dependsOn": [
"build-yolo-net",
"build-portraitfilter",
"build-sentimentanalysis",
"build-sentimentanalysis"
]
},

Expand All @@ -71,12 +71,28 @@
"command": "dotnet",
"args": [
"build",
"${workspaceFolder}/src/API/Server/FrontEnd",
"${workspaceFolder}/src/server",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},

{
"label": "build-server-release", // Builds ONLY the API server, and not any backend analsysis or explorer apps
"type": "process",
"group": "build",
"command": "dotnet",
"args": [
"build",
"${workspaceFolder}/src/server",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary",
"-c",
"Release"
],
"problemMatcher": "$msCompile"
},

{
"label": "build-yolo-net", // Builds ONLY the Yolo .NET analysis module
Expand Down Expand Up @@ -153,7 +169,7 @@
{
"label": "launch-server-win", // Builds all projects then launches the front end API server
"group": "none",
"command": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net7.0/CodeProject.AI.Server.exe",
"command": "${workspaceFolder}/src/server/bin/Debug/net7.0/CodeProject.AI.Server.exe",
"dependsOrder": "sequence",
"dependsOn": [
"build-all-win"
Expand All @@ -166,7 +182,7 @@
// Windows form apps only work in Windows
"command": "${workspaceFolder}/demos/dotNet/CodeProject.AI.Explorer/bin/Debug/net7.0-windows/win-x64/",
"args": [],
"type": "process",
"type": "process"
},

{
Expand All @@ -191,7 +207,7 @@
"type": "process",
"args": [
"publish",
"${workspaceFolder}/src/API/Server/FrontEnd/Frontend.csproj",
"${workspaceFolder}/src/server/server.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
Expand All @@ -206,11 +222,28 @@
"args": [
"watch",
"run",
"${workspaceFolder}/src/API/Server/FrontEnd/Frontend.csproj",
"${workspaceFolder}/src/server/server.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
}
},

{
"label": "Inno Setup: Compile Script",
"type": "process",
"command": "C:\\Program Files (x86)\\Inno Setup 6\\ISCC.exe",
"args": [
"${file}"
],
"presentation": {
"reveal": "always",
"echo": false
},
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
Loading

0 comments on commit 382027b

Please sign in to comment.