Merge branch 'master' into trtNMS

ultralytics · Dec 27, 2022 · f8d117e · f8d117e
2 parents 60cb102 + 8ca1826
commit f8d117e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -9,7 +9,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v7
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: |

diff --git a/requirements.txt b/requirements.txt
@@ -44,6 +44,6 @@ seaborn>=0.11.0
 # Extras ----------------------------------------------------------------------
 # mss  # screenshots
 # albumentations>=1.0.3
-# pycocotools>=2.0  # COCO mAP
+# pycocotools>=2.0.6  # COCO mAP
 # roboflow
 # ultralytics  # HUB https://hub.ultralytics.com
diff --git a/segment/val.py b/segment/val.py
@@ -159,7 +159,7 @@ def run(
         callbacks=Callbacks(),
 ):
     if save_json:
-        check_requirements(['pycocotools'])
+        check_requirements('pycocotools>=2.0.6')
         process = process_mask_native  # more accurate
     else:
         process = process_mask  # faster

diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile
@@ -12,12 +12,12 @@ ADD https://ultralytics.com/assets/Arial.ttf https://ultralytics.com/assets/Aria
 # Install linux packages
 RUN apt update && apt install --no-install-recommends -y zip htop screen libgl1-mesa-glx
 
-# Install pip packages
+# Install pip packages (uninstall torch nightly in favor of stable)
 COPY requirements.txt .
 RUN python -m pip install --upgrade pip wheel
-RUN pip uninstall -y Pillow torchtext  # torch torchvision
-RUN pip install --no-cache -r requirements.txt ultralytics albumentations comet gsutil notebook Pillow>=9.1.0 \
-    'opencv-python<4.6.0.66' \
+RUN pip uninstall -y Pillow torchtext torch torchvision
+RUN pip install --no-cache -r requirements.txt albumentations comet gsutil notebook 'opencv-python<4.6.0.66'  \
+    Pillow>=9.1.0 pycocotools>=2.0.6 ultralytics \
     --extra-index-url https://download.pytorch.org/whl/cu113
 
 # Create working directory

diff --git a/val.py b/val.py
@@ -309,7 +309,7 @@ def run(
             json.dump(jdict, f)
 
         try:  # https://github.com/cocodataset/cocoapi/blob/master/PythonAPI/pycocoEvalDemo.ipynb
-            check_requirements('pycocotools')
+            check_requirements('pycocotools>=2.0.6')
             from pycocotools.coco import COCO
             from pycocotools.cocoeval import COCOeval