metric scripts refactor.

donnyyou · Jan 16, 2019 · c57fc72 · c57fc72
1 parent 0133524
commit c57fc72
Show file tree

Hide file tree

Showing 45 changed files with 29 additions and 9,872 deletions.
diff --git a/README.md b/README.md
@@ -121,11 +121,11 @@ python main.py  --hypes hypes/pose/coco/op_coco_pose.json \
 
 <div align="center">
 
-<img src="val/examples/pose/coco/000000319721_vis.png" width="500px"/>
+<img src="samples/pose/coco/000000319721_vis.png" width="500px"/>
 
 <p> Example output of <b>VGG19-OpenPose</b></p>
 
-<img src="val/examples/pose/coco/000000475191_vis.png" width="500px"/>
+<img src="samples/pose/coco/000000475191_vis.png" width="500px"/>
 
 <p> Example output of <b>VGG19-OpenPose</b></p>
 

diff --git a/methods/cls/fc_classifier.py b/methods/cls/fc_classifier.py
@@ -19,7 +19,7 @@
 from models.cls_model_manager import ClsModelManager
 from utils.tools.average_meter import AverageMeter
 from utils.tools.logger import Logger as Log
-from val.scripts.cls.cls_running_score import ClsRunningScore
+from metric.cls.cls_running_score import ClsRunningScore
 
 
 cudnn.benchmark = True

diff --git a/methods/det/faster_rcnn.py b/methods/det/faster_rcnn.py
@@ -20,7 +20,7 @@
 from utils.layers.det.fr_priorbox_layer import FRPriorBoxLayer
 from utils.tools.average_meter import AverageMeter
 from utils.tools.logger import Logger as Log
-from val.scripts.det.det_running_score import DetRunningScore
+from metric.det.det_running_score import DetRunningScore
 from vis.visualizer.det_visualizer import DetVisualizer
 from utils.helpers.dc_helper import DCHelper
 

diff --git a/methods/det/single_shot_detector.py b/methods/det/single_shot_detector.py
@@ -21,7 +21,7 @@
 from utils.layers.det.ssd_target_generator import SSDTargetGenerator
 from utils.tools.average_meter import AverageMeter
 from utils.tools.logger import Logger as Log
-from val.scripts.det.det_running_score import DetRunningScore
+from metric.det.det_running_score import DetRunningScore
 from vis.visualizer.det_visualizer import DetVisualizer
 
 

diff --git a/methods/det/yolov3.py b/methods/det/yolov3.py
@@ -21,7 +21,7 @@
 from utils.layers.det.yolo_target_generator import YOLOTargetGenerator
 from utils.tools.average_meter import AverageMeter
 from utils.tools.logger import Logger as Log
-from val.scripts.det.det_running_score import DetRunningScore
+from metric.det.det_running_score import DetRunningScore
 from vis.visualizer.det_visualizer import DetVisualizer
 
 

diff --git a/methods/seg/fcn_segmentor.py b/methods/seg/fcn_segmentor.py
@@ -19,7 +19,7 @@
 from models.seg_model_manager import SegModelManager
 from utils.tools.average_meter import AverageMeter
 from utils.tools.logger import Logger as Log
-from val.scripts.seg.seg_running_score import SegRunningScore
+from metric.seg.seg_running_score import SegRunningScore
 from vis.visualizer.seg_visualizer import SegVisualizer
 
 

diff --git a/val/__init__.py → metric/__init__.py b/val/__init__.py → metric/__init__.py
diff --git a/val/scripts/__init__.py → metric/cls/__init__.py b/val/scripts/__init__.py → metric/cls/__init__.py
diff --git a/val/scripts/cls/cls_running_score.py → metric/cls/cls_running_score.py b/val/scripts/cls/cls_running_score.py → metric/cls/cls_running_score.py
diff --git a/val/scripts/cls/__init__.py → metric/det/__init__.py b/val/scripts/cls/__init__.py → metric/det/__init__.py
diff --git a/val/scripts/det/coco_evaluator.py → metric/det/coco_evaluator.py b/val/scripts/det/coco_evaluator.py → metric/det/coco_evaluator.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#-*- coding:utf-8 -*-
+# -*- coding:utf-8 -*-
 # Author: Donny You(youansheng@gmail.com)
 # Evaluation of coco.
 

diff --git a/val/scripts/det/det_running_score.py → metric/det/det_running_score.py b/val/scripts/det/det_running_score.py → metric/det/det_running_score.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#-*- coding:utf-8 -*-
+# -*- coding:utf-8 -*-
 # Author: Donny You(youansheng@gmail.com)
 # Object Detection running score.
 

