From c1f36fdced9787b4c006603cc351916a84193998 Mon Sep 17 00:00:00 2001 From: FlyingQianMM <245467267@qq.com> Date: Fri, 10 Sep 2021 12:37:17 +0000 Subject: [PATCH 1/2] rename develop to release 2.0.0 --- README.md | 2 +- docs/CHANGELOG.md | 8 +++--- docs/FAQ/FAQ.md | 2 +- docs/apis/datasets.md | 28 +++++++++---------- docs/apis/export_model.md | 2 +- docs/apis/prediction.md | 6 ++-- docs/apis/tools/anchor_clustering.md | 10 +++---- docs/apis/transforms/transforms.md | 2 +- docs/appendix/model_zoo.md | 2 +- docs/data/split.md | 8 +++--- docs/gui/restful/introduction.md | 4 +-- docs/install.md | 6 ++-- paddlex/cv/models/classifier.py | 2 +- paddlex/cv/models/detector.py | 2 +- .../image_classification/mobilenetv2_prune.py | 12 ++++---- .../image_classification/mobilenetv2_train.py | 10 +++---- .../prune/object_detection/yolov3_prune.py | 12 ++++---- .../prune/object_detection/yolov3_train.py | 10 +++---- .../prune/semantic_segmentation/unet_prune.py | 12 ++++---- .../prune/semantic_segmentation/unet_train.py | 10 +++---- .../image_classification/mobilenetv2_train.py | 2 +- .../instance_segmentation/mask_rcnn_qat.py | 2 +- .../instance_segmentation/mask_rcnn_train.py | 4 +-- .../quantize/object_detection/yolov3_train.py | 2 +- .../semantic_segmentation/unet_qat.py | 6 ++-- .../semantic_segmentation/unet_train.py | 10 +++---- .../train/image_classification/alexnet.py | 10 +++---- .../train/image_classification/darknet53.py | 10 +++---- .../train/image_classification/densenet121.py | 10 +++---- .../train/image_classification/hrnet_w18_c.py | 10 +++---- .../mobilenetv3_large_w_custom_optimizer.py | 8 +++--- .../image_classification/mobilenetv3_small.py | 10 +++---- .../image_classification/resnet50_vd_ssld.py | 10 +++---- .../image_classification/shufflenetv2.py | 10 +++---- .../train/image_classification/xception41.py | 10 +++---- .../mask_rcnn_r50_fpn.py | 10 +++---- .../object_detection/faster_rcnn_hrnet_w18.py | 10 +++---- .../object_detection/faster_rcnn_r50_fpn.py | 10 +++---- tutorials/train/object_detection/ppyolo.py | 10 +++---- .../train/object_detection/ppyolotiny.py | 10 +++---- tutorials/train/object_detection/ppyolov2.py | 10 +++---- .../object_detection/yolov3_darknet53.py | 10 +++---- .../train/semantic_segmentation/bisenetv2.py | 10 +++---- .../deeplabv3p_resnet50_vd.py | 10 +++---- .../train/semantic_segmentation/fastscnn.py | 10 +++---- .../train/semantic_segmentation/hrnet.py | 10 +++---- tutorials/train/semantic_segmentation/unet.py | 10 +++---- 47 files changed, 192 insertions(+), 192 deletions(-) diff --git a/README.md b/README.md index 377b4b28e3..cd187efcf1 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ ### 发布产业实践案例：钢筋计数、缺陷检测、机械手抓取、工业表计读数、Windows系统下使用C#语言部署。[欢迎体验](./examples) -### 升级PaddleX GUI，支持30系列显卡、新增模型PP-YOLO V2、PP-YOLO Tiny 、BiSeNetV2，新增导出API训练脚本功能，无缝切换PaddleX API训练。[欢迎体验](https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/install.md#2-padldex-gui%E5%BC%80%E5%8F%91%E6%A8%A1%E5%BC%8F%E5%AE%89%E8%A3%85) +### 升级PaddleX GUI，支持30系列显卡、新增模型PP-YOLO V2、PP-YOLO Tiny 、BiSeNetV2，新增导出API训练脚本功能，无缝切换PaddleX API训练。[欢迎体验](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/install.md#2-padldex-gui%E5%BC%80%E5%8F%91%E6%A8%A1%E5%BC%8F%E5%AE%89%E8%A3%85) [![License](https://img.shields.io/badge/license-Apache%202-red.svg)](LICENSE) [![Version](https://img.shields.io/github/release/PaddlePaddle/PaddleX.svg)](https://github.com/PaddlePaddle/PaddleX/releases) ![python version](https://img.shields.io/badge/python-3.6+-orange.svg) ![support os](https://img.shields.io/badge/os-linux%2C%20win%2C%20mac-yellow.svg) ![QQGroup](https://img.shields.io/badge/QQ_Group-1045148026-52B6EF?style=social&logo=tencent-qq&logoColor=000&logoWidth=20) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index ef70e14150..6bbf943f62 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -18,10 +18,10 @@ - **2021.07.06 v2.0.0-rc3** - * PaddleX部署全面升级，支持飞桨视觉套件PaddleDetection、PaddleClas、PaddleSeg、PaddleX的端到端统一部署能力。[使用教程](https://github.com/PaddlePaddle/PaddleX/tree/develop/deploy/cpp) - * 全新发布Manufacture SDK，提供工业级多端多平台部署加速的预编译飞桨部署开发包（SDK），通过配置业务逻辑流程文件即可以低代码方式快速完成推理部署。[使用教程](https://github.com/PaddlePaddle/PaddleX/tree/develop/deploy/cpp/docs/manufacture_sdk) - * 发布产业实践案例：钢筋计数、缺陷检测、机械手抓取、工业表计读数、Windows系统下使用C#语言部署。[使用教程](https://github.com/PaddlePaddle/PaddleX/tree/develop/examples) - * 升级PaddleX GUI，支持30系列显卡、新增模型PP-YOLO V2、PP-YOLO Tiny 、BiSeNetV2。[使用教程](https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/install.md#2-padldex-gui%E5%BC%80%E5%8F%91%E6%A8%A1%E5%BC%8F%E5%AE%89%E8%A3%85) + * PaddleX部署全面升级，支持飞桨视觉套件PaddleDetection、PaddleClas、PaddleSeg、PaddleX的端到端统一部署能力。[使用教程](https://github.com/PaddlePaddle/PaddleX/tree/release/2.0.0/deploy/cpp) + * 全新发布Manufacture SDK，提供工业级多端多平台部署加速的预编译飞桨部署开发包（SDK），通过配置业务逻辑流程文件即可以低代码方式快速完成推理部署。[使用教程](https://github.com/PaddlePaddle/PaddleX/tree/release/2.0.0/deploy/cpp/docs/manufacture_sdk) + * 发布产业实践案例：钢筋计数、缺陷检测、机械手抓取、工业表计读数、Windows系统下使用C#语言部署。[使用教程](https://github.com/PaddlePaddle/PaddleX/tree/release/2.0.0/examples) + * 升级PaddleX GUI，支持30系列显卡、新增模型PP-YOLO V2、PP-YOLO Tiny 、BiSeNetV2。[使用教程](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/install.md#2-padldex-gui%E5%BC%80%E5%8F%91%E6%A8%A1%E5%BC%8F%E5%AE%89%E8%A3%85) - **2021.05.19 v2.0.0-rc** diff --git a/docs/FAQ/FAQ.md b/docs/FAQ/FAQ.md index 54777f79ea..fb7c035e22 100644 --- a/docs/FAQ/FAQ.md +++ b/docs/FAQ/FAQ.md @@ -53,7 +53,7 @@ **Q:** 预测结果如何可视化？ -**A:** 检测结果可以用`pdx.det.visualize`，分割结果可以用`pdx.seg.visualize`，API说明见[文档](https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/prediction.md) +**A:** 检测结果可以用`pdx.det.visualize`，分割结果可以用`pdx.seg.visualize`，API说明见[文档](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/prediction.md) **Q:** 如何用旧的部署代码部署新的模型？ diff --git a/docs/apis/datasets.md b/docs/apis/datasets.md index 3dc267ebd1..bd6689b5e6 100644 --- a/docs/apis/datasets.md +++ b/docs/apis/datasets.md @@ -16,7 +16,7 @@ paddlex.datasets.ImageNet(data_dir, file_list, label_list, transforms=None, num_ ``` 读取ImageNet格式的分类数据集，并对样本进行相应的处理。ImageNet数据集格式的介绍可查看文档:[数据集格式说明](../data/format/classification.md) -示例：[代码文件](https://github.com/PaddlePaddle/PaddleX/blob/develop/tutorials/train/image_classification/mobilenetv3_small.py) +示例：[代码文件](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/tutorials/train/image_classification/mobilenetv3_small.py) > **参数** > @@ -35,7 +35,7 @@ paddlex.datasets.VOCDetection(data_dir, file_list, label_list, transforms=None, > 读取PascalVOC格式的检测数据集，并对样本进行相应的处理。PascalVOC数据集格式的介绍可查看文档:[数据集格式说明](../data/format/detection.md) -> 示例：[代码文件](https://github.com/PaddlePaddle/PaddleX/blob/develop/tutorials/train/object_detection/yolov3_darknet53.py) +> 示例：[代码文件](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/tutorials/train/object_detection/yolov3_darknet53.py) > **参数** > @@ -80,7 +80,7 @@ dataset = 'https://bj.bcebos.com/paddlex/datasets/insect_det.tar.gz' pdx.utils.download_and_decompress(dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.MixupImage(mixup_epoch=-1), T.RandomDistort(), T.RandomExpand(im_padding_value=[123.675, 116.28, 103.53]), T.RandomCrop(), @@ -97,7 +97,7 @@ eval_transforms = T.Compose([ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.VOCDetection( data_dir='insect_det', file_list='insect_det/train_list.txt', @@ -117,15 +117,15 @@ anchors = train_dataset.cluster_yolo_anchor(num_anchors=9, image_size=608) anchor_masks = [[6, 7, 8], [3, 4, 5], [0, 1, 2]] # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.det.PPYOLO(num_classes=num_classes, backbone='ResNet50_vd_dcn', anchors=anchors, anchor_masks=anchor_masks) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/detection.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/detection.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=200, train_dataset=train_dataset, @@ -149,7 +149,7 @@ paddlex.datasets.CocoDetection(data_dir, ann_file, transforms=None, num_workers= > 读取MSCOCO格式的检测数据集，并对样本进行相应的处理，该格式的数据集同样可以应用到实例分割模型的训练中。MSCOCO数据集格式的介绍可查看文档:[数据集格式说明](../data/format/instance_segmentation.md) -> 示例：[代码文件](https://github.com/PaddlePaddle/PaddleX/blob/develop/tutorials/train/instance_segmentation/mask_rcnn_r50_fpn.py) +> 示例：[代码文件](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/tutorials/train/instance_segmentation/mask_rcnn_r50_fpn.py) > **参数** > @@ -193,7 +193,7 @@ dataset = 'https://bj.bcebos.com/paddlex/datasets/insect_det.tar.gz' pdx.utils.download_and_decompress(dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.MixupImage(mixup_epoch=-1), T.RandomDistort(), T.RandomExpand(im_padding_value=[123.675, 116.28, 103.53]), T.RandomCrop(), @@ -210,7 +210,7 @@ eval_transforms = T.Compose([ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.CocoDetection( data_dir='xiaoduxiong_ins_det/JPEGImages', ann_file='xiaoduxiong_ins_det/train.json', @@ -226,15 +226,15 @@ anchors = train_dataset.cluster_yolo_anchor(num_anchors=9, image_size=608) anchor_masks = [[6, 7, 8], [3, 4, 5], [0, 1, 2]] # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.det.PPYOLO(num_classes=num_classes, backbone='ResNet50_vd_dcn', anchors=anchors, anchor_masks=anchor_masks) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/detection.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/detection.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=200, train_dataset=train_dataset, @@ -258,7 +258,7 @@ paddlex.datasets.SegDataset(data_dir, file_list, label_list=None, transforms=Non > 读取语义分割任务数据集，并对样本进行相应的处理。语义分割任务数据集格式的介绍可查看文档:[数据集格式说明](../data/format/segmentation.md) -> 示例：[代码文件](https://github.com/PaddlePaddle/PaddleX/blob/develop/tutorials/train/semantic_segmentation/unet.py) +> 示例：[代码文件](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/tutorials/train/semantic_segmentation/unet.py) > **参数** > diff --git a/docs/apis/export_model.md b/docs/apis/export_model.md index aea8d71d11..97be21cf44 100644 --- a/docs/apis/export_model.md +++ b/docs/apis/export_model.md @@ -2,7 +2,7 @@ **注：所有涉及到模型部署，均需要参考本文档，进行部署模型导出** -在服务端部署模型时需要将训练过程中保存的模型导出为inference格式模型，导出的inference格式模型包括`model.pdmodel`、`model.pdiparams`、`model.pdiparams.info`、`model.yml`和`pipeline.yml`五个文件，分别表示模型的网络结构、模型权重、模型权重名称、模型的配置文件（包括数据预处理参数等）和可用于[PaddleX Manufacture SDK](https://github.com/PaddlePaddle/PaddleX/tree/develop/deploy/cpp/docs/manufacture_sdk)的流程配置文件。 +在服务端部署模型时需要将训练过程中保存的模型导出为inference格式模型，导出的inference格式模型包括`model.pdmodel`、`model.pdiparams`、`model.pdiparams.info`、`model.yml`和`pipeline.yml`五个文件，分别表示模型的网络结构、模型权重、模型权重名称、模型的配置文件（包括数据预处理参数等）和可用于[PaddleX Manufacture SDK](https://github.com/PaddlePaddle/PaddleX/tree/release/2.0.0/deploy/cpp/docs/manufacture_sdk)的流程配置文件。 > **检查你的模型文件夹**，如果里面是`model.pdparams`、`model.pdopt`和`model.yml`3个文件时，那么就需要按照下面流程进行模型导出 diff --git a/docs/apis/prediction.md b/docs/apis/prediction.md index d607782047..e9a6351214 100644 --- a/docs/apis/prediction.md +++ b/docs/apis/prediction.md @@ -39,7 +39,7 @@ result = model.predict(test_jpg) pdx.det.visualize(test_jpg, result, threshold=0.3, save_dir='./') ``` - YOLOv3模型predict接口[说明文档](./apis/models/detection.md#predict) -- 可视化pdx.det.visualize接口[说明文档](https://github.com/PaddlePaddle/PaddleX/blob/develop/paddlex/cv/models/utils/visualize.py#L25) +- 可视化pdx.det.visualize接口[说明文档](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/paddlex/cv/models/utils/visualize.py#L25) > 注意：目标检测和实例分割模型在调用`predict`接口得到的结果需用户自行过滤低置信度结果，在`paddlex.det.visualize`接口中，我们提供了`threshold`用于过滤，置信度低于此值的结果将被过滤，不会可视化。 ![](./images/yolo_predict.jpg) @@ -58,7 +58,7 @@ result = model.predict(test_jpg) pdx.det.visualize(test_jpg, result, threshold=0.5, save_dir='./') ``` - MaskRCNN模型predict接口[说明文档](./apis/models/instance_segmentation.md#predict) -- 可视化pdx.det.visualize接口[说明文档](https://github.com/PaddlePaddle/PaddleX/blob/develop/paddlex/cv/models/utils/visualize.py#L25) +- 可视化pdx.det.visualize接口[说明文档](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/paddlex/cv/models/utils/visualize.py#L25) **注意**：目标检测和实例分割模型在调用`predict`接口得到的结果需用户自行过滤低置信度结果，在`paddlex.det.visualize`接口中，我们提供了`threshold`用于过滤，置信度低于此值的结果将被过滤，不会可视化。 ![](./images/mask_predict.jpg) @@ -78,5 +78,5 @@ pdx.seg.visualize(test_jpg, result, weight=0.0, save_dir='./') 在上述示例代码中，通过调用`paddlex.seg.visualize`可以对语义分割的预测结果进行可视化，可视化的结果保存在`save_dir`下，见下图。其中`weight`参数用于调整预测结果和原图结果融合展现时的权重，0.0时只展示预测结果mask的可视化，1.0时只展示原图可视化。 - DeepLabv3模型predict接口[说明文档](./apis/models/semantic_segmentation.md#predict) -- 可视化pdx.seg.visualize接口[说明文档](https://github.com/PaddlePaddle/PaddleX/blob/develop/paddlex/cv/models/utils/visualize.py#L50) +- 可视化pdx.seg.visualize接口[说明文档](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/paddlex/cv/models/utils/visualize.py#L50) ![](images/deeplab_predict.jpg) diff --git a/docs/apis/tools/anchor_clustering.md b/docs/apis/tools/anchor_clustering.md index 42cb1d0263..f1cb0e2e2e 100644 --- a/docs/apis/tools/anchor_clustering.md +++ b/docs/apis/tools/anchor_clustering.md @@ -35,7 +35,7 @@ dataset = 'https://bj.bcebos.com/paddlex/datasets/insect_det.tar.gz' pdx.utils.download_and_decompress(dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.MixupImage(mixup_epoch=-1), T.RandomDistort(), T.RandomExpand(im_padding_value=[123.675, 116.28, 103.53]), T.RandomCrop(), @@ -52,7 +52,7 @@ eval_transforms = T.Compose([ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.VOCDetection( data_dir='insect_det', file_list='insect_det/train_list.txt', @@ -75,15 +75,15 @@ anchors = cluster() anchor_masks = [[6, 7, 8], [3, 4, 5], [0, 1, 2]] # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.det.PPYOLO(num_classes=num_classes, backbone='ResNet50_vd_dcn', anchors=anchors, anchor_masks=anchor_masks) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/detection.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/detection.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=200, train_dataset=train_dataset, diff --git a/docs/apis/transforms/transforms.md b/docs/apis/transforms/transforms.md index e6ebde7132..7757d07e8e 100644 --- a/docs/apis/transforms/transforms.md +++ b/docs/apis/transforms/transforms.md @@ -27,7 +27,7 @@ paddlex.transforms.Compose(transforms) ``` -根据数据预处理/增强算子对输入数据进行操作。 [使用示例](https://github.com/PaddlePaddle/PaddleX/blob/develop/tutorials/train/image_classification/mobilenetv3_small.py#L10) +根据数据预处理/增强算子对输入数据进行操作。 [使用示例](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/tutorials/train/image_classification/mobilenetv3_small.py#L10) > **参数** > * **transforms** (List[paddlex.transforms.Transform]): 数据预处理/数据增强列表。 diff --git a/docs/appendix/model_zoo.md b/docs/appendix/model_zoo.md index 21c957349d..6333f4386f 100644 --- a/docs/appendix/model_zoo.md +++ b/docs/appendix/model_zoo.md @@ -176,7 +176,7 @@ | ResNet101-FPN | Mask | ---- | 40.6 | 36.6 | [下载链接](https://paddledet.bj.bcebos.com/models/mask_rcnn_r101_fpn_1x_coco.pdparams) | | ResNet101-vd-FPN | Mask | ---- | 42.4 | 38.1 | [下载链接](https://paddledet.bj.bcebos.com/models/mask_rcnn_r101_vd_fpn_1x_coco.pdparams) | | ResNeXt101-vd-FPN | Mask | ---- | 44.0 | 39.5 | [下载链接](https://paddledet.bj.bcebos.com/models/mask_rcnn_x101_vd_64x4d_fpn_1x_coco.pdparams) | -| ResNeXt101-vd-FPN | Mask | ---- | 44.6 | 39.8 | [下载链接](https://paddledet.bj.bcebos.com/models/mask_rcnn_x101_vd_64x4d_fpn_2x_coco.pdparams) | (https://github.com/PaddlePaddle/PaddleDetection/tree/develop/configs/mask_rcnn/mask_rcnn_x101_vd_64x4d_fpn_2x_coco.yml) | +| ResNeXt101-vd-FPN | Mask | ---- | 44.6 | 39.8 | [下载链接](https://paddledet.bj.bcebos.com/models/mask_rcnn_x101_vd_64x4d_fpn_2x_coco.pdparams) | (https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.0.0/configs/mask_rcnn/mask_rcnn_x101_vd_64x4d_fpn_2x_coco.yml) | | ResNet50-vd-SSLDv2-FPN | Mask | ---- | 42.0 | 38.2 | [下载链接](https://paddledet.bj.bcebos.com/models/mask_rcnn_r50_vd_fpn_ssld_1x_coco.pdparams) | | ResNet50-vd-SSLDv2-FPN | Mask | ---- | 42.7 | 38.9 | [下载链接](https://paddledet.bj.bcebos.com/models/mask_rcnn_r50_vd_fpn_ssld_2x_coco.pdparams) | diff --git a/docs/data/split.md b/docs/data/split.md index 4011ed89d5..372167538f 100644 --- a/docs/data/split.md +++ b/docs/data/split.md @@ -15,7 +15,7 @@ paddlex --split_dataset --format ImageNet --dataset_dir MyDataset --val_value 0. 划分好的数据集会额外生成`labels.txt`, `train_list.txt`, `val_list.txt`, `test_list.txt`四个文件，之后可直接进行训练。 -- [图像分类任务训练示例代码](https://github.com/PaddlePaddle/PaddleX/blob/develop/tutorials/train/image_classification/mobilenetv2.py) +- [图像分类任务训练示例代码](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/tutorials/train/image_classification/mobilenetv2.py) ## 目标检测 @@ -27,7 +27,7 @@ paddlex --split_dataset --format VOC --dataset_dir D:\MyDataset --val_value 0.2 执行上面命令行，会在`D:\MyDataset`下生成`labels.txt`, `train_list.txt`, `val_list.txt`和`test_list.txt`，分别存储类别信息，训练样本列表，验证样本列表，测试样本列表 -- [目标检测任务训练示例代码](https://github.com/PaddlePaddle/PaddleX/blob/develop/tutorials/train/object_detection/yolov3_mobilenetv1.py) +- [目标检测任务训练示例代码](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/tutorials/train/object_detection/yolov3_mobilenetv1.py) ## 实例分割 @@ -39,7 +39,7 @@ paddlex --split_dataset --format COCO --dataset_dir D:\MyDataset --val_value 0.2 执行上面命令行，会在`D:\MyDataset`下生成`train.json`, `val.json`, `test.json`，分别存储训练样本信息，验证样本信息，测试样本信息 -- [实例分割任务训练示例代码](https://github.com/PaddlePaddle/PaddleX/blob/develop/tutorials/train/instance_segmentation/mask_rcnn_r50_fpn.py) +- [实例分割任务训练示例代码](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/tutorials/train/instance_segmentation/mask_rcnn_r50_fpn.py) ## 语义分割 @@ -50,4 +50,4 @@ paddlex --split_dataset --format SEG --dataset_dir D:\MyDataset --val_value 0.2 执行上面命令行，会在`D:\MyDataset`下生成`train_list.txt`, `val_list.txt`, `test_list.txt`，分别存储训练样本信息，验证样本信息，测试样本信息 -- [语义分割任务训练示例代码](https://github.com/PaddlePaddle/PaddleX/blob/develop/tutorials/train/semantic_segmentation/deeplabv3p_xception65.py) +- [语义分割任务训练示例代码](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/tutorials/train/semantic_segmentation/deeplabv3p_xception65.py) diff --git a/docs/gui/restful/introduction.md b/docs/gui/restful/introduction.md index f431fe5456..f956bdb8f0 100644 --- a/docs/gui/restful/introduction.md +++ b/docs/gui/restful/introduction.md @@ -50,7 +50,7 @@ paddlex_restful --start_restful --port [端口号] --workspace_dir [工作空间 ## PaddleX Web Demo PaddleX Web Demo是针对PaddleX RESTful开发的Web可视化客户端。 -[Wed demo传送门](https://github.com/PaddlePaddle/PaddleX/blob/develop/paddlex_restful/restful/templates/paddlex_restful_demo.html) +[Wed demo传送门](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/paddlex_restful/restful/templates/paddlex_restful_demo.html) ### Web DEMO使用流程 @@ -70,7 +70,7 @@ paddlex_restful --start_restful --port [端口号] --workspace_dir [工作空间 #### step3： - 方法1（推荐）：在浏览器输入开启RESTful服务的机器与端口号如:10.3.12.4:8080，便可以使用WEB GUI，此方法无需step4操作 -- 方法2：通过浏览器打开[Demo](https://github.com/PaddlePaddle/PaddleX/blob/develop/paddlex_restful/restful/templates/paddlex_restful_demo.html)文件 +- 方法2：通过浏览器打开[Demo](https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/paddlex_restful/restful/templates/paddlex_restful_demo.html)文件 diff --git a/docs/install.md b/docs/install.md index 8598dc0c1f..397f1fd853 100755 --- a/docs/install.md +++ b/docs/install.md @@ -13,7 +13,7 @@ 通过简洁易懂的Python API，在兼顾功能全面性、开发灵活性、集成方便性的基础上，给开发者最流畅的深度学习开发体验。
-以下安装过程默认用户已安装好**paddlepaddle-gpu或paddlepaddle(版本大于或等于2.1.0)**，paddlepaddle安装方式参照[飞桨官网](https://www.paddlepaddle.org.cn/install/quick?docurl=/documentation/docs/zh/develop/install/pip/windows-pip.html) +以下安装过程默认用户已安装好**paddlepaddle-gpu或paddlepaddle(版本大于或等于2.1.0)**，paddlepaddle安装方式参照[飞桨官网](https://www.paddlepaddle.org.cn/install/quick?docurl=/documentation/docs/zh/release/2.0.0/install/pip/windows-pip.html) ### PaddleX 2.0.0安装 @@ -52,9 +52,9 @@ pip install cython pip install git+https://gitee.com/jiangjiajun/philferriere-cocoapi.git#subdirectory=PythonAPI ``` -### PaddleX develop安装 +### PaddleX release/2.0.0安装 -github代码会跟随开发进度不断更新，可以安装develop分支的代码使用最新的功能，安装方式如下： +github代码会跟随开发进度不断更新，可以安装release/2.0.0分支的代码使用最新的功能，安装方式如下： ```commandline git clone https://github.com/PaddlePaddle/PaddleX.git diff --git a/paddlex/cv/models/classifier.py b/paddlex/cv/models/classifier.py index 8a623aa24c..58bff9f493 100644 --- a/paddlex/cv/models/classifier.py +++ b/paddlex/cv/models/classifier.py @@ -158,7 +158,7 @@ def default_optimizer(self, parameters, learning_rate, warmup_steps, exit=False) logging.error( "See this doc for more information: " - "https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/appendix/parameters.md#notice", + "https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md", exit=False) logging.error( "warmup_steps should less than {} or lr_decay_epochs[0] greater than {}, " diff --git a/paddlex/cv/models/detector.py b/paddlex/cv/models/detector.py index 5440203803..38d9929654 100644 --- a/paddlex/cv/models/detector.py +++ b/paddlex/cv/models/detector.py @@ -127,7 +127,7 @@ def default_optimizer(self, parameters, learning_rate, warmup_steps, exit=False) logging.error( "See this doc for more information: " - "https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/appendix/parameters.md#notice", + "https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md", exit=False) scheduler = paddle.optimizer.lr.LinearWarmup( diff --git a/tutorials/slim/prune/image_classification/mobilenetv2_prune.py b/tutorials/slim/prune/image_classification/mobilenetv2_prune.py index f502c25b47..a479578ce5 100644 --- a/tutorials/slim/prune/image_classification/mobilenetv2_prune.py +++ b/tutorials/slim/prune/image_classification/mobilenetv2_prune.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(veg_dataset, path='./') # 定义训练和验证时的transforms -# API说明https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose( [T.RandomCrop(crop_size=224), T.RandomHorizontalFlip(), T.Normalize()]) @@ -15,7 +15,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.ImageNet( data_dir='vegetables_cls', file_list='vegetables_cls/train_list.txt', @@ -33,17 +33,17 @@ model = pdx.load_model('output/mobilenet_v2/best_model') # Step 1/3: 分析模型各层参数在不同的剪裁比例下的敏感度 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/classification.md#analyze_sensitivity +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/classification.md#analyze_sensitivity model.analyze_sensitivity( dataset=eval_dataset, save_dir='output/mobilenet_v2/prune') # Step 2/3: 根据选择的FLOPs减小比例对模型进行剪裁 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/classification.md#prune +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/classification.md#prune model.prune(pruned_flops=.2) # Step 3/3: 对剪裁后的模型重新训练 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/classification.md#train -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/classification.md#train +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/slim/prune/image_classification/mobilenetv2_train.py b/tutorials/slim/prune/image_classification/mobilenetv2_train.py index b02c9e2065..090b8eefea 100644 --- a/tutorials/slim/prune/image_classification/mobilenetv2_train.py +++ b/tutorials/slim/prune/image_classification/mobilenetv2_train.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(veg_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose( [T.RandomCrop(crop_size=224), T.RandomHorizontalFlip(), T.Normalize()]) @@ -15,7 +15,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.ImageNet( data_dir='vegetables_cls', file_list='vegetables_cls/train_list.txt', @@ -30,12 +30,12 @@ transforms=eval_transforms) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.cls.MobileNetV2(num_classes=num_classes) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/classification.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/classification.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/slim/prune/object_detection/yolov3_prune.py b/tutorials/slim/prune/object_detection/yolov3_prune.py index 5c5521b782..7b2153aedb 100644 --- a/tutorials/slim/prune/object_detection/yolov3_prune.py +++ b/tutorials/slim/prune/object_detection/yolov3_prune.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.MixupImage(mixup_epoch=250), T.RandomDistort(), T.RandomExpand(im_padding_value=[123.675, 116.28, 103.53]), T.RandomCrop(), @@ -23,7 +23,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.VOCDetection( data_dir='insect_det', file_list='insect_det/train_list.txt', @@ -42,19 +42,19 @@ model = pdx.load_model('output/yolov3_darknet53/best_model') # Step 1/3: 分析模型各层参数在不同的剪裁比例下的敏感度 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/detection.md#analyze_sensitivity +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/detection.md#analyze_sensitivity model.analyze_sensitivity( dataset=eval_dataset, batch_size=1, save_dir='output/yolov3_darknet53/prune') # Step 2/3: 根据选择的FLOPs减小比例对模型进行剪裁 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/detection.md#prune +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/detection.md#prune model.prune(pruned_flops=.2) # Step 3/3: 对剪裁后的模型重新训练 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/detection.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/detection.md#train +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/detection.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/detection.md#train model.train( num_epochs=270, train_dataset=train_dataset, diff --git a/tutorials/slim/prune/object_detection/yolov3_train.py b/tutorials/slim/prune/object_detection/yolov3_train.py index ca9ac0169a..0d17d24014 100644 --- a/tutorials/slim/prune/object_detection/yolov3_train.py +++ b/tutorials/slim/prune/object_detection/yolov3_train.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.MixupImage(mixup_epoch=250), T.RandomDistort(), T.RandomExpand(im_padding_value=[123.675, 116.28, 103.53]), T.RandomCrop(), @@ -23,7 +23,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.VOCDetection( data_dir='insect_det', file_list='insect_det/train_list.txt', @@ -39,12 +39,12 @@ shuffle=False) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.det.YOLOv3(num_classes=num_classes, backbone='DarkNet53') -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/detection.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/detection.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=270, train_dataset=train_dataset, diff --git a/tutorials/slim/prune/semantic_segmentation/unet_prune.py b/tutorials/slim/prune/semantic_segmentation/unet_prune.py index 6d53d9f8ce..4d0fb89649 100644 --- a/tutorials/slim/prune/semantic_segmentation/unet_prune.py +++ b/tutorials/slim/prune/semantic_segmentation/unet_prune.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(optic_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.Resize(target_size=512), T.RandomHorizontalFlip(), @@ -21,7 +21,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.SegDataset( data_dir='optic_disc_seg', file_list='optic_disc_seg/train_list.txt', @@ -40,17 +40,17 @@ model = pdx.load_model('output/unet/best_model') # Step 1/3: 分析模型各层参数在不同的剪裁比例下的敏感度 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/semantic_segmentation.md#analyze_sensitivity +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/semantic_segmentation.md#analyze_sensitivity model.analyze_sensitivity( dataset=eval_dataset, batch_size=1, save_dir='output/unet/prune') # Step 2/3: 根据选择的FLOPs减小比例对模型进行剪裁 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/semantic_segmentation.md#prune +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/semantic_segmentation.md#prune model.prune(pruned_flops=.2) # Step 3/3: 对剪裁后的模型重新训练 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/semantic_segmentation.md#train -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/semantic_segmentation.md#train +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/slim/prune/semantic_segmentation/unet_train.py b/tutorials/slim/prune/semantic_segmentation/unet_train.py index 76a3026aa6..c3ca98abf4 100644 --- a/tutorials/slim/prune/semantic_segmentation/unet_train.py +++ b/tutorials/slim/prune/semantic_segmentation/unet_train.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(optic_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.Resize(target_size=512), T.RandomHorizontalFlip(), @@ -21,7 +21,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.SegDataset( data_dir='optic_disc_seg', file_list='optic_disc_seg/train_list.txt', @@ -37,12 +37,12 @@ shuffle=False) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.seg.UNet(num_classes=num_classes) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/semantic_segmentation.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/semantic_segmentation.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/slim/quantize/image_classification/mobilenetv2_train.py b/tutorials/slim/quantize/image_classification/mobilenetv2_train.py index 04c0dd1948..bab47d39b7 100644 --- a/tutorials/slim/quantize/image_classification/mobilenetv2_train.py +++ b/tutorials/slim/quantize/image_classification/mobilenetv2_train.py @@ -35,7 +35,7 @@ model = pdx.cls.MobileNetV3_large(num_classes=num_classes) # API说明：https://github.com/PaddlePaddle/PaddleX/blob/95c53dec89ab0f3769330fa445c6d9213986ca5f/paddlex/cv/models/classifier.py#L153 -# 各参数介绍与调整说明：https://paddlex.readthedocs.io/zh_CN/develop/appendix/parameters.html +# 各参数介绍与调整说明：https://paddlex.readthedocs.io/zh_CN/release/2.0.0/appendix/parameters.html model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/slim/quantize/instance_segmentation/mask_rcnn_qat.py b/tutorials/slim/quantize/instance_segmentation/mask_rcnn_qat.py index 41ba7b42af..30d62b2b96 100644 --- a/tutorials/slim/quantize/instance_segmentation/mask_rcnn_qat.py +++ b/tutorials/slim/quantize/instance_segmentation/mask_rcnn_qat.py @@ -22,7 +22,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/paddlex/cv/datasets/coco.py#L26 +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/paddlex/cv/datasets/coco.py#L26 train_dataset = pdx.datasets.CocoDetection( data_dir='xiaoduxiong_ins_det/JPEGImages', ann_file='xiaoduxiong_ins_det/train.json', diff --git a/tutorials/slim/quantize/instance_segmentation/mask_rcnn_train.py b/tutorials/slim/quantize/instance_segmentation/mask_rcnn_train.py index 8e60a0e820..2f7300fab3 100644 --- a/tutorials/slim/quantize/instance_segmentation/mask_rcnn_train.py +++ b/tutorials/slim/quantize/instance_segmentation/mask_rcnn_train.py @@ -22,7 +22,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/paddlex/cv/datasets/coco.py#L26 +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/paddlex/cv/datasets/coco.py#L26 train_dataset = pdx.datasets.CocoDetection( data_dir='xiaoduxiong_ins_det/JPEGImages', ann_file='xiaoduxiong_ins_det/train.json', @@ -40,7 +40,7 @@ num_classes=num_classes, backbone='ResNet50', with_fpn=True) # API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0-rc/paddlex/cv/models/detector.py#L155 -# 各参数介绍与调整说明：https://paddlex.readthedocs.io/zh_CN/develop/appendix/parameters.html +# 各参数介绍与调整说明：https://paddlex.readthedocs.io/zh_CN/release/2.0.0/appendix/parameters.html model.train( num_epochs=12, train_dataset=train_dataset, diff --git a/tutorials/slim/quantize/object_detection/yolov3_train.py b/tutorials/slim/quantize/object_detection/yolov3_train.py index d5144d392e..a61d2fa68b 100644 --- a/tutorials/slim/quantize/object_detection/yolov3_train.py +++ b/tutorials/slim/quantize/object_detection/yolov3_train.py @@ -44,7 +44,7 @@ model = pdx.det.YOLOv3(num_classes=num_classes, backbone='DarkNet53') # API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0-rc/paddlex/cv/models/detector.py#L154 -# 各参数介绍与调整说明：https://paddlex.readthedocs.io/zh_CN/develop/appendix/parameters.html +# 各参数介绍与调整说明：https://paddlex.readthedocs.io/zh_CN/release/2.0.0/appendix/parameters.html model.train( num_epochs=270, train_dataset=train_dataset, diff --git a/tutorials/slim/quantize/semantic_segmentation/unet_qat.py b/tutorials/slim/quantize/semantic_segmentation/unet_qat.py index 9a7c2e8646..de56587549 100644 --- a/tutorials/slim/quantize/semantic_segmentation/unet_qat.py +++ b/tutorials/slim/quantize/semantic_segmentation/unet_qat.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(optic_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.Resize(target_size=512), T.RandomHorizontalFlip(), @@ -21,7 +21,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.SegDataset( data_dir='optic_disc_seg', file_list='optic_disc_seg/train_list.txt', @@ -40,7 +40,7 @@ model = pdx.load_model('output/unet/best_model') # 在线量化 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/semantic_segmentation.md#quant_aware_train +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/semantic_segmentation.md#quant_aware_train model.quant_aware_train( num_epochs=5, train_dataset=train_dataset, diff --git a/tutorials/slim/quantize/semantic_segmentation/unet_train.py b/tutorials/slim/quantize/semantic_segmentation/unet_train.py index 76a3026aa6..c3ca98abf4 100644 --- a/tutorials/slim/quantize/semantic_segmentation/unet_train.py +++ b/tutorials/slim/quantize/semantic_segmentation/unet_train.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(optic_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.Resize(target_size=512), T.RandomHorizontalFlip(), @@ -21,7 +21,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.SegDataset( data_dir='optic_disc_seg', file_list='optic_disc_seg/train_list.txt', @@ -37,12 +37,12 @@ shuffle=False) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.seg.UNet(num_classes=num_classes) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/semantic_segmentation.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/semantic_segmentation.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/train/image_classification/alexnet.py b/tutorials/train/image_classification/alexnet.py index f10fe4b2b9..c3b96d840c 100644 --- a/tutorials/train/image_classification/alexnet.py +++ b/tutorials/train/image_classification/alexnet.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(veg_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose( [T.RandomCrop(crop_size=224), T.RandomHorizontalFlip(), T.Normalize()]) @@ -15,7 +15,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.ImageNet( data_dir='vegetables_cls', file_list='vegetables_cls/train_list.txt', @@ -30,12 +30,12 @@ transforms=eval_transforms) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.cls.AlexNet(num_classes=num_classes) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/classification.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/classification.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/train/image_classification/darknet53.py b/tutorials/train/image_classification/darknet53.py index 826ecc0335..c54273eac3 100644 --- a/tutorials/train/image_classification/darknet53.py +++ b/tutorials/train/image_classification/darknet53.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(veg_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose( [T.RandomCrop(crop_size=224), T.RandomHorizontalFlip(), T.Normalize()]) @@ -15,7 +15,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.ImageNet( data_dir='vegetables_cls', file_list='vegetables_cls/train_list.txt', @@ -30,12 +30,12 @@ transforms=eval_transforms) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.cls.DarkNet53(num_classes=num_classes) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/classification.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/classification.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/train/image_classification/densenet121.py b/tutorials/train/image_classification/densenet121.py index 70bb71ece7..7d3567ea42 100644 --- a/tutorials/train/image_classification/densenet121.py +++ b/tutorials/train/image_classification/densenet121.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(veg_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose( [T.RandomCrop(crop_size=224), T.RandomHorizontalFlip(), T.Normalize()]) @@ -15,7 +15,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.ImageNet( data_dir='vegetables_cls', file_list='vegetables_cls/train_list.txt', @@ -30,12 +30,12 @@ transforms=eval_transforms) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.cls.DenseNet121(num_classes=num_classes) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/classification.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/classification.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/train/image_classification/hrnet_w18_c.py b/tutorials/train/image_classification/hrnet_w18_c.py index d9389acdde..ec9a8a8540 100644 --- a/tutorials/train/image_classification/hrnet_w18_c.py +++ b/tutorials/train/image_classification/hrnet_w18_c.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(veg_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose( [T.RandomCrop(crop_size=224), T.RandomHorizontalFlip(), T.Normalize()]) @@ -15,7 +15,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.ImageNet( data_dir='vegetables_cls', file_list='vegetables_cls/train_list.txt', @@ -30,12 +30,12 @@ transforms=eval_transforms) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.cls.HRNet_W18_C(num_classes=num_classes) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/classification.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/classification.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/train/image_classification/mobilenetv3_large_w_custom_optimizer.py b/tutorials/train/image_classification/mobilenetv3_large_w_custom_optimizer.py index 5f5f993135..144dbaf004 100644 --- a/tutorials/train/image_classification/mobilenetv3_large_w_custom_optimizer.py +++ b/tutorials/train/image_classification/mobilenetv3_large_w_custom_optimizer.py @@ -7,7 +7,7 @@ pdx.utils.download_and_decompress(veg_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose( [T.RandomCrop(crop_size=224), T.RandomHorizontalFlip(), T.Normalize()]) @@ -16,7 +16,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.ImageNet( data_dir='vegetables_cls', file_list='vegetables_cls/train_list.txt', @@ -31,7 +31,7 @@ transforms=eval_transforms) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.cls.MobileNetV3_large(num_classes=num_classes) @@ -55,7 +55,7 @@ parameters=model.net.parameters()) # API说明：https://github.com/PaddlePaddle/PaddleX/blob/95c53dec89ab0f3769330fa445c6d9213986ca5f/paddlex/cv/models/classifier.py#L153 -# 各参数介绍与调整说明：https://paddlex.readthedocs.io/zh_CN/develop/appendix/parameters.html +# 各参数介绍与调整说明：https://paddlex.readthedocs.io/zh_CN/release/2.0.0/appendix/parameters.html model.train( num_epochs=num_epochs, train_dataset=train_dataset, diff --git a/tutorials/train/image_classification/mobilenetv3_small.py b/tutorials/train/image_classification/mobilenetv3_small.py index ca11ee5e55..8c83e3ceb1 100644 --- a/tutorials/train/image_classification/mobilenetv3_small.py +++ b/tutorials/train/image_classification/mobilenetv3_small.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(veg_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose( [T.RandomCrop(crop_size=224), T.RandomHorizontalFlip(), T.Normalize()]) @@ -15,7 +15,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.ImageNet( data_dir='vegetables_cls', file_list='vegetables_cls/train_list.txt', @@ -30,12 +30,12 @@ transforms=eval_transforms) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.cls.MobileNetV3_small(num_classes=num_classes) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/classification.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/classification.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/train/image_classification/resnet50_vd_ssld.py b/tutorials/train/image_classification/resnet50_vd_ssld.py index a8f273c05f..7e684dfb4d 100644 --- a/tutorials/train/image_classification/resnet50_vd_ssld.py +++ b/tutorials/train/image_classification/resnet50_vd_ssld.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(veg_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose( [T.RandomCrop(crop_size=224), T.RandomHorizontalFlip(), T.Normalize()]) @@ -15,7 +15,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.ImageNet( data_dir='vegetables_cls', file_list='vegetables_cls/train_list.txt', @@ -30,12 +30,12 @@ transforms=eval_transforms) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.cls.ResNet50_vd_ssld(num_classes=num_classes) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/classification.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/classification.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/train/image_classification/shufflenetv2.py b/tutorials/train/image_classification/shufflenetv2.py index 6bb21891e2..ae43793ded 100644 --- a/tutorials/train/image_classification/shufflenetv2.py +++ b/tutorials/train/image_classification/shufflenetv2.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(veg_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose( [T.RandomCrop(crop_size=224), T.RandomHorizontalFlip(), T.Normalize()]) @@ -15,7 +15,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.ImageNet( data_dir='vegetables_cls', file_list='vegetables_cls/train_list.txt', @@ -30,12 +30,12 @@ transforms=eval_transforms) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.cls.ShuffleNetV2(num_classes=num_classes) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/classification.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/classification.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/train/image_classification/xception41.py b/tutorials/train/image_classification/xception41.py index a8705ebd2b..89a7ff20e4 100644 --- a/tutorials/train/image_classification/xception41.py +++ b/tutorials/train/image_classification/xception41.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(veg_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose( [T.RandomCrop(crop_size=224), T.RandomHorizontalFlip(), T.Normalize()]) @@ -15,7 +15,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.ImageNet( data_dir='vegetables_cls', file_list='vegetables_cls/train_list.txt', @@ -30,12 +30,12 @@ transforms=eval_transforms) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.cls.Xception41(num_classes=num_classes) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/classification.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/classification.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/tree/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/train/instance_segmentation/mask_rcnn_r50_fpn.py b/tutorials/train/instance_segmentation/mask_rcnn_r50_fpn.py index 9587933039..012a16574b 100644 --- a/tutorials/train/instance_segmentation/mask_rcnn_r50_fpn.py +++ b/tutorials/train/instance_segmentation/mask_rcnn_r50_fpn.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.RandomResizeByShort( short_sizes=[640, 672, 704, 736, 768, 800], @@ -22,7 +22,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.CocoDetection( data_dir='xiaoduxiong_ins_det/JPEGImages', ann_file='xiaoduxiong_ins_det/train.json', @@ -34,13 +34,13 @@ transforms=eval_transforms) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.det.MaskRCNN( num_classes=num_classes, backbone='ResNet50', with_fpn=True) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/instance_segmentation.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/instance_segmentation.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=12, train_dataset=train_dataset, diff --git a/tutorials/train/object_detection/faster_rcnn_hrnet_w18.py b/tutorials/train/object_detection/faster_rcnn_hrnet_w18.py index 2e5f1acd35..2c75a23440 100644 --- a/tutorials/train/object_detection/faster_rcnn_hrnet_w18.py +++ b/tutorials/train/object_detection/faster_rcnn_hrnet_w18.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.RandomResizeByShort( short_sizes=[640, 672, 704, 736, 768, 800], @@ -22,7 +22,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.VOCDetection( data_dir='insect_det', file_list='insect_det/train_list.txt', @@ -38,12 +38,12 @@ shuffle=False) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.det.FasterRCNN(num_classes=num_classes, backbone='HRNet_W18') -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/detection.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/detection.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=24, train_dataset=train_dataset, diff --git a/tutorials/train/object_detection/faster_rcnn_r50_fpn.py b/tutorials/train/object_detection/faster_rcnn_r50_fpn.py index 378f80da43..e32309d1a3 100644 --- a/tutorials/train/object_detection/faster_rcnn_r50_fpn.py +++ b/tutorials/train/object_detection/faster_rcnn_r50_fpn.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.RandomResizeByShort( short_sizes=[640, 672, 704, 736, 768, 800], @@ -22,7 +22,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.VOCDetection( data_dir='insect_det', file_list='insect_det/train_list.txt', @@ -38,13 +38,13 @@ shuffle=False) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.det.FasterRCNN( num_classes=num_classes, backbone='ResNet50', with_fpn=True) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/detection.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/detection.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=12, train_dataset=train_dataset, diff --git a/tutorials/train/object_detection/ppyolo.py b/tutorials/train/object_detection/ppyolo.py index 3415d40192..9d0e32c29f 100644 --- a/tutorials/train/object_detection/ppyolo.py +++ b/tutorials/train/object_detection/ppyolo.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.MixupImage(mixup_epoch=-1), T.RandomDistort(), T.RandomExpand(im_padding_value=[123.675, 116.28, 103.53]), T.RandomCrop(), @@ -23,7 +23,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.VOCDetection( data_dir='insect_det', file_list='insect_det/train_list.txt', @@ -39,12 +39,12 @@ shuffle=False) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.det.PPYOLO(num_classes=num_classes, backbone='ResNet50_vd_dcn') -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/detection.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/detection.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=200, train_dataset=train_dataset, diff --git a/tutorials/train/object_detection/ppyolotiny.py b/tutorials/train/object_detection/ppyolotiny.py index f7fe7ba720..4ccc7a131f 100644 --- a/tutorials/train/object_detection/ppyolotiny.py +++ b/tutorials/train/object_detection/ppyolotiny.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.MixupImage(mixup_epoch=-1), T.RandomDistort(), T.RandomExpand(im_padding_value=[123.675, 116.28, 103.53]), T.RandomCrop(), @@ -23,7 +23,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.VOCDetection( data_dir='insect_det', file_list='insect_det/train_list.txt', @@ -39,12 +39,12 @@ shuffle=False) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.det.PPYOLOTiny(num_classes=num_classes) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/detection.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/detection.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=550, train_dataset=train_dataset, diff --git a/tutorials/train/object_detection/ppyolov2.py b/tutorials/train/object_detection/ppyolov2.py index 36251213cc..edf0fbe43e 100644 --- a/tutorials/train/object_detection/ppyolov2.py +++ b/tutorials/train/object_detection/ppyolov2.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.MixupImage(mixup_epoch=-1), T.RandomDistort(), T.RandomExpand(im_padding_value=[123.675, 116.28, 103.53]), T.RandomCrop(), @@ -26,7 +26,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.VOCDetection( data_dir='insect_det', file_list='insect_det/train_list.txt', @@ -42,12 +42,12 @@ shuffle=False) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.det.PPYOLOv2(num_classes=num_classes, backbone='ResNet50_vd_dcn') -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/detection.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/detection.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=170, train_dataset=train_dataset, diff --git a/tutorials/train/object_detection/yolov3_darknet53.py b/tutorials/train/object_detection/yolov3_darknet53.py index a80fed0f3f..ae67f48e1a 100644 --- a/tutorials/train/object_detection/yolov3_darknet53.py +++ b/tutorials/train/object_detection/yolov3_darknet53.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.MixupImage(mixup_epoch=250), T.RandomDistort(), T.RandomExpand(im_padding_value=[123.675, 116.28, 103.53]), T.RandomCrop(), @@ -23,7 +23,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.VOCDetection( data_dir='insect_det', file_list='insect_det/train_list.txt', @@ -39,12 +39,12 @@ shuffle=False) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.det.YOLOv3(num_classes=num_classes, backbone='DarkNet53') -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop//docs/apis/models/detection.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop//docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0//docs/apis/models/detection.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0//docs/parameters.md model.train( num_epochs=270, train_dataset=train_dataset, diff --git a/tutorials/train/semantic_segmentation/bisenetv2.py b/tutorials/train/semantic_segmentation/bisenetv2.py index 4dc27cd3af..5441f2ca66 100644 --- a/tutorials/train/semantic_segmentation/bisenetv2.py +++ b/tutorials/train/semantic_segmentation/bisenetv2.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(optic_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.Resize(target_size=512), T.RandomHorizontalFlip(), @@ -21,7 +21,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.SegDataset( data_dir='optic_disc_seg', file_list='optic_disc_seg/train_list.txt', @@ -37,12 +37,12 @@ shuffle=False) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.seg.BiSeNetV2(num_classes=num_classes) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/semantic_segmentation.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/semantic_segmentation.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/train/semantic_segmentation/deeplabv3p_resnet50_vd.py b/tutorials/train/semantic_segmentation/deeplabv3p_resnet50_vd.py index f6d7958e4d..9f52d87ea4 100644 --- a/tutorials/train/semantic_segmentation/deeplabv3p_resnet50_vd.py +++ b/tutorials/train/semantic_segmentation/deeplabv3p_resnet50_vd.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(optic_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.Resize(target_size=512), T.RandomHorizontalFlip(), @@ -21,7 +21,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.SegDataset( data_dir='optic_disc_seg', file_list='optic_disc_seg/train_list.txt', @@ -37,12 +37,12 @@ shuffle=False) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.seg.DeepLabV3P(num_classes=num_classes, backbone='ResNet50_vd') -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/semantic_segmentation.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/semantic_segmentation.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/train/semantic_segmentation/fastscnn.py b/tutorials/train/semantic_segmentation/fastscnn.py index 7206d5548a..8a65d9de25 100644 --- a/tutorials/train/semantic_segmentation/fastscnn.py +++ b/tutorials/train/semantic_segmentation/fastscnn.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(optic_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.Resize(target_size=512), T.RandomHorizontalFlip(), @@ -21,7 +21,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.SegDataset( data_dir='optic_disc_seg', file_list='optic_disc_seg/train_list.txt', @@ -37,12 +37,12 @@ shuffle=False) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.seg.FastSCNN(num_classes=num_classes) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/semantic_segmentation.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/semantic_segmentation.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/train/semantic_segmentation/hrnet.py b/tutorials/train/semantic_segmentation/hrnet.py index fc1b4c0fc4..a4644dbd39 100644 --- a/tutorials/train/semantic_segmentation/hrnet.py +++ b/tutorials/train/semantic_segmentation/hrnet.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(optic_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.Resize(target_size=512), T.RandomHorizontalFlip(), @@ -21,7 +21,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.SegDataset( data_dir='optic_disc_seg', file_list='optic_disc_seg/train_list.txt', @@ -37,12 +37,12 @@ shuffle=False) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.seg.HRNet(num_classes=num_classes, width=48) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/semantic_segmentation.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/semantic_segmentation.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, diff --git a/tutorials/train/semantic_segmentation/unet.py b/tutorials/train/semantic_segmentation/unet.py index 76a3026aa6..c3ca98abf4 100644 --- a/tutorials/train/semantic_segmentation/unet.py +++ b/tutorials/train/semantic_segmentation/unet.py @@ -6,7 +6,7 @@ pdx.utils.download_and_decompress(optic_dataset, path='./') # 定义训练和验证时的transforms -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/transforms/transforms.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/transforms/transforms.md train_transforms = T.Compose([ T.Resize(target_size=512), T.RandomHorizontalFlip(), @@ -21,7 +21,7 @@ ]) # 定义训练和验证所用的数据集 -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/datasets.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/datasets.md train_dataset = pdx.datasets.SegDataset( data_dir='optic_disc_seg', file_list='optic_disc_seg/train_list.txt', @@ -37,12 +37,12 @@ shuffle=False) # 初始化模型，并进行训练 -# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/train/visualdl.md +# 可使用VisualDL查看训练指标，参考https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/train/visualdl.md num_classes = len(train_dataset.labels) model = pdx.seg.UNet(num_classes=num_classes) -# API说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/apis/models/semantic_segmentation.md -# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/develop/docs/parameters.md +# API说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/apis/models/semantic_segmentation.md +# 各参数介绍与调整说明：https://github.com/PaddlePaddle/PaddleX/blob/release/2.0.0/docs/parameters.md model.train( num_epochs=10, train_dataset=train_dataset, From 5ff04d64200ee8cd3368a05811774a45617ead24 Mon Sep 17 00:00:00 2001 From: FlyingQianMM <245467267@qq.com> Date: Fri, 10 Sep 2021 12:48:03 +0000 Subject: [PATCH 2/2] fix some wrong rename --- deploy/cpp/docs/compile/openvino/openvino_linux.md | 3 ++- deploy/cpp/docs/compile/openvino/openvino_windows.md | 2 ++ deploy/cpp/docs/compile/paddle/linux.md | 4 +++- deploy/cpp/docs/compile/paddle/windows.md | 2 ++ deploy/cpp/docs/compile/tensorrt/trt.md | 2 +- deploy/cpp/docs/compile/triton/docker.md | 2 +- docs/appendix/model_zoo.md | 2 +- docs/install.md | 3 ++- examples/meter_reader/README.md | 2 ++ 9 files changed, 16 insertions(+), 6 deletions(-) diff --git a/deploy/cpp/docs/compile/openvino/openvino_linux.md b/deploy/cpp/docs/compile/openvino/openvino_linux.md index 38c5fbcb31..a21b88fcb8 100644 --- a/deploy/cpp/docs/compile/openvino/openvino_linux.md +++ b/deploy/cpp/docs/compile/openvino/openvino_linux.md @@ -2,7 +2,7 @@ 本文档指引用户如何基于OpenVINO对飞桨模型进行推理，并编译执行。进行以下编译操作前请先安装好OpenVINO，OpenVINO安装请参考官网[OpenVINO-Linux](https://docs.openvinotoolkit.org/latest/_docs_install_guides_installing_openvino_linux.html) -**注意：** +**注意：** - 我们测试的openvino版本为2021.3，如果你使用其它版本遇到问题，可以尝试切换到该版本 - 当前检测模型转换为openvino格式是有问题的，暂时只支持分割和分类模型 @@ -66,6 +66,7 @@ resnet50 ### Step 1. 获取部署代码 ``` git clone https://github.com/PaddlePaddle/PaddleX.git +git checkout release/2.0.0 cd PaddleX/deploy/cpp ``` **说明**：`C++`预测代码在`PaddleX/deploy/cpp` 目录，该目录不依赖任何`PaddleX`下其他目录。所有的推理实现代码在`model_deploy`目录下，所有示例代码都在`demo`目录下，script目录为编译脚本。 diff --git a/deploy/cpp/docs/compile/openvino/openvino_windows.md b/deploy/cpp/docs/compile/openvino/openvino_windows.md index a95a5f751b..b86d15903f 100644 --- a/deploy/cpp/docs/compile/openvino/openvino_windows.md +++ b/deploy/cpp/docs/compile/openvino/openvino_windows.md @@ -66,6 +66,8 @@ resnet50 ### Step 1. 获取部署代码 ``` git clone https://github.com/PaddlePaddle/PaddleX.git +cd PaddleX +git checkout release/2.0.0 ``` **说明**：`C++`预测代码在`PaddleX/deploy/cpp` 目录，该目录不依赖任何`PaddleX`下其他目录。所有的推理实现代码在`model_deploy`目录下，所有示例代码都在`demo`目录下。 diff --git a/deploy/cpp/docs/compile/paddle/linux.md b/deploy/cpp/docs/compile/paddle/linux.md index 66e93e321a..e3b559d581 100644 --- a/deploy/cpp/docs/compile/paddle/linux.md +++ b/deploy/cpp/docs/compile/paddle/linux.md @@ -12,7 +12,9 @@ Ubuntu 16.04/18.04 ### Step1: 获取部署代码 ``` git clone https://github.com/PaddlePaddle/PaddleX.git -cd PaddleX/deploy/cpp +cd PaddleX/ +git checkout release/2.0.0 +cd deploy/cpp ``` **说明**：`C++`预测代码在`PaddleX/deploy/cpp` 目录，该目录不依赖任何`PaddleX`下其他目录。所有的公共实现代码在`model_deploy`目录下，所有示例代码都在`demo`目录下。 diff --git a/deploy/cpp/docs/compile/paddle/windows.md b/deploy/cpp/docs/compile/paddle/windows.md index 81590b5e2a..795e2eac00 100644 --- a/deploy/cpp/docs/compile/paddle/windows.md +++ b/deploy/cpp/docs/compile/paddle/windows.md @@ -19,6 +19,8 @@ d: mkdir projects cd projects git clone https://github.com/PaddlePaddle/PaddleX.git +cd PaddleX +git checkout release/2.0.0 ``` **说明**：其中`C++`预测代码在`PaddleX\dygraph\deploy\cpp` 目录，该目录不依赖任何`PaddleX`下其他目录。所有的公共实现代码在`model_deploy`目录下，所有示例代码都在`demo`目录下。 diff --git a/deploy/cpp/docs/compile/tensorrt/trt.md b/deploy/cpp/docs/compile/tensorrt/trt.md index eedae48ce8..8d7c6aefea 100644 --- a/deploy/cpp/docs/compile/tensorrt/trt.md +++ b/deploy/cpp/docs/compile/tensorrt/trt.md @@ -26,7 +26,7 @@ $ docker run -it --gpus=all --name tensorrt-onnx -v ~/paddle2onnx/:/paddle2onnx ``` $ git clone https://github.com/PaddlePaddle/PaddleX.git $ cd PaddleX -$ git checkout deploykit +$ git checkout release/2.0.0 $ cd deploy/cpp $ git clone https://github.com/NVIDIA/TensorRT.git # 如果不是其他版本的容器， 将cuda_dir路径换成自己的cuda路径即可 diff --git a/deploy/cpp/docs/compile/triton/docker.md b/deploy/cpp/docs/compile/triton/docker.md index 171c0c3ca5..e18fd966cb 100644 --- a/deploy/cpp/docs/compile/triton/docker.md +++ b/deploy/cpp/docs/compile/triton/docker.md @@ -168,7 +168,7 @@ curl -v localhost:8000/v2/health/ready ``` git clone https://github.com/PaddlePaddle/PaddleX.git cd PaddleX -git checkout deploykit +git checkout release/2.0.0 ``` ### 3.2 启动Triton客户端容器 diff --git a/docs/appendix/model_zoo.md b/docs/appendix/model_zoo.md index 6333f4386f..454cd957b7 100644 --- a/docs/appendix/model_zoo.md +++ b/docs/appendix/model_zoo.md @@ -176,7 +176,7 @@ | ResNet101-FPN | Mask | ---- | 40.6 | 36.6 | [下载链接](https://paddledet.bj.bcebos.com/models/mask_rcnn_r101_fpn_1x_coco.pdparams) | | ResNet101-vd-FPN | Mask | ---- | 42.4 | 38.1 | [下载链接](https://paddledet.bj.bcebos.com/models/mask_rcnn_r101_vd_fpn_1x_coco.pdparams) | | ResNeXt101-vd-FPN | Mask | ---- | 44.0 | 39.5 | [下载链接](https://paddledet.bj.bcebos.com/models/mask_rcnn_x101_vd_64x4d_fpn_1x_coco.pdparams) | -| ResNeXt101-vd-FPN | Mask | ---- | 44.6 | 39.8 | [下载链接](https://paddledet.bj.bcebos.com/models/mask_rcnn_x101_vd_64x4d_fpn_2x_coco.pdparams) | (https://github.com/PaddlePaddle/PaddleDetection/tree/release/2.0.0/configs/mask_rcnn/mask_rcnn_x101_vd_64x4d_fpn_2x_coco.yml) | +| ResNeXt101-vd-FPN | Mask | ---- | 44.6 | 39.8 | [下载链接](https://paddledet.bj.bcebos.com/models/mask_rcnn_x101_vd_64x4d_fpn_2x_coco.pdparams) | | ResNet50-vd-SSLDv2-FPN | Mask | ---- | 42.0 | 38.2 | [下载链接](https://paddledet.bj.bcebos.com/models/mask_rcnn_r50_vd_fpn_ssld_1x_coco.pdparams) | | ResNet50-vd-SSLDv2-FPN | Mask | ---- | 42.7 | 38.9 | [下载链接](https://paddledet.bj.bcebos.com/models/mask_rcnn_r50_vd_fpn_ssld_2x_coco.pdparams) | diff --git a/docs/install.md b/docs/install.md index 397f1fd853..8e06d7531a 100755 --- a/docs/install.md +++ b/docs/install.md @@ -52,12 +52,13 @@ pip install cython pip install git+https://gitee.com/jiangjiajun/philferriere-cocoapi.git#subdirectory=PythonAPI ``` -### PaddleX release/2.0.0安装 +### PaddleX develop安装 github代码会跟随开发进度不断更新，可以安装release/2.0.0分支的代码使用最新的功能，安装方式如下： ```commandline git clone https://github.com/PaddlePaddle/PaddleX.git +git checkout develop cd PaddleX pip install -r requirements.txt python setup.py install diff --git a/examples/meter_reader/README.md b/examples/meter_reader/README.md index 9ae00395c1..55fa4b3785 100644 --- a/examples/meter_reader/README.md +++ b/examples/meter_reader/README.md @@ -373,6 +373,8 @@ d: mkdir projects cd projects git clone https://github.com/PaddlePaddle/PaddleX.git +cd PaddleX +git checkout release/2.0.0 ``` ### Step2: 下载PaddleX Manufature SDK