Skip to content

Commit 445c305

Browse files
author
Chris Maunder
committed
Merge branch 'v2.9.0'
2 parents 45d6d14 + d8f6d1e commit 445c305

File tree

7 files changed

+160
-3
lines changed

7 files changed

+160
-3
lines changed

‎modules/ObjectDetectionYOLOv5-6.2/modulesettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
},
4747

4848
"InstallOptions" : {
49-
"Platforms": [ "all", "!raspberrypi", "!jetson" ],
49+
"Platforms": [ "all", "!raspberrypi", "!orangepi", "!jetson", "!radxarock" ],
5050
"ModuleReleases": [ // Which server version is compatible with each version of this module.
5151
{ "ModuleVersion": "1.0", "ServerVersionRange": [ "1.0", "2.0.8" ], "ReleaseDate": "2022-03-01" },
5252
{ "ModuleVersion": "1.2", "ServerVersionRange": [ "2.1.0", "2.1.6" ], "ReleaseDate": "2023-03-20", "ReleaseNotes": "Updated for CodeProject.AI Server 2.1" },

‎pyrightconfig.json

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
// "include": [
3+
// "src"
4+
// ],
5+
6+
"exclude": [
7+
"**/node_modules",
8+
"**/__pycache__",
9+
"**/venv",
10+
"src/experimental",
11+
"src/typestubs"
12+
],
13+
14+
"ignore": [
15+
"src/oldstuff"
16+
],
17+
18+
"defineConstant": {
19+
"DEBUG": true
20+
},
21+
22+
"stubPath": "src/stubs",
23+
24+
"reportMissingImports": "error",
25+
"reportMissingTypeStubs": false,
26+
27+
// "pythonVersion": "3.6",
28+
// "pythonPlatform": "Linux",
29+
30+
// "executionEnvironments": [
31+
// {
32+
// "root": "src/web",
33+
// "pythonVersion": "3.5",
34+
// "pythonPlatform": "Windows",
35+
// "extraPaths": [
36+
// "src/service_libs"
37+
// ],
38+
// "reportMissingImports": "warning"
39+
// },
40+
// {
41+
// "root": "src/sdk",
42+
// "pythonVersion": "3.0",
43+
// "extraPaths": [
44+
// "src/backend"
45+
// ]
46+
// },
47+
// {
48+
// "root": "src/tests",
49+
// "extraPaths": [
50+
// "src/tests/e2e",
51+
// "src/sdk"
52+
// ]
53+
// },
54+
// {
55+
// "root": "src"
56+
// }
57+
// ]
58+
}

‎src/demos/modules/PythonSimple/requirements.orangepi.txt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#! Python3.8
2+
3+
# Based on the answer for pleas to Ultralytics to not include the full bloated NVIDIA libraries
4+
# when no GPU present: https://github.com/ultralytics/ultralytics/issues/749#issuecomment-1806360075
5+
6+
opencv-python-headless==4.8.1.78 # Installing OpenCV (headless), the Open source Computer Vision library
7+
numpy==1.26.0 # Installing NumPy, a package for scientific computing
8+
matplotlib>=3.3.0 # Installing Matplotlib, the Python plotting package
9+
opencv-python>=4.6.0 # Installing OpenCV, the Open source Computer Vision library
10+
pillow>=7.1.2 # Installing Pillow, a Python Image Library
11+
pyyaml>=5.3.1 # Installing PyYAML, a library for reading configuration files
12+
requests>=2.23.0 # Installing Requests, the HTTP library
13+
scipy>=1.4.1 # Installing SciPy, a library for mathematics, science, and engineering
14+
tqdm>=4.64.0 # Installing TDQM, the Fast, Extensible Progress Meter
15+
pandas>=1.1.4 # Installing Pandas, a data analysis / data manipulation tool
16+
psutil # Installing psutil, a tool to check system utilization
17+
dill # Installing dill, for serializing and de-serializing Python objects
18+
py-cpuinfo # Installing py-cpuinfo to allow us to query CPU info
19+
20+
#Install torch and torchvision CPU only versions
21+
-f https://download.pytorch.org/whl/cpu/torch_stable.html
22+
torch==1.8.0 # Installing PyTorch, for Tensor computation and Deep neural networks
23+
-f https://download.pytorch.org/whl/cpu/torch_stable.html
24+
torchvision==0.9.1 # Installing TorchVision, for Computer Vision based AI
25+
26+
# Explicitly install ultralytics without optional dependencies (like CUDA).
27+
--no-deps
28+
ultralytics==8.1.2 # Installing Ultralytics package for object detection in images
29+
30+
31+
CodeProject-AI-SDK # Installing the CodeProject.AI SDK
32+
33+
# last line empty.

‎src/demos/modules/PythonSimple/requirements.radxarock.txt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#! Python3.8
2+
3+
# Based on the answer for pleas to Ultralytics to not include the full bloated NVIDIA libraries
4+
# when no GPU present: https://github.com/ultralytics/ultralytics/issues/749#issuecomment-1806360075
5+
6+
opencv-python-headless==4.8.1.78 # Installing OpenCV (headless), the Open source Computer Vision library
7+
numpy==1.26.0 # Installing NumPy, a package for scientific computing
8+
matplotlib>=3.3.0 # Installing Matplotlib, the Python plotting package
9+
opencv-python>=4.6.0 # Installing OpenCV, the Open source Computer Vision library
10+
pillow>=7.1.2 # Installing Pillow, a Python Image Library
11+
pyyaml>=5.3.1 # Installing PyYAML, a library for reading configuration files
12+
requests>=2.23.0 # Installing Requests, the HTTP library
13+
scipy>=1.4.1 # Installing SciPy, a library for mathematics, science, and engineering
14+
tqdm>=4.64.0 # Installing TDQM, the Fast, Extensible Progress Meter
15+
pandas>=1.1.4 # Installing Pandas, a data analysis / data manipulation tool
16+
psutil # Installing psutil, a tool to check system utilization
17+
dill # Installing dill, for serializing and de-serializing Python objects
18+
py-cpuinfo # Installing py-cpuinfo to allow us to query CPU info
19+
20+
#Install torch and torchvision CPU only versions
21+
-f https://download.pytorch.org/whl/cpu/torch_stable.html
22+
torch==1.8.0 # Installing PyTorch, for Tensor computation and Deep neural networks
23+
-f https://download.pytorch.org/whl/cpu/torch_stable.html
24+
torchvision==0.9.1 # Installing TorchVision, for Computer Vision based AI
25+
26+
# Explicitly install ultralytics without optional dependencies (like CUDA).
27+
--no-deps
28+
ultralytics==8.1.2 # Installing Ultralytics package for object detection in images
29+
30+
31+
CodeProject-AI-SDK # Installing the CodeProject.AI SDK
32+
33+
# last line empty.

‎src/demos/modules/PythonSimple/requirements.raspberrypi.txt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#! Python3.8
2+
3+
# Based on the answer for pleas to Ultralytics to not include the full bloated NVIDIA libraries
4+
# when no GPU present: https://github.com/ultralytics/ultralytics/issues/749#issuecomment-1806360075
5+
6+
opencv-python-headless==4.8.1.78 # Installing OpenCV (headless), the Open source Computer Vision library
7+
numpy==1.26.0 # Installing NumPy, a package for scientific computing
8+
matplotlib>=3.3.0 # Installing Matplotlib, the Python plotting package
9+
opencv-python>=4.6.0 # Installing OpenCV, the Open source Computer Vision library
10+
pillow>=7.1.2 # Installing Pillow, a Python Image Library
11+
pyyaml>=5.3.1 # Installing PyYAML, a library for reading configuration files
12+
requests>=2.23.0 # Installing Requests, the HTTP library
13+
scipy>=1.4.1 # Installing SciPy, a library for mathematics, science, and engineering
14+
tqdm>=4.64.0 # Installing TDQM, the Fast, Extensible Progress Meter
15+
pandas>=1.1.4 # Installing Pandas, a data analysis / data manipulation tool
16+
psutil # Installing psutil, a tool to check system utilization
17+
dill # Installing dill, for serializing and de-serializing Python objects
18+
py-cpuinfo # Installing py-cpuinfo to allow us to query CPU info
19+
20+
#Install torch and torchvision CPU only versions
21+
-f https://download.pytorch.org/whl/cpu/torch_stable.html
22+
torch==1.8.0 # Installing PyTorch, for Tensor computation and Deep neural networks
23+
-f https://download.pytorch.org/whl/cpu/torch_stable.html
24+
torchvision==0.9.1 # Installing TorchVision, for Computer Vision based AI
25+
26+
# Explicitly install ultralytics without optional dependencies (like CUDA).
27+
--no-deps
28+
ultralytics==8.1.2 # Installing Ultralytics package for object detection in images
29+
30+
31+
CodeProject-AI-SDK # Installing the CodeProject.AI SDK
32+
33+
# last line empty.

‎src/scripts/utils.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@ function setupDotNet () {
10111011
# link and env variables
10121012
writeLine "Link Binaries to /usr/local/bin..."
10131013
if [ -e /usr/local/bin/dotnet ]; then
1014-
rm /usr/local/bin/dotnet
1014+
sudo rm /usr/local/bin/dotnet
10151015
fi
10161016
sudo ln -s ${dotnet_path}dotnet /usr/local/bin
10171017

‎src/server/appsettings.development.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
// URLs and Endpoints on GitHub.io
1414
"ServerVersionCheckUrl": "https://codeproject.github.io/codeproject.ai/config/version.json",
15-
"ServerDownloadUrl": "https://codeproject.github.io/codeproject.ai/latest.html", // Link to download latest server
15+
"ServerDownloadUrl": "https://codeproject.github.io/codeproject.ai/latest.html" // Link to download latest server
1616
},
1717

1818
"MeshOptions": {

0 commit comments

Comments
 (0)