From 0af6352034f43ae8de28f3519d8c809c182108e6 Mon Sep 17 00:00:00 2001
From: Kai Chen <chenkaidev@gmail.com>
Date: Wed, 10 Oct 2018 20:05:53 +0800
Subject: [PATCH] import FastRCNN to higher level, update hooks

---
 mmdet/core/evaluation/eval_hooks.py |  4 ++++
 mmdet/models/__init__.py            | 10 ++++++----
 mmdet/models/detectors/__init__.py  |  6 +++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/mmdet/core/evaluation/eval_hooks.py b/mmdet/core/evaluation/eval_hooks.py
index a83b80d..bec25ef 100644
--- a/mmdet/core/evaluation/eval_hooks.py
+++ b/mmdet/core/evaluation/eval_hooks.py
@@ -55,6 +55,10 @@ class DistEvalHook(Hook):
                 shutil.rmtree(self.lock_dir)
             mmcv.mkdir_or_exist(self.lock_dir)
 
+    def after_run(self, runner):
+        if runner.rank == 0:
+            shutil.rmtree(self.lock_dir)
+
     def after_train_epoch(self, runner):
         if not self.every_n_epochs(runner, self.interval):
             return
diff --git a/mmdet/models/__init__.py b/mmdet/models/__init__.py
index aca6399..8232fda 100644
--- a/mmdet/models/__init__.py
+++ b/mmdet/models/__init__.py
@@ -1,9 +1,11 @@
-from .detectors import BaseDetector, RPN, FasterRCNN, MaskRCNN
+from .detectors import (BaseDetector, TwoStageDetector, RPN, FastRCNN,
+                        FasterRCNN, MaskRCNN)
 from .builder import (build_neck, build_rpn_head, build_roi_extractor,
                       build_bbox_head, build_mask_head, build_detector)
 
 __all__ = [
-    'BaseDetector', 'RPN', 'FasterRCNN', 'MaskRCNN', 'build_backbone',
-    'build_neck', 'build_rpn_head', 'build_roi_extractor', 'build_bbox_head',
-    'build_mask_head', 'build_detector'
+    'BaseDetector', 'TwoStageDetector', 'RPN', 'FastRCNN', 'FasterRCNN',
+    'MaskRCNN', 'build_backbone', 'build_neck', 'build_rpn_head',
+    'build_roi_extractor', 'build_bbox_head', 'build_mask_head',
+    'build_detector'
 ]
diff --git a/mmdet/models/detectors/__init__.py b/mmdet/models/detectors/__init__.py
index c911d17..a784d5f 100644
--- a/mmdet/models/detectors/__init__.py
+++ b/mmdet/models/detectors/__init__.py
@@ -1,7 +1,11 @@
 from .base import BaseDetector
+from .two_stage import TwoStageDetector
 from .rpn import RPN
 from .fast_rcnn import FastRCNN
 from .faster_rcnn import FasterRCNN
 from .mask_rcnn import MaskRCNN
 
-__all__ = ['BaseDetector', 'RPN', 'FastRCNN', 'FasterRCNN', 'MaskRCNN']
+__all__ = [
+    'BaseDetector', 'TwoStageDetector', 'RPN', 'FastRCNN', 'FasterRCNN',
+    'MaskRCNN'
+]
-- 
GitLab