From f6ede445822125b11f366cd591ba72b4c68673db Mon Sep 17 00:00:00 2001 From: Zhiqiang Wang Date: Tue, 12 Oct 2021 13:20:08 +0800 Subject: [PATCH] Rename `_yolov5_darknet_pan` to `build_model` (#198) --- yolort/models/yolo.py | 22 +++++++++++----------- yolort/utils/update_module_state.py | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/yolort/models/yolo.py b/yolort/models/yolo.py index 5390e6e7..76e5f4be 100644 --- a/yolort/models/yolo.py +++ b/yolort/models/yolo.py @@ -22,7 +22,7 @@ "yolov5_darknet_pan_m_r40", "yolov5_darknet_pan_l_r40", "yolov5_darknet_tan_s_r40", - "_yolov5_darknet_pan", + "build_model", ] @@ -229,7 +229,7 @@ def load_from_yolov5( } -def _yolov5_darknet_pan( +def build_model( backbone_name: str, depth_multiple: float, width_multiple: float, @@ -289,7 +289,7 @@ def yolov5_darknet_pan_s_r31( depth_multiple = 0.33 width_multiple = 0.5 version = "r3.1" - return _yolov5_darknet_pan( + return build_model( backbone_name, depth_multiple, width_multiple, @@ -319,7 +319,7 @@ def yolov5_darknet_pan_m_r31( depth_multiple = 0.67 width_multiple = 0.75 version = "r3.1" - return _yolov5_darknet_pan( + return build_model( backbone_name, depth_multiple, width_multiple, @@ -349,7 +349,7 @@ def yolov5_darknet_pan_l_r31( depth_multiple = 1.0 width_multiple = 1.0 version = "r3.1" - return _yolov5_darknet_pan( + return build_model( backbone_name, depth_multiple, width_multiple, @@ -379,7 +379,7 @@ def yolov5_darknet_pan_s_r40( depth_multiple = 0.33 width_multiple = 0.5 version = "r4.0" - return _yolov5_darknet_pan( + return build_model( backbone_name, depth_multiple, width_multiple, @@ -409,7 +409,7 @@ def yolov5_darknet_pan_m_r40( depth_multiple = 0.67 width_multiple = 0.75 version = "r4.0" - return _yolov5_darknet_pan( + return build_model( backbone_name, depth_multiple, width_multiple, @@ -439,7 +439,7 @@ def yolov5_darknet_pan_l_r40( depth_multiple = 1.0 width_multiple = 1.0 version = "r4.0" - return _yolov5_darknet_pan( + return build_model( backbone_name, depth_multiple, width_multiple, @@ -469,7 +469,7 @@ def yolov5_darknet_pan_s_r60( depth_multiple = 0.33 width_multiple = 0.5 version = "r6.0" - return _yolov5_darknet_pan( + return build_model( backbone_name, depth_multiple, width_multiple, @@ -499,7 +499,7 @@ def yolov5_darknet_pan_m_r60( depth_multiple = 0.67 width_multiple = 0.75 version = "r6.0" - return _yolov5_darknet_pan( + return build_model( backbone_name, depth_multiple, width_multiple, @@ -529,7 +529,7 @@ def yolov5_darknet_pan_l_r60( depth_multiple = 1.0 width_multiple = 1.0 version = "r6.0" - return _yolov5_darknet_pan( + return build_model( backbone_name, depth_multiple, width_multiple, diff --git a/yolort/utils/update_module_state.py b/yolort/utils/update_module_state.py index 80e7f8f4..a99d0626 100644 --- a/yolort/utils/update_module_state.py +++ b/yolort/utils/update_module_state.py @@ -111,7 +111,7 @@ def __init__( weights_name = ( f"yolov5_darknet_pan_{yolov5_size}_{version.replace('.', '')}_coco" ) - model = yolo._yolov5_darknet_pan( + model = yolo.build_model( backbone_name, depth_multiple, width_multiple,