Skip to content

Commit 4b0e163

Browse files
committed
Move /runtimes out of /src
1 parent 0747f47 commit 4b0e163

6 files changed

Lines changed: 47 additions & 47 deletions

File tree

‎.gitignore‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ wget-log*
320320
/downloads/models/*
321321
!/downloads/models/models.json
322322

323+
/runtimes
323324

324325
# Downloaded assets and libraries for modules
325326
/src/modules/ObjectDetectionYOLOv5Net/assets/
@@ -339,16 +340,15 @@ wget-log*
339340
/src/server/installconfig.json
340341

341342

342-
# SDK --------------------------------------------------------------------------
343+
# Utils --------------------------------------------------------------------------
343344

344345
# The compiled form of the ParseJSON utility. We move the compiled files to its base dir it for convenience
345-
/src/SDK/Utilities/ParseJSON/ParseJSON
346-
/src/SDK/Utilities/ParseJSON/ParseJSON.exe
347-
/src/SDK/Utilities/ParseJSON/ParseJSON.deps.json
348-
/src/SDK/Utilities/ParseJSON/ParseJSON.dll
349-
/src/SDK/Utilities/ParseJSON/ParseJSON.runtimeconfig.json
350-
/src/SDK/Utilities/ParseJSON/ParseJSON.xml
351-
/src/SDK/Utilities/ParseJSON/*.dll
346+
/utils/ParseJSON/ParseJSON
347+
/utils/ParseJSON/ParseJSON.exe
348+
/utils/ParseJSON/ParseJSON.deps.json
349+
/utils/ParseJSON/ParseJSON.runtimeconfig.json
350+
/utils/ParseJSON/ParseJSON.xml
351+
/utils/ParseJSON/*.dll
352352

353353
# Module packages --------------------------------------------------------------
354354

@@ -357,4 +357,5 @@ wget-log*
357357

358358
# Debug debris -----------------------------------------------------------------
359359

360-
/SDK
360+
/SDK
361+
/debug

‎.vscode/launch.json‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@
417417
},
418418
"name": "Face Processing",
419419
"type": "python",
420-
"python": "${workspaceFolder}/src/runtimes/bin/linux/python38/venv/bin/python",
420+
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
421421
"request": "launch",
422422
"program": "intelligencelayer/face.py",
423423
// "args": [ "--selftest" ],
@@ -431,13 +431,13 @@
431431
"CPAI_PORT": "32168"
432432
},
433433
"windows": {
434-
"python": "${workspaceFolder}/src/runtimes/bin/windows/python37/venv/Scripts/python"
434+
"python": "${workspaceFolder}/runtimes/bin/windows/python37/venv/Scripts/python"
435435
},
436436
"linux": {
437-
"python": "${workspaceFolder}/src/runtimes/bin/linux/python38/venv/bin/python",
437+
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
438438
},
439439
"osx": {
440-
"python": "${workspaceFolder}/src/runtimes/bin/macos/python38/venv/bin/python",
440+
"python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
441441
}
442442
},
443443

@@ -616,7 +616,7 @@
616616
},
617617
"name": "Object Detect YOLOv5 6.2",
618618
"type": "python",
619-
"python": "${workspaceFolder}/src/runtimes/bin/linux/python38/venv/bin/python",
619+
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
620620
"request": "launch",
621621
"program": "detect_adapter.py",
622622
"console": "integratedTerminal",
@@ -634,13 +634,13 @@
634634
"MODEL_SIZE": "Tiny"
635635
},
636636
"windows": {
637-
"python": "${workspaceFolder}/src/runtimes/bin/windows/python37/venv/Scripts/python"
637+
"python": "${workspaceFolder}/runtimes/bin/windows/python37/venv/Scripts/python"
638638
},
639639
"linux": {
640-
"python": "${workspaceFolder}/src/runtimes/bin/linux/python38/venv/bin/python",
640+
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
641641
},
642642
"osx": {
643-
"python": "${workspaceFolder}/src/runtimes/bin/macos/python38/venv/bin/python",
643+
"python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
644644
}
645645
},
646646

@@ -651,7 +651,7 @@
651651
},
652652
"name": "Object Detect YOLOv8",
653653
"type": "python",
654-
"python": "${workspaceFolder}/src/runtimes/bin/linux/python39/venv/bin/python",
654+
"python": "${workspaceFolder}/runtimes/bin/linux/python39/venv/bin/python",
655655
"request": "launch",
656656
"program": "detect_adapter.py",
657657
"console": "integratedTerminal",
@@ -668,13 +668,13 @@
668668
"MODEL_SIZE": "Tiny"
669669
},
670670
"windows": {
671-
"python": "${workspaceFolder}/src/runtimes/bin/windows/python39/venv/Scripts/python"
671+
"python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python"
672672
},
673673
"linux": {
674-
"python": "${workspaceFolder}/src/runtimes/bin/linux/python38/venv/bin/python",
674+
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
675675
},
676676
"osx": {
677-
"python": "${workspaceFolder}/src/runtimes/bin/macos/python38/venv/bin/python",
677+
"python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
678678
}
679679
},
680680

@@ -739,7 +739,7 @@
739739
},
740740
"name": "Scene Classifier",
741741
"type": "python",
742-
"python": "${workspaceFolder}/src/runtimes/bin/linux/python38/venv/bin/python",
742+
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
743743
"request": "launch",
744744
"program": "scene_adapter.py",
745745
// "args": [ "--selftest" ],
@@ -753,13 +753,13 @@
753753
"CPAI_PORT": "32168"
754754
},
755755
"windows": {
756-
"python": "${workspaceFolder}/src/runtimes/bin/windows/python37/venv/Scripts/python"
756+
"python": "${workspaceFolder}/runtimes/bin/windows/python37/venv/Scripts/python"
757757
},
758758
"linux": {
759-
"python": "${workspaceFolder}/src/runtimes/bin/linux/python38/venv/bin/python",
759+
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
760760
},
761761
"osx": {
762-
"python": "${workspaceFolder}/src/runtimes/bin/macos/python38/venv/bin/python",
762+
"python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
763763
}
764764
},
765765

@@ -1089,7 +1089,7 @@
10891089
},
10901090
"name": "Racoon detector",
10911091
"type": "python",
1092-
"python": "${workspaceFolder}/src/runtimes/bin/windows/python38/venv/bin/python",
1092+
"python": "${workspaceFolder}/runtimes/bin/windows/python38/venv/bin/python",
10931093
"request": "launch",
10941094
"program": "racoon_detect.py",
10951095
"console": "integratedTerminal",
@@ -1102,13 +1102,13 @@
11021102
"CPAI_PORT": "32168"
11031103
},
11041104
"windows": {
1105-
"python": "${workspaceFolder}/src/runtimes/bin/windows/python39/venv/Scripts/python.exe"
1105+
"python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python.exe"
11061106
},
11071107
"linux": {
1108-
"python": "${workspaceFolder}/src/runtimes/bin/linux/python38/venv/bin/python",
1108+
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
11091109
},
11101110
"osx": {
1111-
"python": "${workspaceFolder}/src/runtimes/bin/macos/python38/venv/bin/python",
1111+
"python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
11121112
}
11131113
},
11141114

@@ -1122,7 +1122,7 @@
11221122

11231123
"name": "Python Simple Module",
11241124
"type": "python",
1125-
"python": "${workspaceFolder}/src/runtimes/bin/linux/python39/venv/bin/python",
1125+
"python": "${workspaceFolder}/runtimes/bin/linux/python39/venv/bin/python",
11261126
"request": "launch",
11271127
// "program": "detect.py",
11281128
"program": "detect_adapter.py",
@@ -1142,13 +1142,13 @@
11421142
"MODEL_SIZE": "Tiny"
11431143
},
11441144
"windows": {
1145-
"python": "${workspaceFolder}/src/runtimes/bin/windows/python39/venv/Scripts/python"
1145+
"python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python"
11461146
},
11471147
"linux": {
1148-
"python": "${workspaceFolder}/src/runtimes/bin/linux/python38/venv/bin/python",
1148+
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
11491149
},
11501150
"osx": {
1151-
"python": "${workspaceFolder}/src/runtimes/bin/macos/python38/venv/bin/python",
1151+
"python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
11521152
}
11531153
},
11541154
{
@@ -1158,7 +1158,7 @@
11581158

11591159
"name": "Python Long Process Module",
11601160
"type": "python",
1161-
"python": "${workspaceFolder}/src/runtimes/bin/linux/python39/venv/bin/python",
1161+
"python": "${workspaceFolder}/runtimes/bin/linux/python39/venv/bin/python",
11621162
"request": "launch",
11631163
"program": "long_process_demo_adapter.py",
11641164
"console": "integratedTerminal",
@@ -1174,13 +1174,13 @@
11741174
"MODEL_SIZE": "Tiny"
11751175
},
11761176
"windows": {
1177-
"python": "${workspaceFolder}/src/runtimes/bin/windows/python39/venv/Scripts/python"
1177+
"python": "${workspaceFolder}/runtimes/bin/windows/python39/venv/Scripts/python"
11781178
},
11791179
"linux": {
1180-
"python": "${workspaceFolder}/src/runtimes/bin/linux/python38/venv/bin/python",
1180+
"python": "${workspaceFolder}/runtimes/bin/linux/python38/venv/bin/python",
11811181
},
11821182
"osx": {
1183-
"python": "${workspaceFolder}/src/runtimes/bin/macos/python38/venv/bin/python",
1183+
"python": "${workspaceFolder}/runtimes/bin/macos/python38/venv/bin/python",
11841184
}
11851185
},
11861186

‎.vscode/tasks.docker.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"group": "none",
1010
"type": "process",
1111
"command": "bash",
12-
"args": [ "/app/SDK/Utilities/stop_all.sh" ],
12+
"args": [ "/app/devops/scripts/stop_all.sh" ],
1313
"problemMatcher": "$msCompile"
1414
}
1515
]

‎.vscode/tasks.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,10 @@
238238
"group": "none",
239239
"type": "process",
240240
"command": "bash",
241-
"args": [ "${workspaceFolder}/src/SDK/Utilities/stop_all.sh" ],
241+
"args": [ "${workspaceFolder}/devops/scripts/stop_all.sh" ],
242242
"problemMatcher": "$msCompile",
243243
"windows": {
244-
"command": "${workspaceFolder}/src/SDK/Utilities/stop_all.bat",
244+
"command": "${workspaceFolder}/devops/scripts/stop_all.bat",
245245
"args": []
246246
}
247247
},

‎src/server/Modules/RuntimeLocation.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public enum RuntimeLocation
1616
Local,
1717

1818
/// <summary>
19-
/// The runtime is installed in a shared location, typically /src/runtimes or app/runtimes.
19+
/// The runtime is installed in a shared location, typically /runtimes or app/runtimes.
2020
/// Folder name is given by AppSettings.RuntimesDirPath.
2121
/// </summary>
2222
Shared,

‎src/server/Program.cs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -365,23 +365,22 @@ private static void KillOrphanedProcesses()
365365
return;
366366

367367
string baseDir = GetAppRootPath();
368-
string offsetDir = SystemInfo.IsDevelopmentCode? "src/" : string.Empty;
369-
string utilitiesDir = Path.Combine(baseDir, offsetDir, "SDK/Utilities/");
368+
string scriptsDir = Path.Combine(baseDir, "devops/scripts/");
370369

371370
try
372371
{
373372
Console.WriteLine("Stopping any orphaned Processes.");
374373

375374
ProcessStartInfo procStartInfo;
376375
if (SystemInfo.IsWindows)
377-
procStartInfo = new ProcessStartInfo(Path.Combine(utilitiesDir, "stop_all.bat"));
376+
procStartInfo = new ProcessStartInfo(Path.Combine(scriptsDir, "stop_all.bat"));
378377
else if (SystemInfo.IsMacOS)
379-
procStartInfo = new ProcessStartInfo("bash", '"' + Path.Combine(utilitiesDir, "stop_all.sh") + '"');
378+
procStartInfo = new ProcessStartInfo("bash", '"' + Path.Combine(scriptsDir, "stop_all.sh") + '"');
380379
else
381-
procStartInfo = new ProcessStartInfo("bash", Path.Combine(utilitiesDir, "stop_all.sh"));
380+
procStartInfo = new ProcessStartInfo("bash", Path.Combine(scriptsDir, "stop_all.sh"));
382381

383382
procStartInfo.UseShellExecute = false;
384-
procStartInfo.WorkingDirectory = Path.GetDirectoryName(utilitiesDir);
383+
procStartInfo.WorkingDirectory = Path.GetDirectoryName(scriptsDir);
385384
procStartInfo.CreateNoWindow = false;
386385
procStartInfo.WindowStyle = ProcessWindowStyle.Hidden;
387386

0 commit comments

Comments
 (0)