[refactor] move utils to specific folder of scripts related to metric computations to avoid amibuguity with the other compressai_vision.utils module

Author: fracape

.gitlab-ci.yml

@@ -30,7 +30,7 @@ black:
     - python --version
     - pip install -U pip black
   script:
-    - black --check compressai_vision data/mpeg-fcm utils
+    - black --check compressai_vision data/mpeg-fcm scripts/metrics
   tags:
     - docker
 
@@ -41,7 +41,7 @@ isort:
     - python --version
     - pip install -U pip isort
   script:
-    - isort compressai_vision data/mpeg-fcm utils --check-only
+    - isort compressai_vision data/mpeg-fcm scripts/metrics --check-only
   tags:
     - docker
 

Makefile

@@ -6,7 +6,7 @@ PYTHON_DOCKER_IMAGE = python:3.8-buster
 GIT_DESCRIBE = $(shell git describe --first-parent)
 ARCHIVE = compressai_vision.tar.gz
 
-src_dirs := compressai_vision utils
+src_dirs := compressai_vision scripts/metrics
 
 .PHONY: help
 help: ## Show this message

utils/compute_overall_kmac_per_px.py …s/metrics/compute_overall_kmac_per_px.pyutils/compute_overall_kmac_per_px.py renamed to scripts/metrics/compute_overall_kmac_per_px.py utils/compute_overall_kmac_per_px.py renamed to scripts/metrics/compute_overall_kmac_per_px.py

@@ -43,11 +43,11 @@
 
 import numpy as np
 import pandas as pd
+import utils
 from detectron2.evaluation import COCOEvaluator
 from pycocotools.coco import COCO
 from pycocotools.cocoeval import COCOeval
 
-import utils
 from compressai_vision.evaluators.evaluators import BaseEvaluator
 
 CLASSES = ["CLASS-AB", "CLASS-C", "CLASS-D"]

utils/compute_overall_map.py scripts/metrics/compute_overall_map.pyutils/compute_overall_map.py renamed to scripts/metrics/compute_overall_map.py

@@ -41,8 +41,8 @@
 
 import motmetrics as mm
 import torch
-
 import utils
+
 from compressai_vision.evaluators.evaluators import BaseEvaluator, MOT_JDE_Eval
 
 CLASSES = ["TVD", "HIEVE-1080P", "HIEVE-720P"]

utils/compute_overall_mot.py scripts/metrics/compute_overall_mot.pyutils/compute_overall_mot.py renamed to scripts/metrics/compute_overall_mot.py

@@ -40,14 +40,14 @@
 
 import numpy as np
 import pandas as pd
+import utils
 from compute_overall_map import compute_overall_mAP
 from compute_overall_mot import compute_overall_mota
 from curve_fitting import (
     convert_to_monotonic_points_SFU,
     convert_to_monotonic_points_TVD,
 )
 
-import utils
 from compressai_vision.datasets import get_seq_info
 from compressai_vision.evaluators.evaluators import BaseEvaluator