From 5ed28603cf94185c28da02b3d8bb433118ac33d4 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Mon, 27 Sep 2021 18:26:41 -0700 Subject: [PATCH] Update relative `ROOT` logic (#4955) * Update relative `ROOT` logic * python 3.9 Path().is_relative_to() removal --- models/tf.py | 1 + models/yolo.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/models/tf.py b/models/tf.py index b7d9935..4c082cb 100644 --- a/models/tf.py +++ b/models/tf.py @@ -20,6 +20,7 @@ FILE = Path(__file__).resolve() ROOT = FILE.parents[1] # YOLOv5 root directory if str(ROOT) not in sys.path: sys.path.append(str(ROOT)) # add ROOT to PATH +ROOT = ROOT.relative_to(Path.cwd()) # relative import numpy as np import tensorflow as tf diff --git a/models/yolo.py b/models/yolo.py index a7590c5..b4ec1ed 100644 --- a/models/yolo.py +++ b/models/yolo.py @@ -15,11 +15,12 @@ FILE = Path(__file__).resolve() ROOT = FILE.parents[1] # YOLOv5 root directory if str(ROOT) not in sys.path: sys.path.append(str(ROOT)) # add ROOT to PATH +ROOT = ROOT.relative_to(Path.cwd()) # relative from models.common import * from models.experimental import * from utils.autoanchor import check_anchor_order -from utils.general import check_yaml, make_divisible, set_logging +from utils.general import check_yaml, make_divisible, print_args, set_logging from utils.plots import feature_visualization from utils.torch_utils import copy_attr, fuse_conv_and_bn, initialize_weights, model_info, scale_img, \ select_device, time_sync @@ -281,6 +282,7 @@ if __name__ == '__main__': parser.add_argument('--profile', action='store_true', help='profile model speed') opt = parser.parse_args() opt.cfg = check_yaml(opt.cfg) # check YAML + print_args(FILE.stem, opt) set_logging() device = select_device(opt.device)