charlesollion commited on
Commit
37145de
·
1 Parent(s): 3ac19ac

update yolo model

Browse files
Files changed (2) hide show
  1. app.py +5 -4
  2. requirements.txt +1 -1
app.py CHANGED
@@ -56,7 +56,9 @@ id_categories = {
56
  6: 'Tire',
57
  7: 'Fishing net', #'Fishing net / cord',
58
  8: 'Easily namable',
59
- 9: 'Unclear'
 
 
60
  }
61
 
62
 
@@ -85,12 +87,11 @@ config_track = DotDict({
85
  logger.info('---Yolo model...')
86
  # Yolo has warning problems, so we set an env variable to remove it
87
  os.environ["VERBOSE"] = "False"
88
- URL_MODEL = "https://github.com/surfriderfoundationeurope/IA_Pau/releases/download/v0.1/yolov5.pt"
89
  FILE_MODEL = "yolov5.pt"
90
  model_path = download_from_url(URL_MODEL, FILE_MODEL, "./models", logger)
91
  model_yolo = load_model(model_path, config_track.device, config_track.yolo_conf_thrld, config_track.yolo_iou_thrld)
92
 
93
-
94
  logger.info('---Centernet model...')
95
  URL_MODEL = "https://partage.imt.fr/index.php/s/sJi22N6gedN6T4q/download"
96
  FILE_MODEL = "mobilenet_v3_pretrained.pth"
@@ -131,7 +132,7 @@ def track(args):
131
  # centernet version
132
  if args.model_type == "yolo":
133
  logger.info("---Using Yolo")
134
- detector = lambda frame: predict_yolo(model_yolo, frame, size=config_track.size, augment=False)
135
  elif args.model_type == "centernet":
136
  logger.info("---Using Centernet")
137
  detector = lambda frame: detect(frame, threshold=args.detection_threshold, model=model)
 
56
  6: 'Tire',
57
  7: 'Fishing net', #'Fishing net / cord',
58
  8: 'Easily namable',
59
+ 9: 'Unclear',
60
+ 10: 'Fragment',
61
+ 11: 'Fragment'
62
  }
63
 
64
 
 
87
  logger.info('---Yolo model...')
88
  # Yolo has warning problems, so we set an env variable to remove it
89
  os.environ["VERBOSE"] = "False"
90
+ URL_MODEL = "https://github.com/surfriderfoundationeurope/surfnet/releases/download/v01.2023/yolo_latest.pt"
91
  FILE_MODEL = "yolov5.pt"
92
  model_path = download_from_url(URL_MODEL, FILE_MODEL, "./models", logger)
93
  model_yolo = load_model(model_path, config_track.device, config_track.yolo_conf_thrld, config_track.yolo_iou_thrld)
94
 
 
95
  logger.info('---Centernet model...')
96
  URL_MODEL = "https://partage.imt.fr/index.php/s/sJi22N6gedN6T4q/download"
97
  FILE_MODEL = "mobilenet_v3_pretrained.pth"
 
132
  # centernet version
133
  if args.model_type == "yolo":
134
  logger.info("---Using Yolo")
135
+ detector = lambda frame: predict_yolo(model_yolo, frame, size=config_track.size)
136
  elif args.model_type == "centernet":
137
  logger.info("---Using Centernet")
138
  detector = lambda frame: detect(frame, threshold=args.detection_threshold, model=model)
requirements.txt CHANGED
@@ -1,4 +1,4 @@
1
- plastic-origins==2.1.1
2
  yolov5
3
  gradio
4
  osmnx
 
1
+ plastic-origins==2.2.3
2
  yolov5
3
  gradio
4
  osmnx