Update docs.

README_CN.md

@@ -114,15 +114,15 @@ PaddleSeg是基于飞桨[PaddlePaddle](https://www.paddlepaddle.org.cn)开发的
     * [API应用案例](./docs/api_example.md)
 *  重要模块说明
     * [数据增强](./docs/module/data/data.md)
-    * [Loss说明](./docs/module/loss/lovasz_loss.md)
+    * [Loss说明](./docs/module/loss/losses_cn.md)
     * [Tricks](./docs/module/tricks/tricks.md)
 * 经典模型说明
     * [DeeplabV3](./docs/models/deeplabv3.md)
     * [UNet](./docs/models/unet.md)
     * [OCRNet](./docs/models/ocrnet.md)
     * [Fast-SCNN](./docs/models/fascnn.md)
 * [提交PR说明](./docs/pr/pr/pr.md)
-* [FAQ](./docs/faq/faq/faq.md)
+* [FAQ](./docs/faq/faq/faq_cn.md)
 
 ## 实践案例 <img src="./docs/images/anli.png" width="20"/>
 

README_EN.md

@@ -9,7 +9,7 @@ English | [简体中文](README_CN.md)
 ![support os](https://img.shields.io/badge/os-linux%2C%20win%2C%20mac-yellow.svg)
 ## PaddleSeg has released the new version including the following features:
 
-* Our team won the AutoNUE@CVPR 2021 challenge, where the technical [report](https://bj.bcebos.com/paddleseg/docs/autonue21_presentation_PaddleSeg.pdf)和and[source code](https://github.com/PaddlePaddle/PaddleSeg/tree/release/2.2/contrib/AutoNUE) are available.
+* Our team won the AutoNUE@CVPR 2021 challenge, where the technical [report](https://bj.bcebos.com/paddleseg/docs/autonue21_presentation_PaddleSeg.pdf) and [source code](https://github.com/PaddlePaddle/PaddleSeg/tree/release/2.2/contrib/AutoNUE) are available.
 * We released an efficient interactive annotation tool for image segmentation, named [EISeg](https://github.com/PaddlePaddle/PaddleSeg/tree/release/2.2/contrib/EISeg).
 * We introduced [Panoptic-DeepLab](https://github.com/PaddlePaddle/PaddleSeg/tree/release/2.2/contrib/PanopticDeepLab), which is a proposal-free algorithm  for panoptic segmentation.
 * We provided an ultra-lightweight [portrait segmentation](https://github.com/PaddlePaddle/PaddleSeg/tree/release/2.2/contrib/HumanSeg) solution for the mobile devices and even the web
@@ -99,7 +99,7 @@ Welcome to PaddleSeg! PaddleSeg is an end-to-end image segmentation development
     * [API Application](./docs/api_example.md)
 *  Description of Important Modules
     * [Data Augmentation](./docs/module/data/data.md)
-    * [Loss Description](./docs/module/loss/lovasz_loss.md)
+    * [Loss Description](./docs/module/loss/losses_en.md)
     * [Tricks](./docs/module/tricks/tricks.md)
 * Description of Classical Models
     * [DeeplabV3](./docs/models/deeplabv3.md)

contrib/PanopticDeepLab/README.md

@@ -40,7 +40,7 @@ cd contrib/PanopticDeepLab
 
 ## 数据集准备
 
-将数据集放置于`data`目录下。
+将数据集放置于PaddleSeg/contrib/PanopticDeepLab目录下的`data`目录下。
 
 ### Cityscapes
 

docs/apis/transforms/transforms.md

@@ -82,7 +82,7 @@ class paddleseg.transforms.ResizeStepScaling(min_scale_factor = 0.75,
     Scale an image proportionally within a range.
 
 ### Args
-* **min_scale_factor**** (float, optional): The minimum scale. Default: 0.75.
+* **min_scale_factor** (float, optional): The minimum scale. Default: 0.75.
 * **max_scale_factor** (float, optional): The maximum scale. Default: 1.25.
 * **scale_step_size** (float, optional): The scale interval. Default: 0.25.
 

docs/design/create/add_new_model_cn.md

@@ -319,7 +319,7 @@ lr_scheduler: # 学习率的设置
   end_lr: 0
 ```
 
-假设我们将上面的 yaml 文件保存为 PaddleSeg/configs/custom_configs/NewNet_NewLoss_NewTrans_NewBackbone_NewData.yml，请先切换到PaddleSeg目录下后，运行以下命令：
+假设我们将上面的 yaml 文件保存为 PaddleSeg/configs/custom_configs/NewNet_NewLoss_NewTrans_NewBackbone_NewData.yml，请先切换到PaddleSeg目录下后，运行以下命令：
 ```
 python train.py \
        --config configs/custom_configs/NewNet_NewLoss_NewTrans_NewBackbone_NewData.yml \

docs/faq/faq/faq.md

@@ -1,2 +1,12 @@
+English | [简体中文](faq_cn.md)
 # FAQ
-coming soon
+
+## Q1: How to load the weight parameters of the pre-trained model locally？
+
+* **Answer**:The recommended configuration parameters of the model are stored in the yaml file of each model folder under PaddleSeg/configs. For example, one of the configurations of ANN is given in /PaddleSeg/configs/ann/ann_resnet50_os8_cityscapes_1024x512_80k.yml. As shown below:
+
+![](./faq_imgs/ann_config.png)
+
+> The red part in the figure is the storage location of the pre-training model parameter file of the backbone network. **Note**: Here, we will download the pre-training model parameters provided by us directly in the form of a https link. If you have the pre-trained model parameters of the backbone network locally, please replace the `pretrained` under `backbone` in the yaml file with the absolute path. Or, you should set the relative path for the storage location of the pre-training model parameters according to the directory where the `train.py` will be executed.
+
+> The green part in the figure is the storage location of the pre-training model parameter file of the segmentation network. If you have the pre-trained model parameters of the segmentation network locally, please replace the `pretrained` in the yaml file with the absolute path or relative path where it is stored.

docs/faq/faq/faq_cn.md

@@ -0,0 +1,12 @@
+简体中文 | [English](faq.md)
+# FAQ
+
+## Q1: PaddleSeg 如何从本地加载预训练模型的权重参数？
+
+* **Answer**:PaddleSeg 模型的推荐配置参数统一存放在 PaddleSeg/configs 下各个模型文件夹的 yaml 文件中。比如 ANN 的其中一个配置在 /PaddleSeg/configs/ann/ann_resnet50_os8_cityscapes_1024x512_80k.yml 中给出。如下图所示：
+
+![](./faq_imgs/ann_config.png)
+
+> 图中红色部分为骨干网络的预训练模型参数文件的存放位置。**请注意**：此处将直接以 https 链接形式下载我们提供的预训练模型参数。如果你在本地拥有骨干网络的预训练模型参数，请用其存放的绝对路径替换该 yaml 文件中 `backbone` 下的 `pretrained`。或者，你可以根据将要执行的 `train.py` 所在的目录为该预训练模型参数的存放位置设置相对路径。
+
+> 图中绿色部分为分割网络的预训练模型参数文件的存放位置。如果你在本地拥有分割网络的预训练模型参数，请用其存放的绝对路径或相对路径替换该 yaml 文件中的 `pretrained`。

docs/module/loss/BCELoss_cn.md

@@ -0,0 +1,28 @@
+简体中文 | [English](BCELoss_en.md)
+# [BCELoss](../../../paddleseg/models/losses/binary_cross_entropy_loss.py)
+
+
+二元交叉熵适合处理二分类与多标签分类任务。二元交叉熵以标注图的概率模型为基准，用二分类语义分割模型计算KL散度，根据吉布斯不等式知二者的交叉熵大于语义分割概率模型的熵。计算BCELoss时，我们通常忽略语义分割概率模型的熵（因为它是常量），仅将KL散度的一部分作为损失函数。
+
+
+```python
+class paddleseg.models.losses.BCELoss(
+            weight = None,
+            pos_weight = None,
+            ignore_index = 255,
+            edge_label = False
+)
+```
+
+## BCELoss 使用指南
+
+
+### 参数
+* **weight**  (Tensor | str, optional): 对每个批数据元素的损失手动地重新调整权重。如果设定该参数，
+且若传入的是一个 1D 张量，则其尺寸为 `[N, ]`，其数据类型为 float32 或 float64；
+若传入的是一个 str，则值必须指定为 'dynamic'，以使在每轮迭代中根据二元交叉熵动态的计算权重。
+            *默认:``'None'``*
+* **pos_weight** (float|str, optional): 正样本的权重。若传入的是一个 str，则值必须指定为 'dynamic'，以使在每轮迭代中动态的计算权重。
+            *默认:``'None'``*
+* **ignore_index** (int64, optional): 指定一个在标注图中要忽略的像素值，其对输入梯度不产生贡献。当标注图中存在无法标注（或很难标注）的像素时，可以将其标注为某特定灰度值。在计算损失值时，其与原图像对应位置的像素将不作为损失函数的自变量。 *默认:``255``*
+* **edge_label** (bool, optional): 是否使用边缘标签。 *默认:``False``*

docs/module/loss/BCELoss_en.md

@@ -0,0 +1,31 @@
+English | [简体中文](BCELoss_cn.md)
+# [BCELoss](../../../paddleseg/models/losses/binary_cross_entropy_loss.py)
+
+
+Binary cross entropy is suitable for handling binary classification and multi-label classification tasks.The binary cross entropy is based on the probability model of the annotated map, and the binary semantic segmentation model is used to calculate the KL divergence. According to the Gibbs inequality, the cross entropy of the two is greater than the entropy of the semantic segmentation probability model. When calculating BCELoss, we usually ignore the entropy of the semantic segmentation probability model (because it is a constant), and only use a part of the KL divergence as the loss function.
+
+
+```python
+class paddleseg.models.losses.BCELoss(
+            weight = None,
+            pos_weight = None,
+            ignore_index = 255,
+            edge_label = False
+)
+```
+
+## BCELoss usage guidance
+
+
+### Args
+* **weight**  (Tensor | str, optional): A manual rescaling weight given to the loss of each
+            batch element. If given, it has to be a 1D Tensor whose size is `[N, ]`,the data type is float32, float64. 
+            If type is str, it should equal to 'dynamic'.
+            It will compute weight dynamically in every step.
+            *Default:``'None'``*
+* **pos_weight** (float|str, optional): A weight of positive examples. If type is str,
+            it should equal to 'dynamic'. It will compute weight dynamically in every step.
+            *Default:``'None'``*
+* **ignore_index** (int64, optional): Specify a pixel value to be ignored in the annotated image
+            and does not contribute to the input gradient. When there are pixels that cannot be marked (or difficult to be marked) in the marked image, they can be marked as a specific gray value. When calculating the loss value, the pixel corresponding to the original image will not be used as the independent variable of the loss function. *Default:``255``*
+* **edge_label** (bool, optional): Whether to use edge label. *Default:``False``*

docs/module/loss/BootstrappedCrossEntropyLoss_cn.md

@@ -0,0 +1,20 @@
+简体中文 | [English](BootstrappedCrossEntropyLoss_en.md)
+## [BootstrappedCrossEntropyLoss](../../../paddleseg/models/losses/bootstrapped_cross_entropy.py)
+Bootstrapped 首先利用样本构造初始的分类起，然后对未标记样本进行迭代分类，进而利用扩展后的训练数据为未标记样本提取新的 seed rules。
+[参考文献](https://arxiv.org/pdf/1412.6596.pdf)
+```python
+class paddleseg.models.losses.BootstrappedCrossEntropyLoss(
+                        min_K, 
+                        loss_th, 
+                        weight = None, 
+                        ignore_index = 255
+)
+```
+
+## Bootstrapped cross entropy loss 使用指南
+
+### 参数
+* **min_K**  (int): 在计算损失时，参与计算的最小像素数。
+* **loss_th** (float): 损失阈值。 只计算大于阈值的损失。
+* **weight** (tuple|list, optional): 不同类的权重。 *默认:``None``*
+* **ignore_index** (int, optional): 指定一个在标注图中要忽略的像素值，其对输入梯度不产生贡献。 *默认:``255``*

docs/module/loss/BootstrappedCrossEntropyLoss_en.md

@@ -0,0 +1,24 @@
+English | [简体中文](BootstrappedCrossEntropyLoss_cn.md)
+## [BootstrappedCrossEntropyLoss](../../../paddleseg/models/losses/bootstrapped_cross_entropy.py)
+
+Bootstrapped first uses samples to construct an initial classification, and then iteratively classifies unlabeled samples, and then uses the expanded training data to extract new seed rules for unlabeled samples.
+
+[paper](https://arxiv.org/pdf/1412.6596.pdf)
+```python
+class paddleseg.models.losses.BootstrappedCrossEntropyLoss(
+                        min_K, 
+                        loss_th, 
+                        weight = None, 
+                        ignore_index = 255
+)
+```
+
+## Bootstrapped cross entropy loss usage guidance
+
+### Args
+* **min_K**  (int): the minimum number of pixels to be counted in loss computation.
+* **loss_th** (float): The loss threshold. Only loss that is larger than the threshold
+            would be calculated.
+* **weight** (tuple|list, optional): The weight for different classes. *Default:``None``*
+* **ignore_index** (int, optional): Specify a pixel value to be ignored in the annotated image
+            and does not contribute to the input gradient.When there are pixels that cannot be marked (or difficult to be marked) in the marked image, they can be marked as a specific gray value. When calculating the loss value, the pixel corresponding to the original image will not be used as the independent variable of the loss function. *Default:``255``*

docs/module/loss/CrossEntropyLoss_cn.md

@@ -0,0 +1,21 @@
+简体中文 | [English](CrossEntropyLoss_en.md)
+## [CrossEntropyLoss](../../../paddleseg/models/losses/cross_entropy_loss.py)
+
+
+交叉熵 (CE) 方法由于其简单性和有效性，允许调整不同类别像素的权重，成为了一种最流行的损失函数。在很多语义分割任务中，交叉熵依赖于足够多的目标函数调用来准确估计基础分布的最佳参数。
+CrossEntropyLoss常用于多像素类别的分割任务，其描述的是两个概率分布之间的不同，可以用来刻画当前模型与实际模型之间的差距（在训练过程中，我们暂时认为给出的标注集就是真实世界中的模型）。注意：机器学习算法中的逻辑回归是这种交叉熵的特例。
+```python
+class paddleseg.models.losses.CrossEntropyLoss(
+                weight = None, 
+                ignore_index = 255, 
+                top_k_percent_pixels = 1.0
+)
+```
+
+## Cross entropy loss 使用指南
+
+### 参数
+* **weight**  (tuple|list|ndarray|Tensor, optional): 为每个像素类别的损失手动调整权重。它的长度必须等同于像素类别数。可在多类样本不均衡等情况下调整各类的权重。
+            *默认 ``None``*
+* **ignore_index** (int64, optional): 指定一个在标注图中要忽略的像素值，其对输入梯度不产生贡献。当标注图中存在无法标注（或很难标注）的像素时，可以将其标注为某特定灰度值。在计算损失值时，其与原图像对应位置的像素将不作为损失函数的自变量。 *默认:``255``*
+* **top_k_percent_pixels** (float, optional): 该值的取值范围为 [0.0, 1.0]。 当该值 < 1.0 时，仅计算前 k% 像素（例如，前 20% 像素）的损失。 这将有助于对难分像素的挖掘。

docs/module/loss/CrossEntropyLoss_en.md

@@ -0,0 +1,23 @@
+English | [简体中文](CrossEntropyLoss_cn.md)
+## [CrossEntropyLoss](../../../paddleseg/models/losses/cross_entropy_loss.py)
+
+The cross entropy (CE) method has become one of the most popular loss functions due to its simplicity and effectiveness, allowing adjustment of the weights of different categories of pixels. In many semantic segmentation tasks, cross entropy relies on enough objective function calls to accurately estimate the best parameters of the underlying distribution.
+CrossEntropyLoss is often used for multi-pixel segmentation tasks. It describes the difference between two probability distributions. It can be used to describe the gap between the current model and the actual model (during the training process, we temporarily think that the given label set It is the model in the real world). Note: Logistic regression in machine learning algorithms is a special case of this kind of cross-entropy.
+```python
+class paddleseg.models.losses.CrossEntropyLoss(
+                weight = None, 
+                ignore_index = 255, 
+                top_k_percent_pixels = 1.0
+)
+```
+
+## Cross entropy loss usage guidance
+
+### Args
+* **weight**  (tuple|list|ndarray|Tensor, optional): A manual rescaling weight
+            given to each class. Its length must be equal to the number of classes.The weights of various types can be adjusted under conditions such as unbalanced samples of multiple types.
+            *Default ``None``*
+* **ignore_index** (int64, optional): Specify a pixel value to be ignored in the annotated image
+            and does not contribute to the input gradient.When there are pixels that cannot be marked (or difficult to be marked) in the marked image, they can be marked as a specific gray value. When calculating the loss value, the pixel corresponding to the original image will not be used as the independent variable of the loss function. *Default:``255``*
+* **top_k_percent_pixels** (float, optional): The value lies in [0.0, 1.0]. When its value < 1.0, only compute the loss for
+            the top k percent pixels (e.g., the top 20% pixels). This is useful for hard pixel mining.

docs/module/loss/DiceLoss_cn.md

@@ -0,0 +1,16 @@
+简体中文 | [English](DiceLoss_en.md)
+## [DiceLoss](../../../paddleseg/models/losses/dice_loss.py)
+Dice Loss 是一种广泛的应用于医学影像分割任务中的损失函数。Dice 系数是一种用于度量集合之间的相似程度的函数，在语义分割任务中，我们可以理解为当前的模型与真实世界中的真实模型之间的相似程度。Dice损失函数的计算过程包括用预测分割图与GT分割图之间进行点乘、对点乘结果的每个位置进行累计求和，最后计算 1-Dice 的值作为损失函数的输出，即 Dice = 1-2(|X∩Y|/|X|+|Y|)。你可以使用拉普拉斯平滑系数，将分子分母添加该系数后，可以避免除0异常，同时减少过拟合。即Dice_smooth = 1-2((|X∩Y|+smooth) / (|X|+|Y|+smooth) )
+```python。
+
+class paddleseg.models.losses.DiceLoss(
+            ignore_index = 255, 
+            smooth = 0.
+)
+```
+
+## Dice loss 使用指南
+
+### 参数
+* **ignore_index**  (int64, optional): 指定一个在标注图中要忽略的像素值，其对输入梯度不产生贡献。当标注图中存在无法标注（或很难标注）的像素时，可以将其标注为某特定灰度值。在计算损失值时，其与原图像对应位置的像素将不作为损失函数的自变量。 *默认:``255``*
+* **smooth** (float, optional): 可以添加该smooth参数以防止出现除0异常。你也可以设置更大的平滑值（拉普拉斯平滑）以避免过拟合。*默认:`` 0``*

docs/module/loss/DiceLoss_en.md

@@ -0,0 +1,19 @@
+English | [简体中文](DiceLoss_cn.md)
+## [DiceLoss](../../../paddleseg/models/losses/dice_loss.py)
+
+Dice Loss is a loss function widely used in medical image segmentation tasks. The Dice coefficient is a function used to measure the degree of similarity between sets. In the semantic segmentation task, we can understand the degree of similarity between the current model and the real model in the real world. The calculation process of the Dice loss function includes the dot multiplication between the predicted segmentation map and the GT segmentation map, the cumulative sum of each position of the dot multiplication result, and finally the calculation of the value of 1-Dice as the output of the loss function, that is, Dice = 1-2(|X∩Y|/|X|+|Y|). You can use the Laplacian smoothing coefficient. After adding the coefficient to the numerator and denominator, you can avoid the division by 0 exception and reduce overfitting. That is, Dice_smooth = 1-2((|X∩Y|+smooth) / (|X|+|Y|+smooth))
+
+```python。
+
+class paddleseg.models.losses.DiceLoss(
+            ignore_index = 255, 
+            smooth = 0.
+)
+```
+
+## Dice loss usage guidance
+
+### Args
+* **ignore_index**  (int64, optional): Specify a pixel value to be ignored in the annotated image
+            and does not contribute to the input gradient.When there are pixels that cannot be marked (or difficult to be marked) in the marked image, they can be marked as a specific gray value. When calculating the loss value, the pixel corresponding to the original image will not be used as the independent variable of the loss function. *Default:``255``*
+* **smooth** (float, optional): The smooth parameter can be added to prevent the division by 0 exception. You can also set a larger smoothing value (Laplacian smoothing) to avoid overfitting.*Default:``0``*