Skip to content

Commit 1f21692

Browse files
author
ChrisMaunder
committed
Updated to 1.6.0.0: Settings API to toggle GPU and start/stop, improved RAM use, async logging, M1 support
1 parent 0feac80 commit 1f21692

File tree

200 files changed

+4204
-2216
lines changed

Some content is hidden

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

200 files changed

+4204
-2216
lines changed

‎.vscode/launch.json‎

Lines changed: 68 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,36 @@
33
"configurations": [
44

55
{
6-
"name": "Build All",
6+
"name": "Launch Server",
77
"type": "coreclr",
88
"request": "launch",
9-
"preLaunchTask": "build-all-win",
10-
"linux": {
11-
"preLaunchTask": "build-all-linux",
12-
},
13-
"osx": {
14-
"preLaunchTask": "build-all-linux",
15-
},
16-
"program": "dotnet",
17-
"args": [
18-
"--version"
19-
],
9+
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net6.0/CodeProject.AI.Server",
10+
"args": [],
2011
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
2112
"stopAtEntry": false,
13+
"requireExactSource": false,
14+
"serverReadyAction": {
15+
"action": "openExternally",
16+
"pattern": "\\bNow listening on:\\s+(https?://\\S+)",
17+
"uriFormat": "http://localhost:%s/swagger"
18+
},
19+
2220
"env": {
23-
"ASPNETCORE_ENVIRONMENT": "Development"
21+
"ASPNETCORE_ENVIRONMENT": "Development",
22+
"RUNNING_IN_VSCODE": "true"
2423
}
24+
/*
25+
"logging": {
26+
"engineLogging": false,
27+
"moduleLoad": false,
28+
"exceptions": false,
29+
"browserStdOut": false
30+
}
31+
*/
2532
},
26-
33+
2734
{
28-
"name": "Launch Server",
35+
"name": "Build & Launch Server",
2936
"type": "coreclr",
3037
"request": "launch",
3138
"preLaunchTask": "build-all-win",
@@ -39,6 +46,7 @@
3946
"args": [],
4047
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
4148
"stopAtEntry": false,
49+
"requireExactSource": false,
4250
"serverReadyAction": {
4351
"action": "openExternally",
4452
"pattern": "\\bNow listening on:\\s+(https?://\\S+)",
@@ -59,6 +67,28 @@
5967
*/
6068
},
6169

70+
{
71+
"name": "Build All",
72+
"type": "coreclr",
73+
"request": "launch",
74+
"preLaunchTask": "build-all-win",
75+
"linux": {
76+
"preLaunchTask": "build-all-linux",
77+
},
78+
"osx": {
79+
"preLaunchTask": "build-all-linux",
80+
},
81+
"program": "dotnet",
82+
"args": [
83+
"--version"
84+
],
85+
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
86+
"stopAtEntry": false,
87+
"env": {
88+
"ASPNETCORE_ENVIRONMENT": "Development"
89+
}
90+
},
91+
6292
{
6393
"name": "Launch Server & Modules separately",
6494
"type": "coreclr",
@@ -112,13 +142,34 @@
112142
// See https://code.visualstudio.com/docs/editor/variables-reference#_settings-command-variables-and-input-variables
113143
// For variables that can be used
114144
{
115-
"name": "Python: Current File",
145+
"name": "Python 3.7/3.8: Current File",
116146
"type": "python",
147+
"python": "${workspaceFolder}/src/AnalysisLayer/bin/windows/python37/venv/bin/python",
117148
"request": "launch",
118149
"program": "${file}",
119150
"console": "integratedTerminal",
120151
"cwd": "${fileDirname}",
121-
"justMyCode": true
152+
"justMyCode": true,
153+
"env": {
154+
"DEBUG_IN_VSCODE": "True",
155+
"RUNNING_IN_VSCODE": "True",
156+
"CPAI_PORT": "32168"
157+
},
158+
"osx": {
159+
"python": "${workspaceFolder}/src/AnalysisLayer/bin/macos-arm/python38/venv/bin/python",
160+
// "env": { "CPAI_PORT": "32168" }
161+
}
162+
},
163+
{
164+
"name": "Python: Attach via ProcessID",
165+
"type": "python",
166+
"request": "attach",
167+
"processId": "${command:pickProcess}",
168+
"justMyCode": true,
169+
"env": {
170+
"DEBUG_IN_VSCODE": "True",
171+
"RUNNING_IN_VSCODE": "True"
172+
}
122173
}
123174
]
124175
}

‎CodeProject.AI.sln‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
7878
EndProject
7979
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDK", "SDK", "{FF0C329F-41E8-4540-BCDB-97690911077D}"
8080
ProjectSection(SolutionItems) = preProject
81-
src\AnalysisLayer\SDK\install.bat = src\AnalysisLayer\SDK\install.bat
82-
src\AnalysisLayer\SDK\install.sh = src\AnalysisLayer\SDK\install.sh
81+
src\AnalysisLayer\SDK\install.dev.bat = src\AnalysisLayer\SDK\install.dev.bat
82+
src\AnalysisLayer\SDK\install.dev.sh = src\AnalysisLayer\SDK\install.dev.sh
8383
EndProjectSection
8484
EndProject
8585
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ModelRunners", "ModelRunners", "{55C41D48-17AC-4ED5-9440-B42AF65CCE4E}"
@@ -92,8 +92,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dev", "Dev", "{00BBF52C-217
9292
ProjectSection(SolutionItems) = preProject
9393
Installers\Dev\clean.bat = Installers\Dev\clean.bat
9494
Installers\Dev\clean.sh = Installers\Dev\clean.sh
95-
Installers\Dev\setup_dev_env_linux.sh = Installers\Dev\setup_dev_env_linux.sh
96-
Installers\Dev\setup_dev_env_win.bat = Installers\Dev\setup_dev_env_win.bat
95+
Installers\Dev\hardware_info.vbs = Installers\Dev\hardware_info.vbs
96+
Installers\Dev\setup.dev.bat = Installers\Dev\setup.dev.bat
97+
Installers\Dev\setup.dev.sh = Installers\Dev\setup.dev.sh
9798
Installers\Dev\utils.bat = Installers\Dev\utils.bat
9899
Installers\Dev\utils.sh = Installers\Dev\utils.sh
99100
EndProjectSection
@@ -103,8 +104,8 @@ EndProject
103104
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{D2B223B6-983B-4782-B231-5F481504A86F}"
104105
ProjectSection(SolutionItems) = preProject
105106
src\AnalysisLayer\SDK\Python\analysislogging.py = src\AnalysisLayer\SDK\Python\analysislogging.py
106-
src\AnalysisLayer\SDK\Python\common.py = src\AnalysisLayer\SDK\Python\common.py
107107
src\AnalysisLayer\SDK\Python\codeprojectai.py = src\AnalysisLayer\SDK\Python\codeprojectai.py
108+
src\AnalysisLayer\SDK\Python\common.py = src\AnalysisLayer\SDK\Python\common.py
108109
src\AnalysisLayer\SDK\Python\requestdata.py = src\AnalysisLayer\SDK\Python\requestdata.py
109110
src\AnalysisLayer\SDK\Python\requirements.txt = src\AnalysisLayer\SDK\Python\requirements.txt
110111
EndProjectSection
@@ -121,8 +122,6 @@ Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Vision", "src\AnalysisLayer
121122
EndProject
122123
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SentimentAnalysis", "src\AnalysisLayer\SentimentAnalysis\SentimentAnalysis.csproj", "{6814F27C-7026-4D22-8E38-2047747495E3}"
123124
EndProject
124-
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "CustomDetection", "src\AnalysisLayer\CustomDetection\CustomDetection.pyproj", "{FE2DAAFA-29D6-4842-8999-1776F320DEE4}"
125-
EndProject
126125
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "SuperResolution", "src\AnalysisLayer\SuperResolution\SuperResolution.pyproj", "{A472B309-3C77-4DE5-8F03-AA81938EEFB4}"
127126
EndProject
128127
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "License plates", "License plates", "{D320EA6C-2388-41F7-A4D1-980192665A61}"
@@ -197,6 +196,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObjectDetectionNet", "src\A
197196
EndProject
198197
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}"
199198
EndProject
199+
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "ObjectDetectionYolo", "src\AnalysisLayer\ObjectDetectionYolo\ObjectDetectionYolo.pyproj", "{B6A1D372-264E-4F66-B7FB-7FF19587476F}"
200+
EndProject
200201
Global
201202
GlobalSection(SolutionConfigurationPlatforms) = preSolution
202203
Debug|Any CPU = Debug|Any CPU
@@ -285,10 +286,6 @@ Global
285286
{6814F27C-7026-4D22-8E38-2047747495E3}.Release|Any CPU.Build.0 = Release|Any CPU
286287
{6814F27C-7026-4D22-8E38-2047747495E3}.Release|x86.ActiveCfg = Release|Any CPU
287288
{6814F27C-7026-4D22-8E38-2047747495E3}.Release|x86.Build.0 = Release|Any CPU
288-
{FE2DAAFA-29D6-4842-8999-1776F320DEE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
289-
{FE2DAAFA-29D6-4842-8999-1776F320DEE4}.Debug|x86.ActiveCfg = Debug|Any CPU
290-
{FE2DAAFA-29D6-4842-8999-1776F320DEE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
291-
{FE2DAAFA-29D6-4842-8999-1776F320DEE4}.Release|x86.ActiveCfg = Release|Any CPU
292289
{A472B309-3C77-4DE5-8F03-AA81938EEFB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
293290
{A472B309-3C77-4DE5-8F03-AA81938EEFB4}.Debug|x86.ActiveCfg = Debug|Any CPU
294291
{A472B309-3C77-4DE5-8F03-AA81938EEFB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -309,6 +306,10 @@ Global
309306
{031F17E0-BE84-42AF-B9FE-4F928CB03D1B}.Release|Any CPU.Build.0 = Release|Any CPU
310307
{031F17E0-BE84-42AF-B9FE-4F928CB03D1B}.Release|x86.ActiveCfg = Release|Any CPU
311308
{031F17E0-BE84-42AF-B9FE-4F928CB03D1B}.Release|x86.Build.0 = Release|Any CPU
309+
{B6A1D372-264E-4F66-B7FB-7FF19587476F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
310+
{B6A1D372-264E-4F66-B7FB-7FF19587476F}.Debug|x86.ActiveCfg = Debug|Any CPU
311+
{B6A1D372-264E-4F66-B7FB-7FF19587476F}.Release|Any CPU.ActiveCfg = Release|Any CPU
312+
{B6A1D372-264E-4F66-B7FB-7FF19587476F}.Release|x86.ActiveCfg = Release|Any CPU
312313
EndGlobalSection
313314
GlobalSection(SolutionProperties) = preSolution
314315
HideSolutionNode = FALSE
@@ -339,7 +340,6 @@ Global
339340
{56DFAAD2-2E14-45D8-8BC9-D171785235E9} = {11F66210-D711-4A0A-AE3A-8AC11432CDC3}
340341
{E5D27495-EE4F-4AAF-8749-A6BA848111E2} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
341342
{6814F27C-7026-4D22-8E38-2047747495E3} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
342-
{FE2DAAFA-29D6-4842-8999-1776F320DEE4} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
343343
{A472B309-3C77-4DE5-8F03-AA81938EEFB4} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
344344
{D320EA6C-2388-41F7-A4D1-980192665A61} = {B10B59B5-9F63-41C2-BFBB-6C7311DC4E99}
345345
{C5CC1B6F-14B1-41C1-A2F3-164B37BDCC0C} = {B10B59B5-9F63-41C2-BFBB-6C7311DC4E99}
@@ -349,6 +349,7 @@ Global
349349
{4ED567B5-C28D-48BB-AEDC-864E2B2C7204} = {B10B59B5-9F63-41C2-BFBB-6C7311DC4E99}
350350
{25D75AFE-BEC9-43BF-BE44-B9068FF8E395} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
351351
{031F17E0-BE84-42AF-B9FE-4F928CB03D1B} = {D982BD8C-2257-413B-8513-8043AB3035F3}
352+
{B6A1D372-264E-4F66-B7FB-7FF19587476F} = {156BFEDA-D477-43B2-92DA-FCC9BAF1F893}
352353
EndGlobalSection
353354
GlobalSection(ExtensibilityGlobals) = postSolution
354355
SolutionGuid = {83740BD9-AEEF-49C7-A722-D7703D3A38CB}

0 commit comments

Comments
 (0)