🔀 [Merge] branch 'main' into MODEL

.pre-commit-config.yaml

@@ -11,4 +11,4 @@ repos:
     rev: v5.10.1  # Use the appropriate version or "stable" for the latest stable release
     hooks:
       - id: isort
-        args: ["--profile", "black", "--verbose"]
+        args: ["--profile", "black"]

tests/test_model/test_yolo.py

@@ -10,31 +10,30 @@ sys.path.append(str(project_root))
 
 from yolo.model.yolo import YOLO, get_model
 
-config_path = "../../yolo/config/model"
-config_name = "v7-base"
+config_path = "../../yolo/config"
+config_name = "config"
 
 
 def test_build_model():
     with initialize(config_path=config_path, version_base=None):
-        model_cfg = compose(config_name=config_name)
-        OmegaConf.set_struct(model_cfg, False)
-        model = YOLO(model_cfg)
-        model.build_model(model_cfg.model)
-        assert len(model.model) == 106
+        cfg = compose(config_name=config_name)
+
+        OmegaConf.set_struct(cfg.model, False)
+        model = YOLO(cfg.model, 80)
+        assert len(model.model) == 38
 
 
 def test_get_model():
     with initialize(config_path=config_path, version_base=None):
-        model_cfg = compose(config_name=config_name)
-        model = get_model(model_cfg)
+        cfg = compose(config_name=config_name)
+        model = get_model(cfg)
         assert isinstance(model, YOLO)
 
 
 def test_yolo_forward_output_shape():
     with initialize(config_path=config_path, version_base=None):
-        model_cfg = compose(config_name=config_name)
-
-        model = get_model(model_cfg)
+        cfg = compose(config_name=config_name)
+        model = get_model(cfg)
         # 2 - batch size, 3 - number of channels, 640x640 - image dimensions
         dummy_input = torch.rand(2, 3, 640, 640)
 
@@ -42,7 +41,10 @@ def test_yolo_forward_output_shape():
         output = model(dummy_input)
         output_shape = [x.shape for x in output[-1]]
         assert output_shape == [
-            torch.Size([2, 3, 20, 20, 85]),
-            torch.Size([2, 3, 80, 80, 85]),
-            torch.Size([2, 3, 40, 40, 85]),
+            torch.Size([2, 144, 80, 80]),
+            torch.Size([2, 144, 40, 40]),
+            torch.Size([2, 144, 20, 20]),
+            torch.Size([2, 144, 80, 80]),
+            torch.Size([2, 144, 40, 40]),
+            torch.Size([2, 144, 20, 20]),
         ]