Merge branch 'dev' of github.com:hellock/mmdetection into dev

.gitignore

@@ -105,4 +105,5 @@ venv.bak/
 
 # cython generated cpp
 mmdet/ops/nms/*.cpp
+mmdet/version.py
 data

mmdet/__init__.py

-from .version import __version__
+from .version import __version__, short_version

mmdet/version.py

-__version__ = '0.5.0'

setup.py

+import os
+import subprocess
+import time
 from setuptools import find_packages, setup
 
 
@@ -7,14 +10,79 @@ def readme():
     return content
 
 
+MAJOR = 0
+MINOR = 5
+PATCH = 0
+SUFFIX = ''
+SHORT_VERSION = '{}.{}.{}{}'.format(MAJOR, MINOR, PATCH, SUFFIX)
+
+version_file = 'mmdet/version.py'
+
+
+def get_git_hash():
+
+    def _minimal_ext_cmd(cmd):
+        # construct minimal environment
+        env = {}
+        for k in ['SYSTEMROOT', 'PATH', 'HOME']:
+            v = os.environ.get(k)
+            if v is not None:
+                env[k] = v
+        # LANGUAGE is used on win32
+        env['LANGUAGE'] = 'C'
+        env['LANG'] = 'C'
+        env['LC_ALL'] = 'C'
+        out = subprocess.Popen(
+            cmd, stdout=subprocess.PIPE, env=env).communicate()[0]
+        return out
+
+    try:
+        out = _minimal_ext_cmd(['git', 'rev-parse', 'HEAD'])
+        sha = out.strip().decode('ascii')
+    except OSError:
+        sha = 'unknown'
+
+    return sha
+
+
+def get_hash():
+    if os.path.exists('.git'):
+        sha = get_git_hash()[:7]
+    elif os.path.exists(version_file):
+        try:
+            from mmdet.version import __version__
+            sha = __version__.split('+')[-1]
+        except ImportError:
+            raise ImportError('Unable to get git version')
+    else:
+        sha = 'unknown'
+
+    return sha
+
+
+def write_version_py():
+    content = """# GENERATED VERSION FILE 
+# TIME: {}
+
+__version__ = '{}'
+short_version = '{}'
+"""
+    sha = get_hash()
+    VERSION = SHORT_VERSION + '+' + sha
+
+    with open(version_file, 'w') as f:
+        f.write(content.format(time.asctime(), VERSION, SHORT_VERSION))
+
+
 def get_version():
-    version_file = 'mmdet/version.py'
     with open(version_file, 'r') as f:
         exec(compile(f.read(), version_file, 'exec'))
     return locals()['__version__']
 
 
-setup(
+if __name__ == '__main__':
+    write_version_py()
+    setup(
         name='mmdet',
         version=get_version(),
         description='Open MMLab Detection Toolbox',

tools/train.py

@@ -9,7 +9,7 @@ import torch
 from mmcv import Config
 from mmcv.torchpack import Runner, obj_from_dict
 
-from mmdet import datasets
+from mmdet import datasets, __version__
 from mmdet.core import (init_dist, DistOptimizerHook, DistSamplerSeedHook,
                         MMDataParallel, MMDistributedDataParallel,
                         CocoDistEvalRecallHook, CocoDistEvalmAPHook)
@@ -89,6 +89,8 @@ def main():
     if args.work_dir is not None:
         cfg.work_dir = args.work_dir
     cfg.gpus = args.gpus
+    # add mmdet version to checkpoint as meta data
+    cfg.checkpoint_config.meta = dict(mmdet_version=__version__)
 
     logger = get_logger(cfg.log_level)