Skip to content

Commit

Permalink
Merge pull request #37 from surfriderfoundationeurope/feature/update_…
Browse files Browse the repository at this point in the history
…serving_yolo

Feature/update serving yolo
charlesollion authored Mar 2, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 8bfdb36 + ffece51 commit 27d94dd
Showing 6 changed files with 747 additions and 671 deletions.
1,397 changes: 734 additions & 663 deletions poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "plastic-origins"
version = "2.2.3"
version = "2.2.4"

description = "A package containing methods commonly used to make inferences"
repository = "https://github.com/surfriderfoundationeurope/surfnet"
6 changes: 5 additions & 1 deletion src/plasticorigins/serving/config.py
Original file line number Diff line number Diff line change
@@ -9,6 +9,8 @@
7: "Fishing net", # 'Fishing net / cord',
8: "Easily namable",
9: "Unclear",
10: 'Fragment',
11: 'Fragment'
}


@@ -20,6 +22,7 @@ class DotDict(dict):
__delattr__ = dict.__delitem__


# Old config track with centernet, deprecated
config_track = DotDict(
{
"upload_folder": "/tmp",
@@ -39,6 +42,7 @@ class DotDict(dict):
}
)

# New config track, the one used in production
config_track_yolo = DotDict(
{
"yolo_conf_thrld": 0.35,
@@ -47,7 +51,7 @@ class DotDict(dict):
"confidence_threshold": 0.004,
"downsampling_factor": 4,
"noise_covariances_path": "data/tracking_parameters",
"url_model_yolo": "https://github.com/surfriderfoundationeurope/IA_Pau/releases/download/v0.1/yolov5.pt",
"url_model_yolo": "https://github.com/surfriderfoundationeurope/surfnet/releases/download/v01.2023/yolo_latest.pt",
"file_model_yolo": "yolov5.pt",
"output_shape": (768, 768),
"skip_frames": 3, # 3
7 changes: 4 additions & 3 deletions src/plasticorigins/serving/inference.py
Original file line number Diff line number Diff line change
@@ -43,10 +43,11 @@
)
from plasticorigins.serving.config import id_categories

# centernet / yolo version
from plasticorigins.serving.config import config_track
# centernet (deprecated) version
# from plasticorigins.serving.config import config_track

# from plasticorigins.serving.config import config_track_yolo as config_track
# yolo version
from plasticorigins.serving.config import config_track_yolo as config_track

logger = logging.getLogger()
if config_track.device is None:
2 changes: 1 addition & 1 deletion tests/test_plasticorigins/detection/test_yolo.py
Original file line number Diff line number Diff line change
@@ -36,5 +36,5 @@ def test_detect():
assert len(res) == 3
assert res[0].shape == (2, 4)
np.testing.assert_array_equal(
res[0], np.array([[200, 233, 56, 233], [302, 331, 26, 99]])
res[0], np.array([[202, 233, 56, 244], [301, 325, 28, 106]])
)
4 changes: 2 additions & 2 deletions tests/test_plasticorigins/serving/test_inference.py
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

from plasticorigins.tools.files import create_unique_folder
from plasticorigins.serving.app import app
from plasticorigins.serving.config import config_track
from plasticorigins.serving.config import config_track_yolo as config_track
from plasticorigins.serving.inference import track

video_file = "tests/ressources/validation_videos/T1_trim.mp4"
@@ -84,7 +84,7 @@ def test_track():
os.remove(full_filepath)
assert math.isclose(fps, 5.921, abs_tol=0.01)
assert num_frames == 34
assert len(filtered_results) == 16
assert len(filtered_results) == 23
assert len(filtered_results[0]) == 6
assert type(filtered_results[0][0]) == int
assert type(filtered_results[0][1]) == int

0 comments on commit 27d94dd

Please sign in to comment.