From b69877067d564bbb79188ea1b677691824dc504b Mon Sep 17 00:00:00 2001
From: Kaipeng Deng <dengkaipeng@baidu.com>
Date: Mon, 1 Feb 2021 15:09:11 +0800
Subject: [PATCH] fix model_zoo package for configs directory structure change
 (#2149)

* fix model_zoo package for configs directory structure change
---
 README_cn.md      |  2 +-
 dygraph/README.md |  6 +++++-
 dygraph/setup.py  | 12 +++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/README_cn.md b/README_cn.md
index b37fa6424..56f7e0177 100644
--- a/README_cn.md
+++ b/README_cn.md
@@ -15,7 +15,7 @@ PaddleDetection模块化地实现了多种主流目标检测算法，提供了
 </div>
 
 ### 产品动态
-- 2021.02.07: 发布release/2.0-beta1版本，PaddleDetection动态图试用版本，详情参考[PaddleDetection动态图](dygraph)。
+- 2021.02.07: 发布release/2.0-rc版本，PaddleDetection动态图试用版本，详情参考[PaddleDetection动态图](dygraph)。
 - 2020.11.20: 发布release/0.5版本,详情请参考[版本更新文档](docs/CHANGELOG.md)。
 - 2020.11.10: 添加实例分割模型[SOLOv2](configs/solov2)，在Tesla V100上达到38.6 FPS, COCO-val数据集上mask ap达到38.8，预测速度提高24%，mAP提高2.4个百分点。
 - 2020.10.30: PP-YOLO支持矩形图像输入，并新增PACT模型量化策略。
diff --git a/dygraph/README.md b/dygraph/README.md
index 329d12b32..7661b0329 100644
--- a/dygraph/README.md
+++ b/dygraph/README.md
@@ -127,12 +127,16 @@ PaddleDetection模块化地实现了多种主流目标检测算法，提供了
 
 ## 文档教程
 
-### 教程
+### 入门教程
 
 - [安装说明](docs/tutorials/INSTALL_cn.md)
 - [快速开始](docs/tutorials/QUICK_START_cn.md)
 - [如何准备数据](docs/tutorials/PrepareDataSet.md)
 - [训练/评估/预测流程](docs/tutorials/GETTING_STARTED_cn.md)
+
+### 进阶教程
+
+- [模型压缩](configs/slim)
 - [推理部署](deploy)
     - [模型导出教程](deploy/EXPORT_MODEL.md)
     - [Python端推理部署](deploy/python)
diff --git a/dygraph/setup.py b/dygraph/setup.py
index 2ecdc8c47..5c2f365b3 100644
--- a/dygraph/setup.py
+++ b/dygraph/setup.py
@@ -35,8 +35,14 @@ def package_model_zoo():
     from ppdet.model_zoo import MODEL_ZOO_FILENAME
     cur_dir = osp.dirname(osp.realpath(__file__))
     cfg_dir = osp.join(cur_dir, "configs")
-    cfgs = glob.glob(osp.join(cfg_dir, '*.yml'))
-    model_names = [osp.splitext(osp.split(cfg)[1])[0] for cfg in cfgs]
+    cfgs = glob.glob(osp.join(cfg_dir, '*/*.yml'))
+
+    valid_cfgs = []
+    for cfg in cfgs:
+        # 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_zoo_file = osp.join(cur_dir, 'ppdet', 'model_zoo', MODEL_ZOO_FILENAME)
     with open(model_zoo_file, 'w') as wf:
@@ -64,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-beta',
+        version='2.0-rc',
         install_requires=parse_requirements('./requirements.txt'),
         description='Object detection and instance segmentation toolkit based on PaddlePaddle',
         long_description=readme(),
-- 
GitLab