Merge branch 'PaddleCV-SIG:develop' into develop

paddlers/custom_models/__init__.py

@@ -0,0 +1,15 @@
+# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from . import cls, det, seg, gan, cd

paddlers/custom_models/cd/models/param_init.py

@@ -67,7 +67,7 @@ class KaimingInitMixin:
 
     Examples:
 
-        from paddlers.models.cd.models.param_init import KaimingInitMixin
+        from paddlers.custom_models.cd.models.param_init import KaimingInitMixin
 
         class CustomNet(nn.Layer, KaimingInitMixin):
             def __init__(self, num_channels, num_classes):

paddlers/models/__init__.py

@@ -12,5 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from . import ppcls, ppdet, ppseg, ppgan
-from . import cls, det, seg, gan, cd
+from . import ppcls, ppdet, ppseg, ppgan

paddlers/tasks/changedetector.py

@@ -29,7 +29,7 @@ from .base import BaseModel
 from .utils import seg_metrics as metrics
 from paddlers.utils.checkpoint import seg_pretrain_weights_dict
 from paddlers.transforms import ImgDecoder, Resize
-import paddlers.models.cd as cd
+import paddlers.custom_models.cd as cd
 
 __all__ = ["CDNet", "UNetEarlyFusion", "UNetSiamConc", "UNetSiamDiff", "STANet", "BIT", "SNUNet", "DSIFN", "DSAMNet"]
 

paddlers/tasks/segmenter.py

@@ -21,7 +21,7 @@ import paddle
 import paddle.nn.functional as F
 from paddle.static import InputSpec
 import paddlers.models.ppseg as paddleseg
-import paddlers.models.seg as seg
+import paddlers.custom_models.seg as seg
 import paddlers
 from paddlers.transforms import arrange_transforms
 from paddlers.utils import get_single_card_bs, DisablePrint