dgenerate-ultralytics-headless 8.3.229__tar.gz → 8.3.230__tar.gz

{dgenerate_ultralytics_headless-8.3.229 → dgenerate_ultralytics_headless-8.3.230}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dgenerate-ultralytics-headless
-Version: 8.3.229
+Version: 8.3.230
 Summary: Automatically built Ultralytics package with python-opencv-headless dependency instead of python-opencv
 Author-email: Glenn Jocher <glenn.jocher@ultralytics.com>, Jing Qiu <jing.qiu@ultralytics.com>
 Maintainer-email: Ultralytics <hello@ultralytics.com>
@@ -32,19 +32,19 @@ Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy<=2.3.4,>=1.23.0
-Requires-Dist: matplotlib<=3.10.7,>=3.3.0
-Requires-Dist: opencv-python-headless<=4.12.0.88,>=4.6.0
-Requires-Dist: pillow<=12.0.0,>=7.1.2
-Requires-Dist: pyyaml<=6.0.3,>=5.3.1
-Requires-Dist: requests<=2.32.5,>=2.23.0
-Requires-Dist: scipy<=1.16.3,>=1.4.1
-Requires-Dist: torch<=2.9.1,>=1.8.0; sys_platform != "win32"
-Requires-Dist: torch!=2.4.0,<=2.9.1,>=1.8.0; sys_platform == "win32"
-Requires-Dist: torchvision<=0.24.1,>=0.9.0
-Requires-Dist: psutil<=7.1.3,>=5.8.0
-Requires-Dist: polars<=1.35.2,>=0.20.0
-Requires-Dist: ultralytics-thop<=2.0.18
+Requires-Dist: numpy>=1.23.0
+Requires-Dist: matplotlib>=3.3.0
+Requires-Dist: opencv-python-headless>=4.6.0
+Requires-Dist: pillow>=7.1.2
+Requires-Dist: pyyaml>=5.3.1
+Requires-Dist: requests>=2.23.0
+Requires-Dist: scipy>=1.4.1
+Requires-Dist: torch>=1.8.0
+Requires-Dist: torch!=2.4.0,>=1.8.0; sys_platform == "win32"
+Requires-Dist: torchvision>=0.9.0
+Requires-Dist: psutil>=5.8.0
+Requires-Dist: polars>=0.20.0
+Requires-Dist: ultralytics-thop>=2.0.18
 Provides-Extra: dev
 Requires-Dist: ipython; extra == "dev"
 Requires-Dist: pytest; extra == "dev"

{dgenerate_ultralytics_headless-8.3.229 → dgenerate_ultralytics_headless-8.3.230}/dgenerate_ultralytics_headless.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dgenerate-ultralytics-headless
-Version: 8.3.229
+Version: 8.3.230
 Summary: Automatically built Ultralytics package with python-opencv-headless dependency instead of python-opencv
 Author-email: Glenn Jocher <glenn.jocher@ultralytics.com>, Jing Qiu <jing.qiu@ultralytics.com>
 Maintainer-email: Ultralytics <hello@ultralytics.com>
@@ -32,19 +32,19 @@ Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy<=2.3.4,>=1.23.0
-Requires-Dist: matplotlib<=3.10.7,>=3.3.0
-Requires-Dist: opencv-python-headless<=4.12.0.88,>=4.6.0
-Requires-Dist: pillow<=12.0.0,>=7.1.2
-Requires-Dist: pyyaml<=6.0.3,>=5.3.1
-Requires-Dist: requests<=2.32.5,>=2.23.0
-Requires-Dist: scipy<=1.16.3,>=1.4.1
-Requires-Dist: torch<=2.9.1,>=1.8.0; sys_platform != "win32"
-Requires-Dist: torch!=2.4.0,<=2.9.1,>=1.8.0; sys_platform == "win32"
-Requires-Dist: torchvision<=0.24.1,>=0.9.0
-Requires-Dist: psutil<=7.1.3,>=5.8.0
-Requires-Dist: polars<=1.35.2,>=0.20.0
-Requires-Dist: ultralytics-thop<=2.0.18
+Requires-Dist: numpy>=1.23.0
+Requires-Dist: matplotlib>=3.3.0
+Requires-Dist: opencv-python-headless>=4.6.0
+Requires-Dist: pillow>=7.1.2
+Requires-Dist: pyyaml>=5.3.1
+Requires-Dist: requests>=2.23.0
+Requires-Dist: scipy>=1.4.1
+Requires-Dist: torch>=1.8.0
+Requires-Dist: torch!=2.4.0,>=1.8.0; sys_platform == "win32"
+Requires-Dist: torchvision>=0.9.0
+Requires-Dist: psutil>=5.8.0
+Requires-Dist: polars>=0.20.0
+Requires-Dist: ultralytics-thop>=2.0.18
 Provides-Extra: dev
 Requires-Dist: ipython; extra == "dev"
 Requires-Dist: pytest; extra == "dev"

