Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
yysijie committed Sep 23, 2019
2 parents ca00927 + 7550a64 commit baadae6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@ ENV/
# custom
mmskeleton/version.py
data
.vscode
.vscode
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

MMSkeleton is an open source toolbox for skeleton-based human understanding.
It is a part of the [open-mmlab](https://github.com/open-mmlab) project in the charge of [Multimedia Laboratory, CUHK](http://mmlab.ie.cuhk.edu.hk/).
MMSkeleton is developed on our research project [ST-GCN](https://github.com/open-mmlab/mmskeleton/tree/st-gcn).
MMSkeleton is developed on our research project [ST-GCN](https://github.com/yysijie/st-gcn/blob/master/OLD_README.md).

<p align="center">
<img src="demo/recognition/demo_video.gif", width="700">
Expand Down
7 changes: 5 additions & 2 deletions run.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from mmcv import Config
import mmskeleton
from mmskeleton.utils import call_obj, set_attr, get_attr
""" Configuration Structure
""" Configuration Structure
argparse_cfg:
<shortcut_name 1>:
Expand All @@ -15,7 +15,7 @@
<shortcut_name 2>:
...
processor_cfg:
processor_cfg:
name: <full processor path>
...
Expand Down Expand Up @@ -44,6 +44,9 @@ def parse_cfg():
if 'bind_to' not in info:
continue
default = get_attr(cfg, info['bind_to'])
if 'type' not in info:
if default is not None:
info['type'] = type(default)
kwargs = dict(default=default)
kwargs.update({k: v for k, v in info.items() if k != 'bind_to'})
parser.add_argument('--' + key, **kwargs)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def get_hash():
sha = get_git_hash()[:7]
elif os.path.exists(version_file):
try:
from mmdet.version import __version__
from mmskeleton.version import __version__
sha = __version__.split('+')[-1]
except ImportError:
raise ImportError('Unable to get git version')
Expand Down

0 comments on commit baadae6

Please sign in to comment.