diff --git a/.gitignore b/.gitignore index 3dae269..24b714b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,6 @@ models/ *.pt *.onnx *.rknn -*.mp4 \ No newline at end of file +*.mp4 +venv +*.engine \ No newline at end of file diff --git a/augmentation.py b/augmentation.py index fd80988..3c3bef5 100644 --- a/augmentation.py +++ b/augmentation.py @@ -24,17 +24,10 @@ class Augmentator: self.transform = A.Compose([ # Flips, rotations and brightness A.HorizontalFlip(p=0.6), - A.RandomBrightnessContrast(p=0.4, brightness_limit=(-0.1, 0.1), contrast_limit=(-0.1, 0.1)), - A.Affine(p=0.7, scale=(0.8, 1.2), rotate=(-20, 20), shear=(-10, 10), translate_percent=0.2), + A.RandomBrightnessContrast(p=0.4, brightness_limit=(-0.3, 0.3), contrast_limit=(-0.05, 0.05)), + A.Affine(p=0.8, scale=(0.8, 1.2), rotate=(-35, 35), shear=(-10, 10)), - # Weather - A.RandomFog(p=0.3, fog_coef_range=(0, 0.3)), - A.RandomShadow(p=0.2), - - # Image Quality/Noise - A.MotionBlur(p=0.2, blur_limit=(3, 5)), - - # Color Variations + A.MotionBlur(p=0.1, blur_limit=(1, 2)), A.HueSaturationValue(p=0.4, hue_shift_limit=10, sat_shift_limit=10, val_shift_limit=10) ], bbox_params=A.BboxParams(format='yolo')) diff --git a/install.sh b/install.sh new file mode 100644 index 0000000..c6d69ec --- /dev/null +++ b/install.sh @@ -0,0 +1,8 @@ +echo install python and dependencies +if not exist venv ( + python -m venv venv +) + +venv/bin/python -m pip install --upgrade pip +venv/bin/pip install -r requirements.txt +venv\Scripts\pip install --upgrade pyinstaller pyinstaller-hooks-contrib \ No newline at end of file diff --git a/preprocess-train.py b/preprocess-train.py index a85dc6d..610773a 100644 --- a/preprocess-train.py +++ b/preprocess-train.py @@ -1,5 +1,5 @@ from augmentation import Augmentator from train import train_dataset, convert2rknn -Augmentator().augment_annotations(from_scratch=True) +Augmentator().augment_annotations() train_dataset(from_scratch=True) \ No newline at end of file diff --git a/train.py b/train.py index efaeab3..4ec3b06 100644 --- a/train.py +++ b/train.py @@ -38,7 +38,6 @@ DEFAULT_CLASS_NUM = 80 total_files_copied = 0 def form_dataset(from_date: datetime): - makedirs(today_dataset, exist_ok=True) images = [] old_images = [] @@ -180,10 +179,10 @@ def train_dataset(existing_date=None, from_scratch=False): cur_folder = f'{prefix}{existing_date}' cur_dataset = path.join(datasets_dir, f'{prefix}{existing_date}') else: - if from_scratch: - shutil.rmtree(today_dataset) - form_dataset(latest_date) - create_yaml() + # if from_scratch and Path(today_dataset).exists(): + # shutil.rmtree(today_dataset) + # form_dataset(latest_date) + # create_yaml() cur_folder = today_folder cur_dataset = today_dataset