From e07a2111f321cbd46e76cb9317b30d0d6979c843 Mon Sep 17 00:00:00 2001
From: littletomatodonkey <dazhiningsibuqu@163.com>
Date: Mon, 20 Apr 2020 13:19:44 +0000
Subject: [PATCH] add play around

---
 docs/zh_CN/tutorials/data.md | 26 +++++++++++++-------------
 ppcls/modeling/loss.py       |  3 +--
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/docs/zh_CN/tutorials/data.md b/docs/zh_CN/tutorials/data.md
index 03206b21..6a96e9dc 100644
--- a/docs/zh_CN/tutorials/data.md
+++ b/docs/zh_CN/tutorials/data.md
@@ -3,21 +3,21 @@
 ---
 
 ## 1.简介
-本文档介绍ImageNet1k和Flower102数据准备过程。
+本文档介绍ImageNet1k和flowers102数据准备过程。
 以及PaddleClas提供了丰富的[预训练模型](../models/models_intro.md)
 
 ## 2.数据集准备
 
 数据集 | 训练集大小 | 测试集大小 | 类别数 | 备注|
 :------:|:---------------:|:---------------------:|:-----------:|:-----------:
-[Flower102](https://www.robots.ox.ac.uk/~vgg/data/flowers/102/)|1k | 6k | 102 | 
-[ImageNet1k](http://www.image-net.org/challenges/LSVRC/2012/)|1.2M| 50k | 1000 | 
+[flowers102](https://www.robots.ox.ac.uk/~vgg/data/flowers/102/)|1k | 6k | 102 |
+[ImageNet1k](http://www.image-net.org/challenges/LSVRC/2012/)|1.2M| 50k | 1000 |
 
-数据格式
+* 数据格式
 按照如下结构组织数据，其中train_list.txt 和val_list.txt的格式形如
 
-```
-#每一行采用"空格"分隔图像路径与标注
+```shell
+# 每一行采用"空格"分隔图像路径与标注
 
 ILSVRC2012_val_00000001.JPEG 65
 ...
@@ -44,26 +44,26 @@ PaddleClas/dataset/imagenet/
 |_ train_list.txt
 |_ val_list.txt
 ```
-### Flower
+### Flowers102
 从[VGG官方网站](https://www.robots.ox.ac.uk/~vgg/data/flowers/102/)下载后的数据，解压后包括
 jpg/
 setid.mat
 imagelabels.mat
-将以上文件放置在PaddleClas/dataset/flower102/下
+将以上文件放置在PaddleClas/dataset/flowers102/下
 
-通过运行generate_flower_list.py生成train_list.txt和val_list.txt
+通过运行generate_flowers102_list.py生成train_list.txt和val_list.txt
 
 ```bash
-python generate_flower_list.py jpg train > train_list.txt
-python generate_flower_list.py jpg valid > val_list.txt
+python generate_flowers102_list.py jpg train > train_list.txt
+python generate_flowers102_list.py jpg valid > val_list.txt
 
 ```
 按照如下结构组织数据：
 
 ```bash
-PaddleClas/dataset/flower102/
+PaddleClas/dataset/flowers102/
 |_ jpg/
-|  |_ image_03601.jpg 
+|  |_ image_03601.jpg
 |  |_ ...
 |  |_ image_02355.jpg
 |_ train_list.txt
diff --git a/ppcls/modeling/loss.py b/ppcls/modeling/loss.py
index 8ebf79e7..117ac7cc 100644
--- a/ppcls/modeling/loss.py
+++ b/ppcls/modeling/loss.py
@@ -12,7 +12,6 @@
 #See the License for the specific language governing permissions and
 #limitations under the License.
 
-import paddle
 import paddle.fluid as fluid
 
 __all__ = ['CELoss', 'MixCELoss', 'GoogLeNetLoss', 'JSDivLoss']
@@ -26,7 +25,7 @@ class Loss(object):
     def __init__(self, class_dim=1000, epsilon=None):
         assert class_dim > 1, "class_dim=%d is not larger than 1" % (class_dim)
         self._class_dim = class_dim
-        if epsilon and epsilon >= 0.0 and epsilon <= 1.0:
+        if epsilon is not None and epsilon >= 0.0 and epsilon <= 1.0:
             self._epsilon = epsilon
             self._label_smoothing = True
         else:
-- 
GitLab