fix(YOLOX): fix several bugs

sotaDetector · Jul 19, 2021 · 42c9f1c · 42c9f1c
1 parent 8506f7e
commit 42c9f1c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/demo/ONNXRuntime/onnx_inference.py b/demo/ONNXRuntime/onnx_inference.py
@@ -12,7 +12,7 @@
 
 from yolox.data.data_augment import preproc as preprocess
 from yolox.data.datasets import COCO_CLASSES
-from yolox.utils import mkdir, multiclass_nms, postprocess, vis
+from yolox.utils import mkdir, multiclass_nms, demo_postprocess, vis
 
 
 def make_parser():
@@ -72,7 +72,7 @@ def make_parser():
 
     ort_inputs = {session.get_inputs()[0].name: img[None, :, :, :]}
     output = session.run(None, ort_inputs)
-    predictions = postprocess(output[0], input_shape, p6=args.with_p6)[0]
+    predictions = demo_postprocess(output[0], input_shape, p6=args.with_p6)[0]
 
     boxes = predictions[:, :4]
     scores = predictions[:, 4:5] * predictions[:, 5:]

diff --git a/demo/OpenVINO/python/openvino_inference.py b/demo/OpenVINO/python/openvino_inference.py
@@ -16,7 +16,7 @@
 
 from yolox.data.data_augment import preproc as preprocess
 from yolox.data.datasets import COCO_CLASSES
-from yolox.utils import mkdir, multiclass_nms, postprocess, vis
+from yolox.utils import mkdir, multiclass_nms, demo_postprocess, vis
 
 
 def parse_args() -> argparse.Namespace:
@@ -130,7 +130,7 @@ def main():
     # ---------------------------Step 8. Process output--------------------------------------------------------------------
     res = res[out_blob]
 
-    predictions = postprocess(res, (h, w), p6=False)[0]
+    predictions = demo_postprocess(res, (h, w), p6=False)[0]
 
     boxes = predictions[:, :4]
     scores = predictions[:, 4, None] * predictions[:, 5:]

diff --git a/exps/example/yolox_voc/yolox_voc_s.py b/exps/example/yolox_voc/yolox_voc_s.py
@@ -111,7 +111,7 @@ def get_eval_loader(self, batch_size, is_distributed, testdev=False):
         return val_loader
 
     def get_evaluator(self, batch_size, is_distributed, testdev=False):
-        from yolox.evalutors import VOCEvaluator
+        from yolox.evaluators import VOCEvaluator
 
         val_loader = self.get_eval_loader(batch_size, is_distributed, testdev=testdev)
         evaluator = VOCEvaluator(

diff --git a/yolox/core/trainer.py b/yolox/core/trainer.py
@@ -146,7 +146,7 @@ def before_train(self):
             is_distributed=self.is_distributed,
             no_aug=self.no_aug
         )
-        logger.info("init prefetcher, this might take a while...")
+        logger.info("init prefetcher, this might take one minute or less...")
         self.prefetcher = DataPrefetcher(self.train_loader)
         # max_iter means iters per epoch
         self.max_iter = len(self.train_loader)

diff --git a/yolox/data/datasets/voc.py b/yolox/data/datasets/voc.py
@@ -14,7 +14,7 @@
 import cv2
 import numpy as np
 
-from yolox.evalutors.voc_eval import voc_eval
+from yolox.evaluators.voc_eval import voc_eval
 
 from .datasets_wrapper import Dataset
 from .voc_classes import VOC_CLASSES

diff --git a/yolox/exp/yolox_base.py b/yolox/exp/yolox_base.py
@@ -234,7 +234,7 @@ def get_eval_loader(self, batch_size, is_distributed, testdev=False):
         return val_loader
 
     def get_evaluator(self, batch_size, is_distributed, testdev=False):
-        from yolox.evalutors import COCOEvaluator
+        from yolox.evaluators import COCOEvaluator
 
         val_loader = self.get_eval_loader(batch_size, is_distributed, testdev=testdev)
         evaluator = COCOEvaluator(

diff --git a/yolox/utils/demo_utils.py b/yolox/utils/demo_utils.py
@@ -6,7 +6,7 @@
 
 import numpy as np
 
-__all__ = ["mkdir", "nms", "multiclass_nms", "postprocess"]
+__all__ = ["mkdir", "nms", "multiclass_nms", "demo_postprocess"]
 
 
 def mkdir(path):
@@ -64,7 +64,7 @@ def multiclass_nms(boxes, scores, nms_thr, score_thr):
     return np.concatenate(final_dets, 0)
 
 
-def postprocess(outputs, img_size, p6=False):
+def demo_postprocess(outputs, img_size, p6=False):
 
     grids = []
     expanded_strides = []