rename torchpack to runner

mmcv/__init__.py

@@ -7,3 +7,4 @@ from .image import *
 from .video import *
 from .visualization import *
 from .version import __version__
+# runner is not imported here, so mmcv may be used without PyTorch

mmcv/torchpack/__init__.py → mmcv/runner/__init__.py

-from .runner import Runner, LogBuffer
+from .runner import Runner
+from .log_buffer import LogBuffer
 from .hooks import (Hook, CheckpointHook, ClosureHook, LrUpdaterHook,
                     OptimizerHook, IterTimerHook, DistSamplerSeedHook,
                     LoggerHook, TextLoggerHook, PaviLoggerHook,
                     TensorboardLoggerHook)
-from .io import (load_state_dict, load_checkpoint, weights_to_cpu,
-                 save_checkpoint)
+from .checkpoint import (load_state_dict, load_checkpoint, weights_to_cpu,
+                         save_checkpoint)
 from .parallel import parallel_test, worker_func
 from .utils import (get_host_info, get_dist_info, master_only, get_time_str,
-                    add_file_handler, obj_from_dict)
+                    obj_from_dict)
 
 __all__ = [
     'Runner', 'LogBuffer', 'Hook', 'CheckpointHook', 'ClosureHook',
@@ -15,5 +16,5 @@ __all__ = [
     'LoggerHook', 'TextLoggerHook', 'PaviLoggerHook', 'TensorboardLoggerHook',
     'load_state_dict', 'load_checkpoint', 'weights_to_cpu', 'save_checkpoint',
     'parallel_test', 'worker_func', 'get_host_info', 'get_dist_info',
-    'master_only', 'get_time_str', 'add_file_handler', 'obj_from_dict'
+    'master_only', 'get_time_str', 'obj_from_dict'
 ]

mmcv/torchpack/runner/log_buffer.py → mmcv/runner/log_buffer.py

 from collections import OrderedDict
+
 import numpy as np
 
 

mmcv/torchpack/parallel.py → mmcv/runner/parallel.py

@@ -3,7 +3,7 @@ import multiprocessing
 import torch
 
 import mmcv
-from .io import load_checkpoint
+from .checkpoint import load_checkpoint
 
 
 def worker_func(model_cls, model_kwargs, checkpoint, dataset, data_func,

mmcv/torchpack/runner/runner.py → mmcv/runner/runner.py

@@ -5,13 +5,12 @@ import time
 import mmcv
 import torch
 
+from . import hooks
 from .log_buffer import LogBuffer
-from .. import hooks
-from ..hooks import (Hook, LrUpdaterHook, CheckpointHook, IterTimerHook,
-                     OptimizerHook)
-from ..io import load_checkpoint, save_checkpoint
-from ..utils import (get_dist_info, get_host_info, get_time_str,
-                     add_file_handler, obj_from_dict)
+from .hooks import (Hook, LrUpdaterHook, CheckpointHook, IterTimerHook,
+                    OptimizerHook)
+from .io import load_checkpoint, save_checkpoint
+from .utils import get_dist_info, get_host_info, get_time_str, obj_from_dict
 
 
 class Runner(object):
@@ -128,6 +127,19 @@ class Runner(object):
                 'but got {}'.format(type(optimizer)))
         return optimizer
 
+    def _add_file_handler(self,
+                          logger,
+                          filename=None,
+                          mode='w',
+                          level=logging.INFO):
+        # TODO: move this method out of runner
+        file_handler = logging.FileHandler(filename, mode)
+        file_handler.setFormatter(
+            logging.Formatter('%(asctime)s - %(levelname)s - %(message)s'))
+        file_handler.setLevel(level)
+        logger.addHandler(file_handler)
+        return logger
+
     def init_logger(self, log_dir=None, level=logging.INFO):
         """Init the logger.
 
@@ -145,7 +157,7 @@ class Runner(object):
         if log_dir:
             filename = '{}_{}.log'.format(get_time_str(), self.rank)
             log_file = osp.join(log_dir, filename)
-            add_file_handler(logger, log_file, level=level)
+            self._add_file_handler(logger, log_file, level=level)
         return logger
 
     def current_lr(self):

mmcv/torchpack/utils.py → mmcv/runner/utils.py

@@ -38,14 +38,6 @@ def get_time_str():
     return time.strftime('%Y%m%d_%H%M%S', time.localtime())
 
 
-def add_file_handler(logger, filename=None, mode='w', level=logging.INFO):
-    file_handler = logging.FileHandler(filename, mode)
-    file_handler.setFormatter(
-        logging.Formatter('%(asctime)s - %(levelname)s - %(message)s'))
-    logger.addHandler(file_handler)
-    return logger
-
-
 def obj_from_dict(info, parrent=None, default_args=None):
     """Initialize an object from dict.