Skip to content

Commit

Permalink
Updated to 1.6.0.0: Settings API to toggle GPU and start/stop, improv…
Browse files Browse the repository at this point in the history 
…ed RAM use, async logging, M1 support
  • Loading branch information
@ChrisMaunder
ChrisMaunder committed Sep 22, 2022
1 parent 0feac80 commit 1f21692
Show file tree
Hide file tree
Showing 200 changed files with 4,204 additions and 2,216 deletions.
85 changes: 68 additions & 17 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,36 @@
"configurations": [

{
"name": "Build All",
"name": "Launch Server",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-all-win",
"linux": {
"preLaunchTask": "build-all-linux",
},
"osx": {
"preLaunchTask": "build-all-linux",
},
"program": "dotnet",
"args": [
"--version"
],
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/CodeProject.AI.Server",
"args": [],
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
"stopAtEntry": false,
"requireExactSource": false,
"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)",
"uriFormat": "http://localhost:%s/swagger"
},

"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"RUNNING_IN_VSCODE": "true"
}
/*
"logging": {
"engineLogging": false,
"moduleLoad": false,
"exceptions": false,
"browserStdOut": false
}
*/
},

{
"name": "Launch Server",
"name": "Build & Launch Server",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-all-win",
Expand All @@ -39,6 +46,7 @@
"args": [],
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
"stopAtEntry": false,
"requireExactSource": false,
"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)",
Expand All @@ -59,6 +67,28 @@
*/
},

{
"name": "Build All",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-all-win",
"linux": {
"preLaunchTask": "build-all-linux",
},
"osx": {
"preLaunchTask": "build-all-linux",
},
"program": "dotnet",
"args": [
"--version"
],
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
"stopAtEntry": false,
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},

