Merge branch 'main' into MMdet-Language-Vision-models-support

obss · Nov 22, 2024 · 1e0f25e · 1e0f25e
2 parents 3d20f32 + 4981c57
commit 1e0f25e
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 1,073 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -109,10 +109,6 @@ jobs:
         run: >
           pip install ultralytics==8.0.207
 
-      - name: Install super-gradients(3.3.1)
-        run: >
-          pip install super-gradients==3.3.1
-
       - name: Unittest for SAHI+YOLOV5/MMDET/Detectron2 on all platforms
         run: |
           python -m unittest

diff --git a/.github/workflows/package_testing.yml b/.github/workflows/package_testing.yml
@@ -87,10 +87,6 @@ jobs:
         run: >
           pip install ultralytics==8.0.207
 
-      - name: Install super-gradients(3.3.1)
-        run: >
-          pip install super-gradients==3.3.1
-
       - name: Install latest SAHI package
         run: >
           pip install --upgrade --force-reinstall sahi

diff --git a/README.md b/README.md
@@ -80,9 +80,7 @@ Object detection and instance segmentation are by far the most important applica
 
 - `RT-DETR` + `SAHI` walkthrough: <a href="https://colab.research.google.com/github/obss/sahi/blob/main/demo/inference_for_rtdetr.ipynb"><img src="https://colab.research.google.com/assets/colab-badge.svg" alt="sahi-rtdetr"></a> (NEW)
 
-- `YOLOv8` + `SAHI` walkthrough: <a href="https://colab.research.google.com/github/obss/sahi/blob/main/demo/inference_for_yolov8.ipynb"><img src="https://colab.research.google.com/assets/colab-badge.svg" alt="sahi-yolov8"></a> (NEW)
-
-- `SuperGradients/YOLONAS` + `SAHI`: <a href="https://colab.research.google.com/github/obss/sahi/blob/main/demo/inference_for_yolonas.ipynb"><img src="https://colab.research.google.com/assets/colab-badge.svg" alt="sahi-yolonas"></a> (NEW)
+- `YOLOv8` + `SAHI` walkthrough: <a href="https://colab.research.google.com/github/obss/sahi/blob/main/demo/inference_for_yolov8.ipynb"><img src="https://colab.research.google.com/assets/colab-badge.svg" alt="sahi-yolov8"></a>
 
 - `DeepSparse` + `SAHI` walkthrough: <a href="https://colab.research.google.com/github/obss/sahi/blob/main/demo/inference_for_sparse_yolov5.ipynb"><img src="https://colab.research.google.com/assets/colab-badge.svg" alt="sahi-deepsparse"></a>
 

diff --git a/demo/inference_for_yolonas.ipynb b/demo/inference_for_yolonas.ipynb
diff --git a/sahi/__init__.py b/sahi/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.11.18"
+__version__ = "0.11.19"
 
 from sahi.annotation import BoundingBox, Category, Mask
 from sahi.auto_model import AutoDetectionModel

diff --git a/sahi/auto_model.py b/sahi/auto_model.py
@@ -11,7 +11,6 @@
     "huggingface": "HuggingfaceDetectionModel",
     "torchvision": "TorchVisionDetectionModel",
     "yolov5sparse": "Yolov5SparseDetectionModel",
-    "yolonas": "YoloNasDetectionModel",
     "yolov8onnx": "Yolov8OnnxDetectionModel",
 }
 

diff --git a/sahi/models/__init__.py b/sahi/models/__init__.py
@@ -1 +1 @@
-from . import base, detectron2, huggingface, mmdet, torchvision, yolonas, yolov5, yolov8onnx
+from . import base, detectron2, huggingface, mmdet, torchvision, yolov5, yolov8onnx
diff --git a/sahi/models/yolonas.py b/sahi/models/yolonas.py
diff --git a/tests/test_yolonasmodel.py b/tests/test_yolonasmodel.py
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		from . import base, detectron2, huggingface, mmdet, torchvision, yolonas, yolov5, yolov8onnx
		from . import base, detectron2, huggingface, mmdet, torchvision, yolov5, yolov8onnx