From 83b8350b96acd52235e3214c8d2306417d0bb304 Mon Sep 17 00:00:00 2001 From: huangjianhui <852142024@qq.com> Date: Wed, 27 Jul 2022 16:42:45 +0800 Subject: [PATCH] Fix evaluation import problem (#46) * Detection evaluation function * Add license * Fix python import problem * Modify requirement.txt * Add requirements.txt Co-authored-by: Jason --- fastdeploy/vision/evaluation/utils/__init__.py | 1 - fastdeploy/vision/evaluation/utils/coco.py | 1 - fastdeploy/vision/evaluation/utils/coco_utils.py | 5 +++-- requirements.txt | 3 +++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fastdeploy/vision/evaluation/utils/__init__.py b/fastdeploy/vision/evaluation/utils/__init__.py index dfcb419ba..afa10c0e8 100644 --- a/fastdeploy/vision/evaluation/utils/__init__.py +++ b/fastdeploy/vision/evaluation/utils/__init__.py @@ -19,4 +19,3 @@ from .json_results import * from .map_utils import * from .coco_utils import * from .coco import * -from .cityscapes import Cityscapes diff --git a/fastdeploy/vision/evaluation/utils/coco.py b/fastdeploy/vision/evaluation/utils/coco.py index c67579055..70a9714c2 100644 --- a/fastdeploy/vision/evaluation/utils/coco.py +++ b/fastdeploy/vision/evaluation/utils/coco.py @@ -15,7 +15,6 @@ from __future__ import absolute_import import copy import os.path as osp -import six import sys import numpy as np from . import fd_logging as logging diff --git a/fastdeploy/vision/evaluation/utils/coco_utils.py b/fastdeploy/vision/evaluation/utils/coco_utils.py index 9d551f253..ac7ba3333 100644 --- a/fastdeploy/vision/evaluation/utils/coco_utils.py +++ b/fastdeploy/vision/evaluation/utils/coco_utils.py @@ -18,10 +18,9 @@ from __future__ import print_function import sys import numpy as np -import itertools from .map_utils import draw_pr_curve from .json_results import get_det_res, get_det_poly_res, get_seg_res, get_solov2_segm_res -import logging as logging +from . import fd_logging as logging import copy @@ -202,6 +201,8 @@ def cocoapi_eval(anns, file_name='{}_precision_recall_curve.jpg'.format(nm["name"])) num_columns = min(6, len(results_per_category) * 2) + + import itertools results_flatten = list(itertools.chain(*results_per_category)) headers = ['category', 'AP'] * (num_columns // 2) results_2d = itertools.zip_longest( diff --git a/requirements.txt b/requirements.txt index 276109fc1..7e18ca034 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,5 @@ opencv-python tqdm +numpy +pycocotools +colorama