{dgenerate_ultralytics_headless-8.3.229 → dgenerate_ultralytics_headless-8.3.230}/dgenerate_ultralytics_headless.egg-info/requires.txt

@@ -1,20 +1,18 @@
-numpy<=2.3.4,>=1.23.0
-matplotlib<=3.10.7,>=3.3.0
-opencv-python-headless<=4.12.0.88,>=4.6.0
-pillow<=12.0.0,>=7.1.2
-pyyaml<=6.0.3,>=5.3.1
-requests<=2.32.5,>=2.23.0
-scipy<=1.16.3,>=1.4.1
-torchvision<=0.24.1,>=0.9.0
-psutil<=7.1.3,>=5.8.0
-polars<=1.35.2,>=0.20.0
-ultralytics-thop<=2.0.18
-
-[:sys_platform != "win32"]
-torch<=2.9.1,>=1.8.0
+numpy>=1.23.0
+matplotlib>=3.3.0
+opencv-python-headless>=4.6.0
+pillow>=7.1.2
+pyyaml>=5.3.1
+requests>=2.23.0
+scipy>=1.4.1
+torch>=1.8.0
+torchvision>=0.9.0
+psutil>=5.8.0
+polars>=0.20.0
+ultralytics-thop>=2.0.18
 
 [:sys_platform == "win32"]
-torch!=2.4.0,<=2.9.1,>=1.8.0
+torch!=2.4.0,>=1.8.0
 
 [dev]
 ipython

{dgenerate_ultralytics_headless-8.3.229 → dgenerate_ultralytics_headless-8.3.230}/pyproject.toml