diff --git a/val/scripts/det/voc_evaluator.py → metric/det/voc_evaluator.py b/val/scripts/det/voc_evaluator.py → metric/det/voc_evaluator.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#-*- coding:utf-8 -*-
+# -*- coding:utf-8 -*-
 # Author: Donny You(youansheng@gmail.com)
 # Evaluation of coco.
 

diff --git a/val/scripts/det/__init__.py → metric/pose/__init__.py b/val/scripts/det/__init__.py → metric/pose/__init__.py
diff --git a/val/scripts/pose/coco_evaluator.py → metric/pose/coco_evaluator.py b/val/scripts/pose/coco_evaluator.py → metric/pose/coco_evaluator.py
diff --git a/val/scripts/pose/pose_running_score.py → metric/pose/pose_running_score.py b/val/scripts/pose/pose_running_score.py → metric/pose/pose_running_score.py
diff --git a/val/scripts/pose/__init__.py → metric/seg/__init__.py b/val/scripts/pose/__init__.py → metric/seg/__init__.py
diff --git a/val/scripts/seg/ade20k_evaluator.py → metric/seg/ade20k_evaluator.py b/val/scripts/seg/ade20k_evaluator.py → metric/seg/ade20k_evaluator.py
@@ -7,7 +7,7 @@
 import numpy as np
 import argparse
 
-from val.scripts.seg.seg_running_score import SegRunningScore
+from metric.seg.seg_running_score import SegRunningScore
 from utils.helpers.image_helper import ImageHelper
 from utils.tools.logger import Logger as Log
 from utils.tools.configer import Configer

diff --git a/val/scripts/seg/__init__.py → metric/seg/cityscape/__init__.py b/val/scripts/seg/__init__.py → metric/seg/cityscape/__init__.py
diff --git a/val/scripts/seg/cityscape/__init__.py → metric/seg/cityscape/evaluation/__init__.py b/val/scripts/seg/cityscape/__init__.py → metric/seg/cityscape/evaluation/__init__.py
diff --git a/...scape/evaluation/addToConfusionMatrix.pyx → ...scape/evaluation/addToConfusionMatrix.pyx b/...scape/evaluation/addToConfusionMatrix.pyx → ...scape/evaluation/addToConfusionMatrix.pyx
diff --git a/...pe/evaluation/addToConfusionMatrix_impl.c → ...pe/evaluation/addToConfusionMatrix_impl.c b/...pe/evaluation/addToConfusionMatrix_impl.c → ...pe/evaluation/addToConfusionMatrix_impl.c
diff --git a/...cripts/seg/cityscape/helpers/csHelpers.py → metric/seg/cityscape/evaluation/csHelpers.py b/...cripts/seg/cityscape/helpers/csHelpers.py → metric/seg/cityscape/evaluation/csHelpers.py
@@ -35,8 +35,8 @@
 
 # Cityscapes modules
 try:
-    from annotation   import Annotation
-    from labels       import labels, name2label, id2label, trainId2label, category2labels
+    from metric.seg.cityscape.helpers.annotation   import Annotation
+    from metric.seg.cityscape.helpers.labels       import labels, name2label, id2label, trainId2label, category2labels
 except:
     print("Failed to find all Cityscapes modules")
     sys.exit(-1)

diff --git a/...ipts/seg/cityscape/evaluation/instance.py → metric/seg/cityscape/evaluation/instance.py b/...ipts/seg/cityscape/evaluation/instance.py → metric/seg/cityscape/evaluation/instance.py
diff --git a/...eg/cityscape/evaluation/instances2dict.py → ...eg/cityscape/evaluation/instances2dict.py b/...eg/cityscape/evaluation/instances2dict.py → ...eg/cityscape/evaluation/instances2dict.py
diff --git a/...ipts/seg/cityscape/evaluation/__init__.py → metric/seg/cityscape/helpers/__init__.py b/...ipts/seg/cityscape/evaluation/__init__.py → metric/seg/cityscape/helpers/__init__.py
diff --git a/...ripts/seg/cityscape/helpers/annotation.py → metric/seg/cityscape/helpers/annotation.py b/...ripts/seg/cityscape/helpers/annotation.py → metric/seg/cityscape/helpers/annotation.py
diff --git a/val/scripts/seg/cityscape/helpers/labels.py → metric/seg/cityscape/helpers/labels.py b/val/scripts/seg/cityscape/helpers/labels.py → metric/seg/cityscape/helpers/labels.py
diff --git a/...g/cityscape/helpers/labels_cityPersons.py → ...g/cityscape/helpers/labels_cityPersons.py b/...g/cityscape/helpers/labels_cityPersons.py → ...g/cityscape/helpers/labels_cityPersons.py
diff --git a/metric/seg/cityscape/make.sh b/metric/seg/cityscape/make.sh
@@ -0,0 +1,3 @@
+cd ../../../
+python metric/seg/cityscape/setup.py build_ext --inplace
+
diff --git a/val/scripts/seg/cityscape/setup.py → metric/seg/cityscape/setup.py b/val/scripts/seg/cityscape/setup.py → metric/seg/cityscape/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Enable cython support for eval scripts
+# Enable cython support for eval metric
 # Run as
 # setup.py build_ext --inplace
 #
