update 2.0.1

docs/tutorials/INSTALL.md

@@ -71,7 +71,7 @@ PaddleDetection can be installed in the following two ways:
 
 ```
 # install paddledet via pip
-pip install paddledet==2.0.0 -i https://pypi.tuna.tsinghua.edu.cn/simple
+pip install paddledet==2.0.1 -i https://pypi.tuna.tsinghua.edu.cn/simple
 
 # Download and use the configuration files and code examples in the source code
 git clone https://github.com/PaddlePaddle/PaddleDetection.git

docs/tutorials/INSTALL_cn.md

@@ -66,7 +66,7 @@ python -c "import paddle; print(paddle.__version__)"
 
 ```
 # pip安装paddledet
-pip install paddledet==2.0.0 -i https://pypi.tuna.tsinghua.edu.cn/simple
+pip install paddledet==2.0.1 -i https://pypi.tuna.tsinghua.edu.cn/simple
 
 # 下载使用源码中的配置文件和代码示例
 git clone https://github.com/PaddlePaddle/PaddleDetection.git

ppdet/model_zoo/model_zoo.py

@@ -68,11 +68,11 @@ def list_model(filters=[]):
 
 # models and configs save on bcebos under dygraph directory
 def get_config_file(model_name):
-    return get_config_path("ppdet://dygraph/configs/{}.yml".format(model_name))
+    return get_config_path("ppdet://configs/{}.yml".format(model_name))
 
 
 def get_weights_url(model_name):
-    return "ppdet://dygraph/{}.pdparams".format(model_name)
+    return "ppdet://models/{}.pdparams".format(osp.split(model_name)[-1])
 
 
 def get_model(model_name, pretrained=True):

ppdet/utils/download.py

@@ -260,7 +260,8 @@ def get_path(url, root_dir, md5sum=None, check_exist=True):
             fullpath = osp.join(osp.split(fullpath)[0], v)
 
     if osp.exists(fullpath) and check_exist:
-        if _check_exist_file_md5(fullpath, md5sum, url):
+        if not osp.isfile(fullpath) or \
+                _check_exist_file_md5(fullpath, md5sum, url):
             logger.debug("Found {}".format(fullpath))
             return fullpath, True
         else:

setup.py

@@ -42,7 +42,7 @@ def package_model_zoo():
         # exclude dataset base config
         if osp.split(osp.split(cfg)[0])[1] not in ['datasets']:
             valid_cfgs.append(cfg)
-    model_names = [osp.splitext(osp.split(cfg)[1])[0] for cfg in valid_cfgs]
+    model_names = [osp.relpath(cfg, cfg_dir).replace(".yml", "") for cfg in valid_cfgs]
 
     model_zoo_file = osp.join(cur_dir, 'ppdet', 'model_zoo', 'MODEL_ZOO')
     with open(model_zoo_file, 'w') as wf:
@@ -70,7 +70,7 @@ if __name__ == "__main__":
         packages=find_packages(exclude=("configs", "tools", "deploy")),
         package_data={'ppdet.model_zoo': package_model_zoo()},
         author='PaddlePaddle',
-        version='2.0.0',
+        version='2.0.1',
         install_requires=parse_requirements('./requirements.txt'),
         description='Object detection and instance segmentation toolkit based on PaddlePaddle',
         long_description=readme(),