diff --git a/tutorials/train/change_detection/bit.py b/tutorials/train/change_detection/bit.py index e550d19a..209701b8 100644 --- a/tutorials/train/change_detection/bit.py +++ b/tutorials/train/change_detection/bit.py @@ -74,7 +74,7 @@ # 使用默认参数构建BIT模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/change_detector.py -model = pdrs.tasks.BIT() +model = pdrs.tasks.cd.BIT() # 执行模型训练 model.train( diff --git a/tutorials/train/change_detection/cdnet.py b/tutorials/train/change_detection/cdnet.py index 142919be..731a1209 100644 --- a/tutorials/train/change_detection/cdnet.py +++ b/tutorials/train/change_detection/cdnet.py @@ -74,7 +74,7 @@ # 使用默认参数构建CDNet模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/change_detector.py -model = pdrs.tasks.CDNet() +model = pdrs.tasks.cd.CDNet() # 执行模型训练 model.train( diff --git a/tutorials/train/change_detection/dsamnet.py b/tutorials/train/change_detection/dsamnet.py index 3a337a68..f9b45e14 100644 --- a/tutorials/train/change_detection/dsamnet.py +++ b/tutorials/train/change_detection/dsamnet.py @@ -74,7 +74,7 @@ # 使用默认参数构建DSAMNet模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/change_detector.py -model = pdrs.tasks.DSAMNet() +model = pdrs.tasks.cd.DSAMNet() # 执行模型训练 model.train( diff --git a/tutorials/train/change_detection/dsifn.py b/tutorials/train/change_detection/dsifn.py index 6f0d11b2..1a8b02f8 100644 --- a/tutorials/train/change_detection/dsifn.py +++ b/tutorials/train/change_detection/dsifn.py @@ -74,7 +74,7 @@ # 使用默认参数构建DSIFN模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/change_detector.py -model = pdrs.tasks.DSIFN() +model = pdrs.tasks.cd.DSIFN() # 执行模型训练 model.train( diff --git a/tutorials/train/change_detection/fc_ef.py b/tutorials/train/change_detection/fc_ef.py index af5ca9c0..7dab6c81 100644 --- a/tutorials/train/change_detection/fc_ef.py +++ b/tutorials/train/change_detection/fc_ef.py @@ -74,7 +74,7 @@ # 使用默认参数构建FC-EF模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/change_detector.py -model = pdrs.tasks.FCEarlyFusion() +model = pdrs.tasks.cd.FCEarlyFusion() # 执行模型训练 model.train( diff --git a/tutorials/train/change_detection/fc_siam_conc.py b/tutorials/train/change_detection/fc_siam_conc.py index 71c8f0e9..dedf7dc5 100644 --- a/tutorials/train/change_detection/fc_siam_conc.py +++ b/tutorials/train/change_detection/fc_siam_conc.py @@ -74,7 +74,7 @@ # 使用默认参数构建FC-Siam-conc模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/change_detector.py -model = pdrs.tasks.FCSiamConc() +model = pdrs.tasks.cd.FCSiamConc() # 执行模型训练 model.train( diff --git a/tutorials/train/change_detection/fc_siam_diff.py b/tutorials/train/change_detection/fc_siam_diff.py index 22f49119..ab7ad717 100644 --- a/tutorials/train/change_detection/fc_siam_diff.py +++ b/tutorials/train/change_detection/fc_siam_diff.py @@ -74,7 +74,7 @@ # 使用默认参数构建FC-Siam-diff模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/change_detector.py -model = pdrs.tasks.FCSiamDiff() +model = pdrs.tasks.cd.FCSiamDiff() # 执行模型训练 model.train( diff --git a/tutorials/train/change_detection/snunet.py b/tutorials/train/change_detection/snunet.py index fdc9411d..d05f9099 100644 --- a/tutorials/train/change_detection/snunet.py +++ b/tutorials/train/change_detection/snunet.py @@ -74,7 +74,7 @@ # 使用默认参数构建SNUNet模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/change_detector.py -model = pdrs.tasks.SNUNet() +model = pdrs.tasks.cd.SNUNet() # 执行模型训练 model.train( diff --git a/tutorials/train/change_detection/stanet.py b/tutorials/train/change_detection/stanet.py index fea77ac6..c7a990f7 100644 --- a/tutorials/train/change_detection/stanet.py +++ b/tutorials/train/change_detection/stanet.py @@ -74,7 +74,7 @@ # 使用默认参数构建STANet模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/change_detector.py -model = pdrs.tasks.STANet() +model = pdrs.tasks.cd.STANet() # 执行模型训练 model.train( diff --git a/tutorials/train/classification/hrnet.py b/tutorials/train/classification/hrnet.py index 5c3ff68e..3e06794f 100644 --- a/tutorials/train/classification/hrnet.py +++ b/tutorials/train/classification/hrnet.py @@ -70,7 +70,7 @@ # 使用默认参数构建HRNet模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/classifier.py -model = pdrs.tasks.HRNet_W18_C(num_classes=len(train_dataset.labels)) +model = pdrs.tasks.clas.HRNet_W18_C(num_classes=len(train_dataset.labels)) # 执行模型训练 model.train( diff --git a/tutorials/train/classification/mobilenetv3.py b/tutorials/train/classification/mobilenetv3.py index 80bd5392..6334b60b 100644 --- a/tutorials/train/classification/mobilenetv3.py +++ b/tutorials/train/classification/mobilenetv3.py @@ -70,7 +70,8 @@ # 使用默认参数构建MobileNetV3模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/classifier.py -model = pdrs.tasks.MobileNetV3_small_x1_0(num_classes=len(train_dataset.labels)) +model = pdrs.tasks.clas.MobileNetV3_small_x1_0( + num_classes=len(train_dataset.labels)) # 执行模型训练 model.train( diff --git a/tutorials/train/classification/resnet50_vd.py b/tutorials/train/classification/resnet50_vd.py index 57b14f78..8950f9bb 100644 --- a/tutorials/train/classification/resnet50_vd.py +++ b/tutorials/train/classification/resnet50_vd.py @@ -70,7 +70,7 @@ # 使用默认参数构建ResNet50-vd模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/classifier.py -model = pdrs.tasks.ResNet50_vd(num_classes=len(train_dataset.labels)) +model = pdrs.tasks.clas.ResNet50_vd(num_classes=len(train_dataset.labels)) # 执行模型训练 model.train( diff --git a/tutorials/train/object_detection/faster_rcnn.py b/tutorials/train/object_detection/faster_rcnn.py index ad2f668e..5a2a12a3 100644 --- a/tutorials/train/object_detection/faster_rcnn.py +++ b/tutorials/train/object_detection/faster_rcnn.py @@ -79,7 +79,7 @@ # 构建Faster R-CNN模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/object_detector.py -model = pdrs.tasks.FasterRCNN(num_classes=len(train_dataset.labels)) +model = pdrs.tasks.det.FasterRCNN(num_classes=len(train_dataset.labels)) # 执行模型训练 model.train( diff --git a/tutorials/train/object_detection/ppyolo.py b/tutorials/train/object_detection/ppyolo.py index bdb8fe82..11d23fb6 100644 --- a/tutorials/train/object_detection/ppyolo.py +++ b/tutorials/train/object_detection/ppyolo.py @@ -80,7 +80,7 @@ # 构建PP-YOLO模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/object_detector.py -model = pdrs.tasks.PPYOLO(num_classes=len(train_dataset.labels)) +model = pdrs.tasks.det.PPYOLO(num_classes=len(train_dataset.labels)) # 执行模型训练 model.train( diff --git a/tutorials/train/object_detection/ppyolotiny.py b/tutorials/train/object_detection/ppyolotiny.py index bbe20661..2daa1f5b 100644 --- a/tutorials/train/object_detection/ppyolotiny.py +++ b/tutorials/train/object_detection/ppyolotiny.py @@ -80,7 +80,7 @@ # 构建PP-YOLO Tiny模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/object_detector.py -model = pdrs.tasks.PPYOLOTiny(num_classes=len(train_dataset.labels)) +model = pdrs.tasks.det.PPYOLOTiny(num_classes=len(train_dataset.labels)) # 执行模型训练 model.train( diff --git a/tutorials/train/object_detection/ppyolov2.py b/tutorials/train/object_detection/ppyolov2.py index 933a478f..11b5d3be 100644 --- a/tutorials/train/object_detection/ppyolov2.py +++ b/tutorials/train/object_detection/ppyolov2.py @@ -80,7 +80,7 @@ # 构建PP-YOLOv2模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/object_detector.py -model = pdrs.tasks.PPYOLOv2(num_classes=len(train_dataset.labels)) +model = pdrs.tasks.det.PPYOLOv2(num_classes=len(train_dataset.labels)) # 执行模型训练 model.train( diff --git a/tutorials/train/object_detection/yolov3.py b/tutorials/train/object_detection/yolov3.py index 79b2b744..68c6e071 100644 --- a/tutorials/train/object_detection/yolov3.py +++ b/tutorials/train/object_detection/yolov3.py @@ -80,7 +80,7 @@ # 构建YOLOv3模型,使用DarkNet53作为backbone # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/object_detector.py -model = pdrs.tasks.YOLOv3( +model = pdrs.tasks.det.YOLOv3( num_classes=len(train_dataset.labels), backbone='DarkNet53') # 执行模型训练 diff --git a/tutorials/train/semantic_segmentation/data/.gitignore b/tutorials/train/semantic_segmentation/data/.gitignore index 716e938a..79690465 100644 --- a/tutorials/train/semantic_segmentation/data/.gitignore +++ b/tutorials/train/semantic_segmentation/data/.gitignore @@ -1,4 +1,3 @@ *.zip *.tar.gz -rsseg/ -optic/ \ No newline at end of file +rsseg/ \ No newline at end of file diff --git a/tutorials/train/semantic_segmentation/deeplabv3p.py b/tutorials/train/semantic_segmentation/deeplabv3p.py index ed99ec07..da929a27 100644 --- a/tutorials/train/semantic_segmentation/deeplabv3p.py +++ b/tutorials/train/semantic_segmentation/deeplabv3p.py @@ -72,7 +72,7 @@ # 构建DeepLab V3+模型,使用ResNet-50作为backbone # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/segmenter.py -model = pdrs.tasks.DeepLabV3P( +model = pdrs.tasks.seg.DeepLabV3P( input_channel=NUM_BANDS, num_classes=len(train_dataset.labels), backbone='ResNet50_vd') diff --git a/tutorials/train/semantic_segmentation/unet.py b/tutorials/train/semantic_segmentation/unet.py index f938ff1f..cc0cb8e6 100644 --- a/tutorials/train/semantic_segmentation/unet.py +++ b/tutorials/train/semantic_segmentation/unet.py @@ -72,7 +72,7 @@ # 构建UNet模型 # 目前已支持的模型请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/docs/apis/model_zoo.md # 模型输入参数请参考:https://github.com/PaddlePaddle/PaddleRS/blob/develop/paddlers/tasks/segmenter.py -model = pdrs.tasks.UNet( +model = pdrs.tasks.seg.UNet( input_channel=NUM_BANDS, num_classes=len(train_dataset.labels)) # 执行模型训练