From f6a781ac76d00840521d51ed7366733938c2cd7e Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Wed, 3 Jan 2024 12:34:34 +0200 Subject: [PATCH] Use named imports in models.yolo (#12576) --- models/yolo.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/models/yolo.py b/models/yolo.py index 9cd3cddc25c3..f6cdbcb5d2d8 100644 --- a/models/yolo.py +++ b/models/yolo.py @@ -8,12 +8,16 @@ import argparse import contextlib +import math import os import platform import sys from copy import deepcopy from pathlib import Path +import torch +import torch.nn as nn + FILE = Path(__file__).resolve() ROOT = FILE.parents[1] # YOLOv5 root directory if str(ROOT) not in sys.path: @@ -21,10 +25,12 @@ if platform.system() != 'Windows': ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative -from models.common import * # noqa -from models.experimental import * # noqa +from models.common import (C3, C3SPP, C3TR, SPP, SPPF, Bottleneck, BottleneckCSP, C3Ghost, C3x, Classify, Concat, + Contract, Conv, CrossConv, DetectMultiBackend, DWConv, DWConvTranspose2d, Expand, Focus, + GhostBottleneck, GhostConv, Proto) +from models.experimental import MixConv2d from utils.autoanchor import check_anchor_order -from utils.general import LOGGER, check_version, check_yaml, make_divisible, print_args +from utils.general import LOGGER, check_version, check_yaml, colorstr, make_divisible, print_args from utils.plots import feature_visualization from utils.torch_utils import (fuse_conv_and_bn, initialize_weights, model_info, profile, scale_img, select_device, time_sync)