Change directory structure

.gitignore

@@ -51,4 +51,25 @@ plantsdata/
 
 images/
 dataset*/
-*.ptl
+*.ptl
+venv/
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST

code/evaluation/detection.py

@@ -8,8 +8,8 @@ import albumentations as A
 from torchvision import transforms, ops
 from albumentations.pytorch import ToTensorV2
 
-from utils.conversions import scale_bboxes
+from code.utils.conversions import scale_bboxes
-from utils.manipulations import get_cutout
+from code.utils.manipulations import get_cutout
 
 def detect(img_path: str, yolo_path: str, resnet_path: str):
     """Load an image, detect individual plants and label them as

code/evaluation/evaluation.py

@@ -1,6 +1,6 @@
 import fiftyone as fo
 from PIL import Image
-from evaluate import detect
+from code.evaluation.detection import detect
 
 name = "dataset-small"
 dataset_dir = "/home/zenon/Documents/master-thesis/evaluation/dataset-small"

code/evaluation/labeling.py

@@ -4,8 +4,8 @@ import cv2
 import json
 import os
 
-from utils.conversions import convert_to_yolo
+from code.utils.conversions import convert_to_yolo
-from detection import detect
+from code.evaluation.detection import detect
 
 template = [{
     "data": {

code/jetson-deployment/model.py

@@ -2,7 +2,6 @@ import argparse
 import cv2
 import torch
 from torchvision import transforms
-import tkinter
 
 
 def load_models(yolo_path: str, resnet_path: str):

code/jetson-deployment/server.py

@@ -6,7 +6,7 @@ from apscheduler.schedulers.background import BackgroundScheduler
 
 from multiprocessing import Manager
 
-from model import detect
+from code.evaluation.detection import detect
 
 app = Flask(__name__)
 scheduler = BackgroundScheduler(daemon=True)