mv modeling.py to models

models/__init__.py

+#  Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserve.
+#
+#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 resnet
+from . import darknet
+from . import yolov3
+
 from .resnet import *
+from .darknet import *
+from .yolov3 import *
+
+__all__ = resnet.__all__ \
+        + darknet.__all__ \
+        + yolov3.__all__

yolov3/darknet.py → models/darknet.py

@@ -19,7 +19,7 @@ from paddle.fluid.regularizer import L2Decay
 from paddle.fluid.dygraph.nn import Conv2D, BatchNorm
 
 from model import Model
-from download import get_weights_path
+from .download import get_weights_path
 
 __all__ = ['DarkNet53', 'ConvBNLayer', 'darknet53']
 

yolov3/modeling.py → models/yolov3.py

@@ -21,10 +21,10 @@ from paddle.fluid.param_attr import ParamAttr
 from paddle.fluid.regularizer import L2Decay
 
 from model import Model, Loss
-from download import get_weights_path
-from darknet import darknet53, ConvBNLayer
+from .darknet import darknet53, ConvBNLayer
+from .download import get_weights_path
 
-__all__ = ['YoloLoss', 'YOLOv3']
+__all__ = ['YoloLoss', 'YOLOv3', 'yolov3_darknet53']
 
 # {num_layers: (url, md5)}
 pretrain_infos = {

yolov3/infer.py

@@ -25,7 +25,8 @@ from paddle.fluid.optimizer import Momentum
 from paddle.fluid.io import DataLoader
 
 from model import Model, Input, set_device
-from modeling import yolov3_darknet53, YoloLoss
+from models import yolov3_darknet53, YoloLoss
+
 from coco import COCODataset
 from transforms import *
 from visualizer import draw_bbox

yolov3/main.py

@@ -27,7 +27,8 @@ from paddle.fluid.io import DataLoader
 
 from model import Model, Input, set_device
 from distributed import DistributedBatchSampler
-from modeling import yolov3_darknet53, YoloLoss
+from models import yolov3_darknet53, YoloLoss
+
 from coco_metric import COCOMetric
 from coco import COCODataset
 from transforms import *