Skip to content

Commit

Permalink
Update relative ROOT logic (ultralytics#4955)
Browse files Browse the repository at this point in the history
* Update relative `ROOT` logic

* python 3.9 Path().is_relative_to() removal
  • Loading branch information
glenn-jocher authored and CesarBazanAV committed Sep 29, 2021
1 parent 32e1990 commit da6435f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions models/tf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
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
Expand Down
4 changes: 3 additions & 1 deletion models/yolo.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@
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
Expand Down Expand Up @@ -281,6 +282,7 @@ def parse_model(d, ch): # model_dict, input_channels(3)
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)

Expand Down

0 comments on commit da6435f

Please sign in to comment.