Skip to content

Commit f266f19

Browse files
ChrisMaunderChrisMaunder
committed
Merge branch 'v2.7.0' of https://github.com/codeproject/CodeProject.AI-Server into v2.7.0
2 parents fc1dd4a + 880e71c commit f266f19

40 files changed

+437
-441
lines changed

‎devops/scripts/utils.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1338,12 +1338,12 @@ function setupPython () {
13381338
writeLine 'done' $color_success
13391339

13401340
#hack
1341-
if [ "$os" = "linux" ]; then
1341+
#if [ "$os" = "linux" ]; then
13421342
write 'Installing updated setuptools in venv...' $color_primary
13431343
"$venvPythonCmdPath" -m pip install -U setuptools >/dev/null 2>/dev/null &
13441344
spin $!
13451345
writeLine "done" $color_success
1346-
fi
1346+
#fi
13471347

13481348
return 0
13491349
}

‎modules/ObjectDetectionYOLOv5-6.2/modulesettings.macos.arm64.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
"Modules": {
33

44
"ObjectDetectionYOLOv5-6.2": {
5+
"LaunchSettings": {
6+
"Runtime": "python3.9"
7+
},
58
"EnvironmentVariables": {
69
// fallback to cpu if an operation missing
710
"PYTORCH_ENABLE_MPS_FALLBACK": "1"

‎modules/ObjectDetectionYOLOv5-6.2/requirements.jetson.txt‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
#! Python3.6
22
# Requirements for Nvidia Jetson (Jetson is linux,Arm64, and has CUDA installed)
33

4-
Pandas # Installing Pandas, a data analysis / data manipulation tool
5-
CoreMLTools # Installing CoreMLTools, for working with .mlmodel format models
6-
OpenCV-Python # Installing OpenCV, the Open source Computer Vision library
7-
Pillow # Installing Pillow, a Python Image Library
8-
SciPy # Installing SciPy, a library for mathematics, science, and engineering
9-
PyYAML # Installing PyYAML, a library for reading configuration files
4+
Pandas # Installing Pandas, a data analysis / data manipulation tool
5+
CoreMLTools # Installing CoreMLTools, for working with .mlmodel format models
6+
OpenCV-Python # Installing OpenCV, the Open source Computer Vision library
7+
Pillow # Installing Pillow, a Python Image Library
8+
SciPy # Installing SciPy, a library for mathematics, science, and engineering
9+
PyYAML # Installing PyYAML, a library for reading configuration files
1010

1111
# Specific versions that match the models we're using. This requires <= Python 3.9. Any
1212
# version higher can use Python 3.10
13-
# Torch==1.10.2 # Installing Torch, for Tensor computation and Deep neural networks
14-
# TorchVision==0.11.3 # Installing TorchVision, for Computer Vision based AI
13+
# Torch==1.10.2 # Installing Torch, for Tensor computation and Deep neural networks
14+
# TorchVision==0.11.3 # Installing TorchVision, for Computer Vision based AI
1515

1616
# ..except we need to be even more specific:
1717
# https://discuss.pytorch.org/t/failed-to-load-image-python-extension-could-not-find-module/140278/15
18-
# torch==1.10.0
19-
# torchvision==0.10.0
18+
# torch==1.10.0 # Installing Torch, for Tensor computation and Deep neural networks
19+
# torchvision==0.10.0 # Installing TorchVision, for Computer Vision based AI
2020

2121
# the Ultralytics Yolov5 package
22-
yolov5==6.2.3 # Installing Ultralytics YoloV5 package for object detection in images
22+
yolov5==6.2.3 # Installing Ultralytics YoloV5 package for object detection in images
2323

2424
# We won't install Torch here at all. It will be done via wheel install in the setup script
2525

26-
TorchVision # Installing TorchVision, for Computer Vision based AI
26+
TorchVision # Installing TorchVision, for Computer Vision based AI
2727

2828
# We need this, but we don't need this.
29-
Seaborn # Installing Seaborn, a data visualization library based on matplotlib
29+
Seaborn # Installing Seaborn, a data visualization library based on matplotlib
3030

31+
# setuptools # Installing setuptools for managing Python packages
3132
CodeProject-AI-SDK # Installing the CodeProject.AI SDK
3233

3334
# last line empty.

‎modules/ObjectDetectionYOLOv5-6.2/requirements.linux.arm64.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ yolov5==6.2.3 # Installing Ultralytics YoloV5 package for obje
2121
# We need this, but we don't need this.
2222
Seaborn # Installing Seaborn, a data visualization library based on matplotlib
2323

24+
# setuptools # Installing setuptools for managing Python packages
2425
CodeProject-AI-SDK # Installing the CodeProject.AI SDK
2526

2627
# last line empty.

‎modules/ObjectDetectionYOLOv5-6.2/requirements.linux.cuda.txt‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,25 @@
22

33
# General CUDA requirements for Linux (fallback if other CUDA-specific files aren't eligible)
44

5-
Pandas # Installing Pandas, a data analysis / data manipulation tool
6-
CoreMLTools # Installing CoreMLTools, for working with .mlmodel format models
7-
OpenCV-Python # Installing OpenCV, the Open source Computer Vision library
8-
Pillow<10.0.0 # Installing Pillow, a Python Image Library
9-
SciPy # Installing SciPy, a library for mathematics, science, and engineering
10-
PyYAML # Installing PyYAML, a library for reading configuration files
5+
Pandas # Installing Pandas, a data analysis / data manipulation tool
6+
CoreMLTools # Installing CoreMLTools, for working with .mlmodel format models
7+
OpenCV-Python # Installing OpenCV, the Open source Computer Vision library
8+
Pillow<10.0.0 # Installing Pillow, a Python Image Library
9+
SciPy # Installing SciPy, a library for mathematics, science, and engineering
10+
PyYAML # Installing PyYAML, a library for reading configuration files
1111

1212
## For CUDA 11.7 (NOT torch 2.0+)
1313
--find-links https://download.pytorch.org/whl/torch_stable.html
14-
torch==1.13.0+cu117 # Installing PyTorch, an open source machine learning framework
14+
torch==1.13.0+cu117 # Installing PyTorch, an open source machine learning framework
1515
--find-links https://download.pytorch.org/whl/torch_stable.html
16-
torchvision==0.14.0+cu117 # Installing TorchVision, for working with computer vision models
16+
torchvision==0.14.0+cu117 # Installing TorchVision, for working with computer vision models
1717

18-
yolov5==6.2.3 # Installing Ultralytics YoloV5 package for object detection in images
18+
yolov5==6.2.3 # Installing Ultralytics YoloV5 package for object detection in images
1919

2020
# We need this, but we don't need this.
21-
Seaborn # Installing Seaborn, a data visualization library based on matplotlib
21+
Seaborn # Installing Seaborn, a data visualization library based on matplotlib
2222

23+
# setuptools # Installing setuptools for managing Python packages
2324
CodeProject-AI-SDK # Installing the CodeProject.AI SDK
2425

2526
# last line empty..

‎modules/ObjectDetectionYOLOv5-6.2/requirements.linux.cuda11.txt‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,25 @@
22

33
# CUDA requirements for Linux with CUDA 11.7+ installed
44

5-
Pandas # Installing Pandas, a data analysis / data manipulation tool
6-
CoreMLTools # Installing CoreMLTools, for working with .mlmodel format models
7-
OpenCV-Python # Installing OpenCV, the Open source Computer Vision library
8-
Pillow<10.0.0 # Installing Pillow, a Python Image Library
9-
SciPy # Installing SciPy, a library for mathematics, science, and engineering
10-
PyYAML # Installing PyYAML, a library for reading configuration files
5+
Pandas # Installing Pandas, a data analysis / data manipulation tool
6+
CoreMLTools # Installing CoreMLTools, for working with .mlmodel format models
7+
OpenCV-Python # Installing OpenCV, the Open source Computer Vision library
8+
Pillow<10.0.0 # Installing Pillow, a Python Image Library
9+
SciPy # Installing SciPy, a library for mathematics, science, and engineering
10+
PyYAML # Installing PyYAML, a library for reading configuration files
1111

1212
## For CUDA 11.7 (NOT torch 2.0+)
1313
--find-links https://download.pytorch.org/whl/torch_stable.html
14-
torch==1.13.0+cu117 # Installing PyTorch, an open source machine learning framework
14+
torch==1.13.0+cu117 # Installing PyTorch, an open source machine learning framework
1515
--find-links https://download.pytorch.org/whl/torch_stable.html
16-
torchvision==0.14.0+cu117 # Installing TorchVision, for working with computer vision models
16+
torchvision==0.14.0+cu117 # Installing TorchVision, for working with computer vision models
1717

18-
yolov5==6.2.3 # Installing Ultralytics YoloV5 package for object detection in images
18+
yolov5==6.2.3 # Installing Ultralytics YoloV5 package for object detection in images
1919

2020
# We need this, but we don't need this.
21-
Seaborn # Installing Seaborn, a data visualization library based on matplotlib
21+
Seaborn # Installing Seaborn, a data visualization library based on matplotlib
2222

23+
# setuptools # Installing setuptools for managing Python packages
2324
CodeProject-AI-SDK # Installing the CodeProject.AI SDK
2425

2526
# last line empty..

‎modules/ObjectDetectionYOLOv5-6.2/requirements.linux.cuda11_5.txt‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,25 @@
22

33
# CUDA requirements for Linux with CUDA 11.5 installed (default for WSL)
44

5-
Pandas # Installing Pandas, a data analysis / data manipulation tool
6-
CoreMLTools # Installing CoreMLTools, for working with .mlmodel format models
7-
OpenCV-Python # Installing OpenCV, the Open source Computer Vision library
8-
Pillow<10.0.0 # Installing Pillow, a Python Image Library
9-
SciPy # Installing SciPy, a library for mathematics, science, and engineering
10-
PyYAML # Installing PyYAML, a library for reading configuration files
5+
Pandas # Installing Pandas, a data analysis / data manipulation tool
6+
CoreMLTools # Installing CoreMLTools, for working with .mlmodel format models
7+
OpenCV-Python # Installing OpenCV, the Open source Computer Vision library
8+
Pillow<10.0.0 # Installing Pillow, a Python Image Library
9+
SciPy # Installing SciPy, a library for mathematics, science, and engineering
10+
PyYAML # Installing PyYAML, a library for reading configuration files
1111

1212
## For CUDA 11.3 (will work in CUDA 11.5)
1313
--find-links https://download.pytorch.org/whl/torch_stable.html
14-
torch==1.12.1+cu113 # Installing PyTorch, an open source machine learning framework
14+
torch==1.12.1+cu113 # Installing PyTorch, an open source machine learning framework
1515
--find-links https://download.pytorch.org/whl/torch_stable.html
16-
torchvision==0.13.1+cu113 # Installing TorchVision, for working with computer vision models
16+
torchvision==0.13.1+cu113 # Installing TorchVision, for working with computer vision models
1717

18-
yolov5==6.2.3 # Installing Ultralytics YoloV5 package for object detection in images
18+
yolov5==6.2.3 # Installing Ultralytics YoloV5 package for object detection in images
1919

2020
# We need this, but we don't need this.
21-
Seaborn # Installing Seaborn, a data visualization library based on matplotlib
21+
Seaborn # Installing Seaborn, a data visualization library based on matplotlib
2222

23+
# setuptools # Installing setuptools for managing Python packages
2324
CodeProject-AI-SDK # Installing the CodeProject.AI SDK
2425

2526
# last line empty..

‎modules/ObjectDetectionYOLOv5-6.2/requirements.linux.cuda12.txt‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,33 @@
22

33
# CUDA requirements for Linux with CUDA 12 installed
44

5-
Pandas # Installing Pandas, a data analysis / data manipulation tool
6-
CoreMLTools # Installing CoreMLTools, for working with .mlmodel format models
7-
OpenCV-Python # Installing OpenCV, the Open source Computer Vision library
8-
Pillow<10.0.0 # Installing Pillow, a Python Image Library
9-
SciPy # Installing SciPy, a library for mathematics, science, and engineering
10-
PyYAML # Installing PyYAML, a library for reading configuration files
5+
Pandas # Installing Pandas, a data analysis / data manipulation tool
6+
CoreMLTools # Installing CoreMLTools, for working with .mlmodel format models
7+
OpenCV-Python # Installing OpenCV, the Open source Computer Vision library
8+
Pillow<10.0.0 # Installing Pillow, a Python Image Library
9+
SciPy # Installing SciPy, a library for mathematics, science, and engineering
10+
PyYAML # Installing PyYAML, a library for reading configuration files
1111

1212
## For CUDA 12.1 (nightly)
1313
# --pre
1414
# --index-url https://download.pytorch.org/whl/nightly/cu121
15-
# torch # Installing PyTorch, an open source machine learning framework
15+
# torch # Installing PyTorch, an open source machine learning framework
1616
# --pre
1717
# --index-url https://download.pytorch.org/whl/nightly/cu121
18-
# torchvision # Installing TorchVision, for working with computer vision models
18+
# torchvision # Installing TorchVision, for working with computer vision models
1919

2020
## For CUDA 11.7 (will work in CUDA 12)
2121
--extra-index-url https://download.pytorch.org/whl/cu117
22-
torch==1.13.1+cu117 # Installing PyTorch, an open source machine learning framework
22+
torch==1.13.1+cu117 # Installing PyTorch, an open source machine learning framework
2323
--extra-index-url https://download.pytorch.org/whl/cu117
24-
torchvision==0.14.1+cu117 # Installing TorchVision, for working with computer vision models
24+
torchvision==0.14.1+cu117 # Installing TorchVision, for working with computer vision models
2525

26-
yolov5==6.2.3 # Installing Ultralytics YoloV5 package for object detection in images
26+
yolov5==6.2.3 # Installing Ultralytics YoloV5 package for object detection in images
2727

2828
# We need this, but we don't need this.
29-
Seaborn # Installing Seaborn, a data visualization library based on matplotlib
29+
Seaborn # Installing Seaborn, a data visualization library based on matplotlib
3030

31+
# setuptools # Installing setuptools for managing Python packages
3132
CodeProject-AI-SDK # Installing the CodeProject.AI SDK
3233

3334
# last line empty..

‎modules/ObjectDetectionYOLOv5-6.2/requirements.linux.rocm.txt‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
#! Python3.7
22

3-
Pandas # Installing Pandas, a data analysis / data manipulation tool
4-
CoreMLTools # Installing CoreMLTools, for working with .mlmodel format models
5-
OpenCV-Python # Installing OpenCV, the Open source Computer Vision library
6-
Pillow<10.0.0 # Installing Pillow, a Python Image Library
7-
SciPy # Installing SciPy, a library for mathematics, science, and engineering
8-
PyYAML # Installing PyYAML, a library for reading configuration files
3+
Pandas # Installing Pandas, a data analysis / data manipulation tool
4+
CoreMLTools # Installing CoreMLTools, for working with .mlmodel format models
5+
OpenCV-Python # Installing OpenCV, the Open source Computer Vision library
6+
Pillow<10.0.0 # Installing Pillow, a Python Image Library
7+
SciPy # Installing SciPy, a library for mathematics, science, and engineering
8+
PyYAML # Installing PyYAML, a library for reading configuration files
99

1010
--extra-index-url https://download.pytorch.org/whl/rocm5.2
11-
torch==1.13.1+rocm5.2 # Installing PyTorch, an open source machine learning framework
11+
torch==1.13.1+rocm5.2 # Installing PyTorch, an open source machine learning framework
1212
--extra-index-url https://download.pytorch.org/whl/rocm5.2
13-
torchvision==0.14.1+rocm5.2 # Installing TorchVision, for working with computer vision models
13+
torchvision==0.14.1+rocm5.2 # Installing TorchVision, for working with computer vision models
1414

15-
yolov5==6.2.3 # Installing Ultralytics YoloV5 package for object detection in images
15+
yolov5==6.2.3 # Installing Ultralytics YoloV5 package for object detection in images
1616

1717
# We need this, but we don't need this.
18-
Seaborn # Installing Seaborn, a data visualization library based on matplotlib
18+
Seaborn # Installing Seaborn, a data visualization library based on matplotlib
1919

20+
# setuptools # Installing setuptools for managing Python packages
2021
CodeProject-AI-SDK # Installing the CodeProject.AI SDK
2122

2223
# last line empty..

‎modules/ObjectDetectionYOLOv5-6.2/requirements.linux.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,22 @@ PyYAML # Installing PyYAML, a library for reading confi
1111
# torch-directml # Installing the PyTorch DirectML plugin
1212

1313
--extra-index-url https://download.pytorch.org/whl/cpu
14-
Torch # Installing Torch, for Tensor computation and Deep neural networks
14+
Torch # Installing Torch, for Tensor computation and Deep neural networks
1515
--extra-index-url https://download.pytorch.org/whl/cpu
16-
TorchVision # Installing TorchVision, for Computer Vision based AI
16+
TorchVision # Installing TorchVision, for Computer Vision based AI
1717

1818
# We'll lock down to Torch 1.X, CPU-only to play it safe
1919
#--extra-index-url https://download.pytorch.org/whl/cpu
20-
#torch==1.13.1+cpu # Installing Torch, for Tensor computation and Deep neural networks
20+
#torch==1.13.1+cpu `# Installing Torch, for Tensor computation and Deep neural networks
2121
#--extra-index-url https://download.pytorch.org/whl/cpu
22-
#torchvision==0.14.1+cpu # Installing TorchVision, for Computer Vision based AI
22+
#torchvision==0.14.1+cpu `# Installing TorchVision, for Computer Vision based AI
2323

2424
yolov5==6.2.3 # Installing Ultralytics YoloV5 package for object detection in images
2525

2626
# We need this, but we don't need this.
2727
Seaborn # Installing Seaborn, a data visualization library based on matplotlib
2828

29+
# setuptools # Installing setuptools for managing Python packages
2930
CodeProject-AI-SDK # Installing the CodeProject.AI SDK
3031

3132
# last line empty.

0 commit comments

Comments
 (0)