@@ -18,5 +18,5 @@
 os.environ["CC"]  = "g++"
 os.environ["CXX"] = "g++"
 
-setup(ext_modules = cythonize("val/scripts/seg/cityscape/evaluation/addToConfusionMatrix.pyx"),
+setup(ext_modules = cythonize("metric/seg/cityscape/evaluation/addToConfusionMatrix.pyx"),
       include_dirs=[numpy.get_include()])
diff --git a/val/scripts/seg/cityscape_evaluator.py → metric/seg/cityscape_evaluator.py b/val/scripts/seg/cityscape_evaluator.py → metric/seg/cityscape_evaluator.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#-*- coding:utf-8 -*-
+# -*- coding:utf-8 -*-
 # Author: Donny You(youansheng@gmail.com)
 # Evaluation of cityscape.
 
@@ -19,7 +19,7 @@
     izip = zip
 
 # Cityscapes imports
-from val.scripts.seg.cityscape.evaluation.csHelpers import *
+from metric.seg.cityscape.evaluation.csHelpers import *
 
 # C Support
 # Enable the cython support for faster evaluation, this is necessary for speeding up your model results
@@ -28,7 +28,7 @@
 # Check if C-Support is available for better performance
 if CSUPPORT:
     try:
-        import val.scripts.seg.cityscape.evaluation.addToConfusionMatrix as addToConfusionMatrix
+        import metric.seg.cityscape.evaluation.addToConfusionMatrix as addToConfusionMatrix
     except:
         CSUPPORT = False
 
@@ -48,9 +48,9 @@ def __init__(self, data_path=None, out_path=None, predict_path=None):
                 raise ValueError("CITYSCAPES_EXPORT_DIR {} is not a directory".format(export_dir))
             self.exportFile = "{}/resultPixelLevelSemanticLabeling.json".format(export_dir)
         else:
-            self.exportFile = os.path.join(out_path, "evaluationResults", "resultPixelLevelSemanticLabeling.json")
+            self.exportFile = os.path.join(out_path, "../evaluationResults", "resultPixelLevelSemanticLabeling.json")
         # Parameters that should be modified by user
-        self.groundTruthSearch  = os.path.join( self.cityscapesPath, "*", "*_gtFine_labelIds.png" )
+        self.groundTruthSearch  = os.path.join( self.cityscapesPath, "*.png" )
 
         # Remaining params
         self.evalInstLevelScore = True
@@ -670,7 +670,7 @@ def evaluate(self, pred_dir=None, gt_dir=None):
         pred_path = pred_dir
         data_path = gt_dir
         print("evaluate the result...")
-        args = CArgs(data_path=data_path, out_path=data_path, predict_path=pred_path)
+        args = CArgs(data_path=data_path, out_path=pred_path, predict_path=pred_path)
         ob = EvalPixel(args)
         ob.run()
 

diff --git a/val/scripts/seg/coco_evaluator.py → metric/seg/coco_evaluator.py b/val/scripts/seg/coco_evaluator.py → metric/seg/coco_evaluator.py
@@ -1,3 +1,8 @@
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
+# Author: Donny You(youansheng@gmail.com)
+
+
 import os
 import json
 import argparse

diff --git a/val/scripts/seg/seg_running_score.py → metric/seg/seg_running_score.py b/val/scripts/seg/seg_running_score.py → metric/seg/seg_running_score.py
diff --git a/val/examples/pose/coco/000000319721_vis.png b/val/examples/pose/coco/000000319721_vis.png
diff --git a/val/examples/pose/coco/000000475191_vis.png b/val/examples/pose/coco/000000475191_vis.png
diff --git a/val/samples/pose/coco/000000319721.jpg b/val/samples/pose/coco/000000319721.jpg
diff --git a/val/samples/pose/coco/000000475191.jpg b/val/samples/pose/coco/000000475191.jpg
diff --git a/val/samples/pose/coco/ski.jpg b/val/samples/pose/coco/ski.jpg