@@ -61,19 +61,19 @@ classifiers = [
 
 # Required dependencies ------------------------------------------------------------------------------------------------
 dependencies = [
-    "numpy>=1.23.0,<=2.3.4",
-    "matplotlib>=3.3.0,<=3.10.7",
-    "opencv-python-headless>=4.6.0,<=4.12.0.88",
-    "pillow>=7.1.2,<=12.0.0",
-    "pyyaml>=5.3.1,<=6.0.3",
-    "requests>=2.23.0,<=2.32.5",
-    "scipy>=1.4.1,<=1.16.3",
-    "torch>=1.8.0,<=2.9.1; sys_platform != 'win32'",
-    "torch>=1.8.0,!=2.4.0,<=2.9.1; sys_platform == 'win32'", # Windows CPU errors w/ 2.4.0 https://github.com/ultralytics/ultralytics/issues/15049
-    "torchvision>=0.9.0,<=0.24.1",
-    "psutil>=5.8.0,<=7.1.3",  # system utilization
-    "polars>=0.20.0,<=1.35.2",
-    "ultralytics-thop<=2.0.18", # FLOPs computation https://github.com/ultralytics/thop
+    "numpy>=1.23.0",
+    "matplotlib>=3.3.0",
+    "opencv-python-headless>=4.6.0",
+    "pillow>=7.1.2",
+    "pyyaml>=5.3.1",
+    "requests>=2.23.0",
+    "scipy>=1.4.1",
+    "torch>=1.8.0",
+    "torch>=1.8.0,!=2.4.0; sys_platform == 'win32'", # Windows CPU errors w/ 2.4.0 https://github.com/ultralytics/ultralytics/issues/15049
+    "torchvision>=0.9.0",
+    "psutil>=5.8.0", # system utilization
+    "polars>=0.20.0",
+    "ultralytics-thop>=2.0.18", # FLOPs computation https://github.com/ultralytics/thop
 ]
 
 # Optional dependencies ------------------------------------------------------------------------------------------------

{dgenerate_ultralytics_headless-8.3.229 → dgenerate_ultralytics_headless-8.3.230}/ultralytics/__init__.py

@@ -1,6 +1,6 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
-__version__ = "8.3.229"
+__version__ = "8.3.230"
 
 import importlib
 import os

{dgenerate_ultralytics_headless-8.3.229 → dgenerate_ultralytics_headless-8.3.230}/ultralytics/engine/results.py

@@ -589,7 +589,7 @@ class Results(SimpleClass, DataExportMixin):
         if save:
             annotator.save(filename or f"results_{Path(self.path).name}")
 
-        return annotator.im if pil else annotator.result()
+        return annotator.result(pil)
 
     def show(self, *args, **kwargs):
         """Display the image with annotated inference results.

{dgenerate_ultralytics_headless-8.3.229 → dgenerate_ultralytics_headless-8.3.230}/ultralytics/models/rtdetr/predict.py

@@ -55,7 +55,7 @@ class RTDETRPredictor(BasePredictor):
         bboxes, scores = preds[0].split((4, nd - 4), dim=-1)
 
         if not isinstance(orig_imgs, list):  # input images are a torch.Tensor, not a list
-            orig_imgs = ops.convert_torch2numpy_batch(orig_imgs)
+            orig_imgs = ops.convert_torch2numpy_batch(orig_imgs)[..., ::-1]
 
         results = []
         for bbox, score, orig_img, img_path in zip(bboxes, scores, orig_imgs, self.batch[0]):  # (300, 4)

{dgenerate_ultralytics_headless-8.3.229 → dgenerate_ultralytics_headless-8.3.230}/ultralytics/models/sam/predict.py

@@ -502,7 +502,7 @@ class Predictor(BasePredictor):
         names = dict(enumerate(str(i) for i in range(pred_masks.shape[0])))
 
         if not isinstance(orig_imgs, list):  # input images are a torch.Tensor, not a list
-            orig_imgs = ops.convert_torch2numpy_batch(orig_imgs)
+            orig_imgs = ops.convert_torch2numpy_batch(orig_imgs)[..., ::-1]
 
         results = []
         for masks, orig_img, img_path in zip([pred_masks], orig_imgs, self.batch[0]):

{dgenerate_ultralytics_headless-8.3.229 → dgenerate_ultralytics_headless-8.3.230}/ultralytics/models/yolo/classify/predict.py

@@ -81,7 +81,7 @@ class ClassificationPredictor(BasePredictor):
             (list[Results]): List of Results objects containing classification results for each image.
         """
         if not isinstance(orig_imgs, list):  # Input images are a torch.Tensor, not a list
-            orig_imgs = ops.convert_torch2numpy_batch(orig_imgs)
+            orig_imgs = ops.convert_torch2numpy_batch(orig_imgs)[..., ::-1]
 
         preds = preds[0] if isinstance(preds, (list, tuple)) else preds
         return [

{dgenerate_ultralytics_headless-8.3.229 → dgenerate_ultralytics_headless-8.3.230}/ultralytics/models/yolo/detect/predict.py

@@ -65,7 +65,7 @@ class DetectionPredictor(BasePredictor):
         )
 
         if not isinstance(orig_imgs, list):  # input images are a torch.Tensor, not a list
-            orig_imgs = ops.convert_torch2numpy_batch(orig_imgs)
+            orig_imgs = ops.convert_torch2numpy_batch(orig_imgs)[..., ::-1]
 
         if save_feats:
             obj_feats = self.get_obj_feats(self._feats, preds[1])

{dgenerate_ultralytics_headless-8.3.229 → dgenerate_ultralytics_headless-8.3.230}/ultralytics/nn/autobackend.py

@@ -377,7 +377,7 @@ class AutoBackend(nn.Module):
                     if is_input:
                         if -1 in tuple(model.get_tensor_shape(name)):
                             dynamic = True
-                            context.set_input_shape(name, tuple(model.get_tensor_profile_shape(name, 0)[1]))
+                            context.set_input_shape(name, tuple(model.get_tensor_profile_shape(name, 0)[2]))
                         if dtype == np.float16:
                             fp16 = True
                     else:

{dgenerate_ultralytics_headless-8.3.229 → dgenerate_ultralytics_headless-8.3.230}/ultralytics/utils/plotting.py

@@ -207,7 +207,7 @@ class Annotator:
             elif im.shape[2] > 3:  # multispectral
                 im = np.ascontiguousarray(im[..., :3])
         if self.pil:  # use PIL
-            self.im = im if input_is_pil else Image.fromarray(im)
+            self.im = im if input_is_pil else Image.fromarray(im)  # stay in BGR since color palette is in BGR
             if self.im.mode not in {"RGB", "RGBA"}:  # multispectral
                 self.im = self.im.convert("RGB")
             self.draw = ImageDraw.Draw(self.im, "RGBA")
@@ -515,9 +515,10 @@ class Annotator:
         self.im = im if isinstance(im, Image.Image) else Image.fromarray(im)
         self.draw = ImageDraw.Draw(self.im)
 
-    def result(self):
-        """Return annotated image as array."""
-        return np.asarray(self.im)
+    def result(self, pil=False):
+        """Return annotated image as array or PIL image."""
+        im = np.asarray(self.im)  # self.im is in BGR
+        return Image.fromarray(im[..., ::-1]) if pil else im
 
     def show(self, title: str | None = None):
         """Show the annotated image."""

{dgenerate_ultralytics_headless-8.3.229 → dgenerate_ultralytics_headless-8.3.230}/ultralytics/utils/torch_utils.py

@@ -179,7 +179,7 @@ def select_device(device="", newline=False, verbose=True):
     cpu = device == "cpu"
     mps = device in {"mps", "mps:0"}  # Apple Metal Performance Shaders (MPS)
     if cpu or mps:
-        os.environ["CUDA_VISIBLE_DEVICES"] = "-1"  # force torch.cuda.is_available() = False
+        os.environ["CUDA_VISIBLE_DEVICES"] = ""  # force torch.cuda.is_available() = False
     elif device:  # non-cpu device requested
         if device == "cuda":
             device = "0"