Skip to content

Commit 83ed7b2

Browse files
committed
Moved modules, models and runtimes from /src to /
1 parent 4b0e163 commit 83ed7b2

85 files changed

Lines changed: 278 additions & 240 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,11 +323,11 @@ wget-log*
323323
/runtimes
324324

325325
# Downloaded assets and libraries for modules
326-
/src/modules/ObjectDetectionYOLOv5Net/assets/
327-
/src/modules/ObjectDetectionYOLOv5Net/custom-models
328-
/src/modules/ObjectDetectionYOLOv5Net/LocalNugets
329-
/src/modules/ObjectDetectionYOLOv5-6.2/assets
330-
/src/modules/ObjectDetectionYOLOv5-6.2/custom-models
326+
/modules/ObjectDetectionYOLOv5Net/assets/
327+
/modules/ObjectDetectionYOLOv5Net/custom-models
328+
/modules/ObjectDetectionYOLOv5Net/LocalNugets
329+
/modules/ObjectDetectionYOLOv5-6.2/assets
330+
/modules/ObjectDetectionYOLOv5-6.2/custom-models
331331

332332
/src/demos/modules/DotNetLongProcess/assets/
333333
/src/demos/modules/DotNetSimple/assets/

‎CodeProject.AI.sln‎

Lines changed: 74 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,17 @@ EndProject
3939
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{460DB5C8-46F3-4407-A2DF-D9063D14493A}"
4040
ProjectSection(SolutionItems) = preProject
4141
.editorconfig = .editorconfig
42+
CodeProject.AI-Server.code-workspace = CodeProject.AI-Server.code-workspace
4243
LICENCE.md = LICENCE.md
4344
README.md = README.md
4445
THIRD-PARTY-NOTICES.md = THIRD-PARTY-NOTICES.md
4546
EndProjectSection
4647
EndProject
4748
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDK", "SDK", "{FF0C329F-41E8-4540-BCDB-97690911077D}"
49+
ProjectSection(SolutionItems) = preProject
50+
src\SDK\install.bat = src\SDK\install.bat
51+
src\SDK\install.sh = src\SDK\install.sh
52+
EndProjectSection
4853
EndProject
4954
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "License plates", "License plates", "{D320EA6C-2388-41F7-A4D1-980192665A61}"
5055
ProjectSection(SolutionItems) = preProject
@@ -143,16 +148,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NET", "src\SDK\NET\NET.cspr
143148
EndProject
144149
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Python", "src\SDK\Python\Python.pyproj", "{B6A1D372-264E-4F66-B7FB-7FF19587476E}"
145150
EndProject
146-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{95BF276E-3D5E-4CB2-9FEB-A77AF0C2728C}"
147-
ProjectSection(SolutionItems) = preProject
148-
src\SDK\Scripts\dotnet-install-arm.sh = src\SDK\Scripts\dotnet-install-arm.sh
149-
src\SDK\Scripts\dotnet-install.ps1 = src\SDK\Scripts\dotnet-install.ps1
150-
src\SDK\Scripts\dotnet-install.sh = src\SDK\Scripts\dotnet-install.sh
151-
src\SDK\Scripts\install_CUDnn.bat = src\SDK\Scripts\install_CUDnn.bat
152-
src\SDK\Scripts\utils.bat = src\SDK\Scripts\utils.bat
153-
src\SDK\Scripts\utils.sh = src\SDK\Scripts\utils.sh
154-
EndProjectSection
155-
EndProject
156151
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObjectDetectionYOLOv5Net", "src\modules\ObjectDetectionYOLOv5Net\ObjectDetectionYOLOv5Net.csproj", "{F682C5F9-854F-4B4E-A7DE-33329F51A26B}"
157152
EndProject
158153
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "ObjectDetectionYOLOv5-6.2", "src\modules\ObjectDetectionYOLOv5-6.2\ObjectDetectionYOLOv5-6.2.pyproj", "{B6A1D372-264E-4F66-B7FB-7FF19587476F}"
@@ -171,28 +166,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ",vscode", ",vscode", "{CA30
171166
EndProject
172167
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker-compose", "docker-compose", "{2A2CB97D-0086-4891-AFA1-198F414E3562}"
173168
ProjectSection(SolutionItems) = preProject
174-
docker-compose\docker-compose-cpu.yml = docker-compose\docker-compose-cpu.yml
175-
docker-compose\docker-compose-cuda-10.2.yml = docker-compose\docker-compose-cuda-10.2.yml
176-
docker-compose\docker-compose-cuda-11.7.yml = docker-compose\docker-compose-cuda-11.7.yml
177-
docker-compose\docker-compose-cuda-12.2.yml = docker-compose\docker-compose-cuda-12.2.yml
178-
docker-compose\docker-compose-gpu.yml = docker-compose\docker-compose-gpu.yml
179-
docker-compose\docker-compose-rpi.yml = docker-compose\docker-compose-rpi.yml
180-
EndProjectSection
181-
EndProject
182-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{A04CA21C-39DF-4466-B48B-A08AA0A262BD}"
183-
ProjectSection(SolutionItems) = preProject
184-
src\SDK\Utilities\clean.bat = src\SDK\Utilities\clean.bat
185-
src\SDK\Utilities\clean.sh = src\SDK\Utilities\clean.sh
186-
src\SDK\Utilities\Cleanup-InstalledApp.ps1 = src\SDK\Utilities\Cleanup-InstalledApp.ps1
187-
src\SDK\Utilities\endtimer.bat = src\SDK\Utilities\endtimer.bat
188-
src\SDK\Utilities\fix_localhost_issue_wsl.sh = src\SDK\Utilities\fix_localhost_issue_wsl.sh
189-
src\SDK\Utilities\HardStop.ps1 = src\SDK\Utilities\HardStop.ps1
190-
src\SDK\Utilities\hardware_info.vbs = src\SDK\Utilities\hardware_info.vbs
191-
src\SDK\Utilities\Setup-WSL.bat = src\SDK\Utilities\Setup-WSL.bat
192-
src\SDK\Utilities\Setup-WSL.ps1 = src\SDK\Utilities\Setup-WSL.ps1
193-
src\SDK\Utilities\starttimer.bat = src\SDK\Utilities\starttimer.bat
194-
src\SDK\Utilities\stop_all.bat = src\SDK\Utilities\stop_all.bat
195-
src\SDK\Utilities\stop_all.sh = src\SDK\Utilities\stop_all.sh
169+
devops\docker-compose\docker-compose-cpu.yml = devops\docker-compose\docker-compose-cpu.yml
170+
devops\docker-compose\docker-compose-cuda-10.2.yml = devops\docker-compose\docker-compose-cuda-10.2.yml
171+
devops\docker-compose\docker-compose-cuda-11.7.yml = devops\docker-compose\docker-compose-cuda-11.7.yml
172+
devops\docker-compose\docker-compose-cuda-12.2.yml = devops\docker-compose\docker-compose-cuda-12.2.yml
173+
devops\docker-compose\docker-compose-gpu.yml = devops\docker-compose\docker-compose-gpu.yml
174+
devops\docker-compose\docker-compose-rpi.yml = devops\docker-compose\docker-compose-rpi.yml
196175
EndProjectSection
197176
EndProject
198177
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ParseJSON", "utils\ParseJSON\ParseJSON.csproj", "{AF84AA51-8718-40EC-B5D7-281799A7B07C}"
@@ -219,6 +198,62 @@ Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "ObjectDetect", "src\demos\c
219198
EndProject
220199
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeProject.AI.SDK.Tests", "tests\CodeProject.AI.SDK.Tests\CodeProject.AI.SDK.Tests.csproj", "{534DE25D-0CDB-40FA-9FA5-915947FFC948}"
221200
EndProject
201+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "downloads", "downloads", "{03695052-B42B-4672-801E-8DA4A2DA121D}"
202+
EndProject
203+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "models", "models", "{BB5A0479-7ED8-4348-9C84-A712692E98DB}"
204+
ProjectSection(SolutionItems) = preProject
205+
downloads\models\models.json = downloads\models\models.json
206+
EndProjectSection
207+
EndProject
208+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{A80A9448-3DF5-4FDA-8D12-5B2A8ECDC482}"
209+
EndProject
210+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "devops", "devops", "{50CC79E9-A9D5-4A10-AA2F-4FE588BA26F5}"
211+
EndProject
212+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{14F997E3-5D56-4610-AC3D-7838DCB3B2AB}"
213+
ProjectSection(SolutionItems) = preProject
214+
devops\build\create_packages.bat = devops\build\create_packages.bat
215+
devops\build\create_packages.sh = devops\build\create_packages.sh
216+
EndProjectSection
217+
EndProject
218+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "install", "install", "{10FEC849-0DE2-45A1-BA63-C3CD0AA7DD2A}"
219+
ProjectSection(SolutionItems) = preProject
220+
devops\install\clean.bat = devops\install\clean.bat
221+
devops\install\clean.sh = devops\install\clean.sh
222+
devops\install\clone_repos.bat = devops\install\clone_repos.bat
223+
devops\install\clone_repos.sh = devops\install\clone_repos.sh
224+
devops\install\dotnet-install-arm.sh = devops\install\dotnet-install-arm.sh
225+
devops\install\dotnet-install.ps1 = devops\install\dotnet-install.ps1
226+
devops\install\dotnet-install.sh = devops\install\dotnet-install.sh
227+
devops\install\install_CUDnn.bat = devops\install\install_CUDnn.bat
228+
devops\install\install_cuDNN.sh = devops\install\install_cuDNN.sh
229+
devops\install\jetson_libraries.sh = devops\install\jetson_libraries.sh
230+
devops\install\jetson_variables.sh = devops\install\jetson_variables.sh
231+
EndProjectSection
232+
EndProject
233+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{6BB8FD23-9042-4E05-AF31-D8C167EEEFD3}"
234+
ProjectSection(SolutionItems) = preProject
235+
devops\scripts\Cleanup-InstalledApp.ps1 = devops\scripts\Cleanup-InstalledApp.ps1
236+
devops\scripts\endtimer.bat = devops\scripts\endtimer.bat
237+
devops\scripts\fix_localhost_issue_wsl.sh = devops\scripts\fix_localhost_issue_wsl.sh
238+
devops\scripts\hardware_info.vbs = devops\scripts\hardware_info.vbs
239+
devops\scripts\inotify_consumers.sh = devops\scripts\inotify_consumers.sh
240+
devops\scripts\setSwapMemorySize.sh = devops\scripts\setSwapMemorySize.sh
241+
devops\scripts\Setup-WSL.bat = devops\scripts\Setup-WSL.bat
242+
devops\scripts\Setup-WSL.ps1 = devops\scripts\Setup-WSL.ps1
243+
devops\scripts\starttimer.bat = devops\scripts\starttimer.bat
244+
devops\scripts\stop_all.bat = devops\scripts\stop_all.bat
245+
devops\scripts\stop_all.sh = devops\scripts\stop_all.sh
246+
devops\scripts\utils.bat = devops\scripts\utils.bat
247+
devops\scripts\utils.sh = devops\scripts\utils.sh
248+
EndProjectSection
249+
EndProject
250+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{6E979D95-48F4-4902-A708-9C9AFC3430BD}"
251+
ProjectSection(SolutionItems) = preProject
252+
utils\jq-windows-amd64.exe = utils\jq-windows-amd64.exe
253+
EndProjectSection
254+
EndProject
255+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "internal-modules", "internal-modules", "{B2C2865A-1A91-4B5C-83F5-BFC967F49773}"
256+
EndProject
222257
Global
223258
GlobalSection(SolutionConfigurationPlatforms) = preSolution
224259
Debug|Any CPU = Debug|Any CPU
@@ -389,12 +424,11 @@ Global
389424
{1C7E0F81-1F4A-478B-80CE-4C41606DC087} = {A8B76501-496A-4011-9C37-8308A1EBDFA7}
390425
{F7056ECA-1C9C-4544-99CA-731C944651D6} = {FF0C329F-41E8-4540-BCDB-97690911077D}
391426
{B6A1D372-264E-4F66-B7FB-7FF19587476E} = {FF0C329F-41E8-4540-BCDB-97690911077D}
392-
{95BF276E-3D5E-4CB2-9FEB-A77AF0C2728C} = {FF0C329F-41E8-4540-BCDB-97690911077D}
393427
{F682C5F9-854F-4B4E-A7DE-33329F51A26B} = {1C7E0F81-1F4A-478B-80CE-4C41606DC087}
394428
{B6A1D372-264E-4F66-B7FB-7FF19587476F} = {1C7E0F81-1F4A-478B-80CE-4C41606DC087}
395429
{BFB8AD18-8C6E-4B25-B4AA-1AAB90ADA843} = {A8B76501-496A-4011-9C37-8308A1EBDFA7}
396-
{A04CA21C-39DF-4466-B48B-A08AA0A262BD} = {FF0C329F-41E8-4540-BCDB-97690911077D}
397-
{AF84AA51-8718-40EC-B5D7-281799A7B07C} = {A04CA21C-39DF-4466-B48B-A08AA0A262BD}
430+
{2A2CB97D-0086-4891-AFA1-198F414E3562} = {50CC79E9-A9D5-4A10-AA2F-4FE588BA26F5}
431+
{AF84AA51-8718-40EC-B5D7-281799A7B07C} = {6E979D95-48F4-4902-A708-9C9AFC3430BD}
398432
{5FBE5A09-30BA-4697-8069-443BE5294424} = {7F18EB64-C857-49C4-9380-70D3CCE6242B}
399433
{7FA847EE-CB4B-4C79-A774-4FFDB7313638} = {7F18EB64-C857-49C4-9380-70D3CCE6242B}
400434
{7CC816B7-8559-461D-A5E6-5CE1B6DCA9BC} = {7FA847EE-CB4B-4C79-A774-4FFDB7313638}
@@ -404,6 +438,11 @@ Global
404438
{C2500118-FD99-49EF-B726-3E2A3B30A717} = {37533562-EC4C-4FB4-8C42-FE327D1D79BD}
405439
{25750BF1-1502-4F65-8D69-CEA8C87D6446} = {37533562-EC4C-4FB4-8C42-FE327D1D79BD}
406440
{534DE25D-0CDB-40FA-9FA5-915947FFC948} = {D982BD8C-2257-413B-8513-8043AB3035F3}
441+
{BB5A0479-7ED8-4348-9C84-A712692E98DB} = {03695052-B42B-4672-801E-8DA4A2DA121D}
442+
{A80A9448-3DF5-4FDA-8D12-5B2A8ECDC482} = {03695052-B42B-4672-801E-8DA4A2DA121D}
443+
{14F997E3-5D56-4610-AC3D-7838DCB3B2AB} = {50CC79E9-A9D5-4A10-AA2F-4FE588BA26F5}
444+
{10FEC849-0DE2-45A1-BA63-C3CD0AA7DD2A} = {50CC79E9-A9D5-4A10-AA2F-4FE588BA26F5}
445+
{6BB8FD23-9042-4E05-AF31-D8C167EEEFD3} = {50CC79E9-A9D5-4A10-AA2F-4FE588BA26F5}
407446
EndGlobalSection
408447
GlobalSection(ExtensibilityGlobals) = postSolution
409448
SolutionGuid = {83740BD9-AEEF-49C7-A722-D7703D3A38CB}
File renamed without changes.

src/modules/ObjectDetectionYOLOv5-6.2/ObjectDetectionYOLOv5-6.2.pyproj renamed to modules/ObjectDetectionYOLOv5-6.2/ObjectDetectionYOLOv5-6.2.pyproj

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)