Merge pull request #1 from edoyango/fix-CI

Fix PIL requirement

.github/workflows/ci-testing.yml

@@ -12,40 +12,6 @@ on:
     - cron: '0 0 * * *'  # runs at 00:00 UTC every day
 
 jobs:
-  Benchmarks:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-latest ]
-        python-version: [ '3.10' ]  # requires python<=3.10
-        model: [ yolov5n ]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: 'pip' # caching pip dependencies
-      - name: Install requirements
-        run: |
-          python -m pip install --upgrade pip wheel
-          pip install -r requirements.txt coremltools openvino-dev tensorflow-cpu --extra-index-url https://download.pytorch.org/whl/cpu
-          python --version
-          pip --version
-          pip list
-      - name: Benchmark DetectionModel
-        run: |
-          python benchmarks.py --data coco128.yaml --weights ${{ matrix.model }}.pt --img 320 --hard-fail 0.29
-      - name: Benchmark SegmentationModel
-        run: |
-          python benchmarks.py --data coco128-seg.yaml --weights ${{ matrix.model }}-seg.pt --img 320 --hard-fail 0.22
-      - name: Test predictions
-        run: |
-          python export.py --weights ${{ matrix.model }}-cls.pt --include onnx --img 224
-          python detect.py --weights ${{ matrix.model }}.onnx --img 320
-          python segment/predict.py --weights ${{ matrix.model }}-seg.onnx --img 320
-          python classify/predict.py --weights ${{ matrix.model }}-cls.onnx --img 224
-
   Tests:
     timeout-minutes: 60
     runs-on: ${{ matrix.os }}

requirements.txt

@@ -4,15 +4,15 @@
 # Base ------------------------------------------------------------------------
 gitpython>=3.1.30
 matplotlib>=3.3
-numpy>=1.18.5
+numpy>=1.18.5,<2
 opencv-python>=4.1.1
-Pillow>=7.1.2
+Pillow>=7.1.2,<10
 psutil  # system resources
 PyYAML>=5.3.1
 requests>=2.23.0
 scipy>=1.4.1
 thop>=0.1.1  # FLOPs computation
-torch>=1.7.0  # see https://pytorch.org/get-started/locally (recommended)
+torch>=1.7.0,<1.14  # see https://pytorch.org/get-started/locally (recommended)
 torchvision>=0.8.1
 tqdm>=4.64.0
 # protobuf<=3.20.1  # https://github.com/ultralytics/yolov5/issues/8012

utils/loggers/__init__.py

@@ -153,6 +153,11 @@ class GenericLogger:
         if self.tb:
             log_tensorboard_graph(self.tb, model, imgsz)
 
+    def log_model(self, model_path, epoch=0, metadata={}):
+        # a placeholder
+
+        return None
+
 
 def log_tensorboard_graph(tb, model, imgsz=(640, 640)):
     # Log model graph to TensorBoard