Merge branch 'siz2' into siz

config/experiments/detection/IM_130124_gdsfjbjh2_siz.yaml

@@ -1,6 +1,7 @@
 # @package _global_
 accelerator: gpu
 batch_size: 32
+ckpt_path: /home/qazybek/pmi_tatneft/innofw/dui/logs/something/20240122-093931/weights/best.pt
 defaults:
 - override /datasets: detection/detection_siz.yaml
 - override /models: detection/yolov5.yaml

config/experiments/detection/IM_190722_gdsfjbjh2_yolov5_fruits.yaml

@@ -1,14 +1,10 @@
 # @package _global_
+batch_size: 2
 defaults:
-  - override /models: detection/yolov5
-  - override /datasets: detection/detection_rotten_fruits
-
-
-project: "rotten_fruits"
-task: "image-detection"
+- override /models: detection/yolov5
+- override /datasets: detection/detection_rotten_fruits
+epochs: 3
+project: rotten_fruits
 random_seed: 43
-epochs: 300
-batch_size: 2
+task: image-detection
 weights_freq: 1
-
-ckpt_path: /tmp/chkpt

config/experiments/detection/KA_120722_8adfcdaa_yolov5.yaml

@@ -1,12 +1,11 @@
 # @package _global_
+batch_size: 32
 defaults:
-  - override /models: detection/yolov5
-  - override /datasets: detection_lep
-  - override /optimizers: sgd
-
-project: "lep"
-task: "image-detection"
+- override /datasets: detection_lep
+- override /optimizers: sgd
+- override /models: detection/yolov5x.yaml
+epochs: 500
+project: lep
 random_seed: 42
-epochs: 2
-batch_size: 2
+task: image-detection
 weights_freq: 1

config/experiments/detection/KA_120722_8adfcdaa_yolov5_non_pretrained.yaml

@@ -1,10 +1,11 @@
 # @package _global_
 batch_size: 2
+ckpt_path: /home/qazybek/pmi_tatneft/innofw/dui/logs/something/20240122-082640/weights/best.pt
 defaults:
 - override /models: detection/yolov5
 - override /datasets: detection_lep.yaml
 - override /initializations: random
-epochs: 1
+epochs: 5
 project: lep
 random_seed: 42
 task: image-detection

innofw/core/integrations/ultralytics/datamodule.py

@@ -3,6 +3,7 @@
 from pathlib import Path
 from typing import List, Optional
 import shutil
+import glob
 
 # third party libraries
 from sklearn.model_selection import train_test_split
@@ -212,12 +213,16 @@ def setup_infer(self):
             return
         # root_dir
         self.infer_source = Path(self.infer_source)
-        if self.infer_file:
-            self.infer_source = (
-                self.infer_source
-                if self.infer_source.name == Path(self.infer_file).stem
-                else self.infer_source / Path(self.infer_file).stem
-            )
+        # if self.infer_file:
+        #     self.infer_source = (
+        #         self.infer_source
+        #         if self.infer_source.name == Path(self.infer_file).stem
+        #         else self.infer_source / Path(self.infer_file).stem
+        #     )
+        for path in self.infer_source.rglob("*"):
+            if path.is_file() and path.suffix not in [".txt", ".yaml", ".zip"]:
+                self.infer_source = Path(path).parent
+                break
 
         root_path = self.infer_source.parent
 

logging.conf

@@ -24,4 +24,4 @@ formatter=simpleFormatter
 args=(sys.stdout,)
 
 [formatter_simpleFormatter]
-format=%(asctime)s - %(name)s - %(levelname)s - %(message)s
+format=%(asctime)s - %(name)s - %(levelname)s - %(message)s