{
"name": "Launch Server & Modules separately",
"type": "coreclr",
Expand Down Expand Up @@ -112,13 +142,34 @@
// See https://code.visualstudio.com/docs/editor/variables-reference#_settings-command-variables-and-input-variables
// For variables that can be used
{
"name": "Python: Current File",
"name": "Python 3.7/3.8: Current File",
"type": "python",
"python": "${workspaceFolder}/src/AnalysisLayer/bin/windows/python37/venv/bin/python",
"request": "launch",
"program": "${file}",
"console": "integratedTerminal",
"cwd": "${fileDirname}",
"justMyCode": true
"justMyCode": true,
"env": {
"DEBUG_IN_VSCODE": "True",
"RUNNING_IN_VSCODE": "True",
"CPAI_PORT": "32168"
},
"osx": {
"python": "${workspaceFolder}/src/AnalysisLayer/bin/macos-arm/python38/venv/bin/python",
// "env": { "CPAI_PORT": "32168" }
}
},
{
"name": "Python: Attach via ProcessID",
"type": "python",
"request": "attach",
"processId": "${command:pickProcess}",
"justMyCode": true,
"env": {
"DEBUG_IN_VSCODE": "True",
"RUNNING_IN_VSCODE": "True"
}
}
]
}
25 changes: 13 additions & 12 deletions CodeProject.AI.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDK", "SDK", "{FF0C329F-41E8-4540-BCDB-97690911077D}"
ProjectSection(SolutionItems) = preProject
src\AnalysisLayer\SDK\install.bat = src\AnalysisLayer\SDK\install.bat
src\AnalysisLayer\SDK\install.sh = src\AnalysisLayer\SDK\install.sh
src\AnalysisLayer\SDK\install.dev.bat = src\AnalysisLayer\SDK\install.dev.bat
src\AnalysisLayer\SDK\install.dev.sh = src\AnalysisLayer\SDK\install.dev.sh
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ModelRunners", "ModelRunners", "{55C41D48-17AC-4ED5-9440-B42AF65CCE4E}"
Expand All @@ -92,8 +92,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dev", "Dev", "{00BBF52C-217
ProjectSection(SolutionItems) = preProject
Installers\Dev\clean.bat = Installers\Dev\clean.bat
Installers\Dev\clean.sh = Installers\Dev\clean.sh
Installers\Dev\setup_dev_env_linux.sh = Installers\Dev\setup_dev_env_linux.sh
Installers\Dev\setup_dev_env_win.bat = Installers\Dev\setup_dev_env_win.bat
Installers\Dev\hardware_info.vbs = Installers\Dev\hardware_info.vbs
Installers\Dev\setup.dev.bat = Installers\Dev\setup.dev.bat
Installers\Dev\setup.dev.sh = Installers\Dev\setup.dev.sh
Installers\Dev\utils.bat = Installers\Dev\utils.bat
Installers\Dev\utils.sh = Installers\Dev\utils.sh
EndProjectSection
Expand All @@ -103,8 +104,8 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{D2B223B6-983B-4782-B231-5F481504A86F}"
ProjectSection(SolutionItems) = preProject
src\AnalysisLayer\SDK\Python\analysislogging.py = src\AnalysisLayer\SDK\Python\analysislogging.py
src\AnalysisLayer\SDK\Python\common.py = src\AnalysisLayer\SDK\Python\common.py
src\AnalysisLayer\SDK\Python\codeprojectai.py = src\AnalysisLayer\SDK\Python\codeprojectai.py
src\AnalysisLayer\SDK\Python\common.py = src\AnalysisLayer\SDK\Python\common.py
src\AnalysisLayer\SDK\Python\requestdata.py = src\AnalysisLayer\SDK\Python\requestdata.py
src\AnalysisLayer\SDK\Python\requirements.txt = src\AnalysisLayer\SDK\Python\requirements.txt
EndProjectSection
Expand All @@ -121,8 +122,6 @@ Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Vision", "src\AnalysisLayer
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SentimentAnalysis", "src\AnalysisLayer\SentimentAnalysis\SentimentAnalysis.csproj", "{6814F27C-7026-4D22-8E38-2047747495E3}"
EndProject
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "CustomDetection", "src\AnalysisLayer\CustomDetection\CustomDetection.pyproj", "{FE2DAAFA-29D6-4842-8999-1776F320DEE4}"
EndProject
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "SuperResolution", "src\AnalysisLayer\SuperResolution\SuperResolution.pyproj", "{A472B309-3C77-4DE5-8F03-AA81938EEFB4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "License plates", "License plates", "{D320EA6C-2388-41F7-A4D1-980192665A61}"
Expand Down Expand Up @@ -197,6 +196,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObjectDetectionNet", "src\A
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeProject.AI.API.Server.Backend.Tests", "tests\QueueServiceTests\CodeProject.AI.API.Server.Backend.Tests.csproj", "{031F17E0-BE84-42AF-B9FE-4F928CB03D1B}"
EndProject
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "ObjectDetectionYolo", "src\AnalysisLayer\ObjectDetectionYolo\ObjectDetectionYolo.pyproj", "{B6A1D372-264E-4F66-B7FB-7FF19587476F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -285,10 +286,6 @@ Global
{6814F27C-7026-4D22-8E38-2047747495E3}.Release|Any CPU.Build.0 = Release|Any CPU
{6814F27C-7026-4D22-8E38-2047747495E3}.Release|x86.ActiveCfg = Release|Any CPU
{6814F27C-7026-4D22-8E38-2047747495E3}.Release|x86.Build.0 = Release|Any CPU
{FE2DAAFA-29D6-4842-8999-1776F320DEE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FE2DAAFA-29D6-4842-8999-1776F320DEE4}.Debug|x86.ActiveCfg = Debug|Any CPU
{FE2DAAFA-29D6-4842-8999-1776F320DEE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FE2DAAFA-29D6-4842-8999-1776F320DEE4}.Release|x86.ActiveCfg = Release|Any CPU
{A472B309-3C77-4DE5-8F03-AA81938EEFB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A472B309-3C77-4DE5-8F03-AA81938EEFB4}.Debug|x86.ActiveCfg = Debug|Any CPU
{A472B309-3C77-4DE5-8F03-AA81938EEFB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -309,6 +306,10 @@ Global
{031F17E0-BE84-42AF-B9FE-4F928CB03D1B}.Release|Any CPU.Build.0 = Release|Any CPU
{031F17E0-BE84-42AF-B9FE-4F928CB03D1B}.Release|x86.ActiveCfg = Release|Any CPU
{031F17E0-BE84-42AF-B9FE-4F928CB03D1B}.Release|x86.Build.0 = Release|Any CPU
{B6A1D372-264E-4F66-B7FB-7FF19587476F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B6A1D372-264E-4F66-B7FB-7FF19587476F}.Debug|x86.ActiveCfg = Debug|Any CPU
{B6A1D372-264E-4F66-B7FB-7FF19587476F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B6A1D372-264E-4F66-B7FB-7FF19587476F}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -339,7 +340,6 @@ Global
{56DFAAD2-2E14-45D8-8BC9-D171785235E9} = {11F66210-D711-4A0A-AE3A-8AC11432CDC3}
{E5D27495-EE4F-4AAF-8749-A6BA848111E2} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
{6814F27C-7026-4D22-8E38-2047747495E3} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
{FE2DAAFA-29D6-4842-8999-1776F320DEE4} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
{A472B309-3C77-4DE5-8F03-AA81938EEFB4} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
{D320EA6C-2388-41F7-A4D1-980192665A61} = {B10B59B5-9F63-41C2-BFBB-6C7311DC4E99}
{C5CC1B6F-14B1-41C1-A2F3-164B37BDCC0C} = {B10B59B5-9F63-41C2-BFBB-6C7311DC4E99}
Expand All @@ -349,6 +349,7 @@ Global
{4ED567B5-C28D-48BB-AEDC-864E2B2C7204} = {B10B59B5-9F63-41C2-BFBB-6C7311DC4E99}
{25D75AFE-BEC9-43BF-BE44-B9068FF8E395} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
{031F17E0-BE84-42AF-B9FE-4F928CB03D1B} = {D982BD8C-2257-413B-8513-8043AB3035F3}
{B6A1D372-264E-4F66-B7FB-7FF19587476F} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {83740BD9-AEEF-49C7-A722-D7703D3A38CB}
Expand Down

0 comments on commit 1f21692

Please sign in to comment.