lint: fix formatting

Author: fracape

Makefile

@@ -47,7 +47,7 @@ static-analysis: check-ruff-format check-ruff-organize-imports check-ruff-lint #
 
 style: ## Apply style formating
 	@echo "--> Running ruff format"
-	@ruff format $(src_dirs)
+	@ruff format $(src_dirs) 
 	@echo "--> Running ruff check --ignore ALL --select I"
-	@ruff check --ignore ALL --select I $(src_dirs)
+	@ruff check --ignore ALL --select I $(src_dirs) --fix
 

compressai_vision/evaluators/evaluators.py

@@ -917,6 +917,9 @@ def __init__(
         from pycocotools.coco import COCO
         from yolox.data.datasets.coco import remove_useless_info
         from yolox.evaluators import COCOEvaluator as YOLOX_COCOEvaluator
+        from yolox.utils import xyxy2xywh
+
+        self.xyxy2xywh = xyxy2xywh
 
         self.set_annotation_info(dataset)
 
@@ -991,6 +994,8 @@ def results(self, save_path: str = None):
 
     def _convert_to_coco_format(self, outputs, info_imgs, ids):
         # reference : yolox > evaluators > coco_evaluator > convert_to_coco_format
+        from yolox.utils import xyxy2xywh
+
         data_list = []
         image_wise_data = defaultdict(dict)
         for output, img_h, img_w, img_id in zip(
@@ -1023,7 +1028,7 @@ def _convert_to_coco_format(self, outputs, info_imgs, ids):
                 }
             )
 
-            bboxes = xyxy2xywh(bboxes)
+            bboxes = self.xyxy2xywh(bboxes)
 
             for ind in range(bboxes.shape[0]):
                 label = self._class_ids[int(cls[ind])]

compressai_vision/model_wrappers/__init__.py

@@ -27,7 +27,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from .base_wrapper import BaseWrapper
 from . import detectron2, jde, rtmo, sam, yolox
+from .base_wrapper import BaseWrapper
 
 __all__ = ["BaseWrapper"]

compressai_vision/model_wrappers/detectron2.py

@@ -34,7 +34,6 @@
 
 import torch
 
-
 from compressai_vision.registry import register_vision_model
 
 from .base_wrapper import BaseWrapper
@@ -172,7 +171,9 @@ def __init__(self, device: str, **kwargs):
         self.replace_conv2d_modules(self.model)
         self.model = self.model.to(device).eval()
 
-        self.DetectionCheckpointer(self.model).load(f"{_path_prefix}/{kwargs['weights']}")
+        self.DetectionCheckpointer(self.model).load(
+            f"{_path_prefix}/{kwargs['weights']}"
+        )
 
         for param in self.model.parameters():
             param.requires_grad = False
@@ -600,7 +601,9 @@ def __init__(self, img_size: list):
         ):
             height = input_per_image["height"]
             width = input_per_image["width"]
-            sem_seg_r = self.sem_seg_postprocess(sem_seg_result, image_size, height, width)
+            sem_seg_r = self.sem_seg_postprocess(
+                sem_seg_result, image_size, height, width
+            )
             detector_r = self.detector_postprocess(detector_result, height, width)
 
             processed_results.append({"sem_seg": sem_seg_r, "instances": detector_r})

compressai_vision/model_wrappers/jde.py

@@ -50,6 +50,7 @@
 class jde_1088x608(BaseWrapper):
     def __init__(self, device: str, **kwargs):
         import jde
+
         from jde.models import Darknet
         from jde.utils.kalman_filter import KalmanFilter
 
@@ -221,6 +222,7 @@ def _jde_process(self, pred, org_img_size: tuple, input_img_size: tuple):
             sub_stracks,
         )
         from jde.utils.utils import non_max_suppression, scale_coords
+
         r"""Re-implementation of JDE from Z. Wang, L. Zheng, Y. Liu, and S. Wang:
         : `"Towards Real-Time Multi-Object Tracking"`_,
         The European Conference on Computer Vision (ECCV), 2020

compressai_vision/model_wrappers/rtmo.py

@@ -86,7 +86,9 @@ def __init__(self, device: str, **kwargs):
         default_scope = cfg.get("default_scope", "mmengine")
         assert default_scope == "mmpose"
 
-        default_scope = self.DefaultScope.get_instance("mmpose", scope_name=default_scope)
+        default_scope = self.DefaultScope.get_instance(
+            "mmpose", scope_name=default_scope
+        )
         self.model = self.MODELS.build(model_cfg)
         self.test_cfg = model_cfg["test_cfg"]
 

compressai_vision/model_wrappers/sam.py

@@ -10,6 +10,7 @@
 import numpy as np
 import pandas
 import torch
+
 from torch.nn import functional as F
 
 from compressai_vision.registry import register_vision_model

compressai_vision/model_wrappers/yolox.py

@@ -60,6 +60,11 @@ class yolox_darknet53(BaseWrapper):
     def __init__(self, device: str, **kwargs):
         super().__init__(device)
 
+        from yolox.exp import get_exp
+        from yolox.utils import postprocess
+
+        self.postprocess = postprocess
+
         _path_prefix = (
             f"{root_path}"
             if kwargs["model_path_prefix"] == "default"
@@ -74,8 +79,6 @@ def __init__(self, device: str, **kwargs):
         self.conf_thres = kwargs["conf_thres"]
         self.nms_thres = kwargs["nms_thres"]
 
-        from yolox.exp import get_exp
-
         self.squeeze_at_split_enabled = False
 
         exp = get_exp(exp_file=None, exp_name="yolov3")
@@ -230,6 +233,8 @@ def _feature_at_l13_to_output(
         <https://github.com/Megvii-BaseDetection/YOLOX?tab=Apache-2.0-1-ov-file#readme>
 
         """
+        from yolox.utils import postprocess
+
         y = x[self.SPLIT_L13]
 
         # Recovery session to expand dimension to original
@@ -258,7 +263,9 @@ def _feature_at_l13_to_output(
 
         outputs = self.head((fp_lvl2, fp_lvl1, fp_lvl0))
 
-        pred = postprocess(outputs, self.num_classes, self.conf_thres, self.nms_thres)
+        pred = self.postprocess(
+            outputs, self.num_classes, self.conf_thres, self.nms_thres
+        )
 
         return pred
 
@@ -278,6 +285,7 @@ def _feature_at_l37_to_output(
         <https://github.com/Megvii-BaseDetection/YOLOX?tab=Apache-2.0-1-ov-file#readme>
 
         """
+        from yolox.utils import postprocess
 
         fp_lvl2 = x[self.SPLIT_L37]
         fp_lvl1 = self.backbone.dark4(fp_lvl2)
@@ -297,7 +305,9 @@ def _feature_at_l37_to_output(
 
         outputs = self.head((fp_lvl2, fp_lvl1, fp_lvl0))
 
-        pred = postprocess(outputs, self.num_classes, self.conf_thres, self.nms_thres)
+        pred = self.postprocess(
+            outputs, self.num_classes, self.conf_thres, self.nms_thres
+        )
 
         return pred
 
@@ -308,11 +318,11 @@ def forward(self, x):
         self.model = self.model.to(self.device).eval()
         img = x["image"].unsqueeze(0).to(self.device)
 
-        from yolox.utils import postprocess
-
         fpn_out = self.yolo_fpn(img)
         outputs = self.head(fpn_out)
 
-        pred = postprocess(outputs, self.num_classes, self.conf_thres, self.nms_thres)
+        pred = self.postprocess(
+            outputs, self.num_classes, self.conf_thres, self.nms_thres
+        )
 
         return pred