Unverified 提交 153873e9 authored 作者: Malte Lorbach's avatar Malte Lorbach 提交者: GitHub

Fix `ROOT` as relative path (#5129)

* use os.path.relpath instead of relative_to * use os.path.relpath instead of relative_to * Remove os.path from val.py * Remove os.path from train.py * Update detect.py import to os * Update export.py import to os Co-authored-by: 's avatarGlenn Jocher <glenn.jocher@ultralytics.com>
上级 4cf7d487
...@@ -7,6 +7,7 @@ Usage: ...@@ -7,6 +7,7 @@ Usage:
""" """
import argparse import argparse
import os
import sys import sys
from pathlib import Path from pathlib import Path
...@@ -19,7 +20,7 @@ FILE = Path(__file__).resolve() ...@@ -19,7 +20,7 @@ FILE = Path(__file__).resolve()
ROOT = FILE.parents[0] # YOLOv5 root directory ROOT = FILE.parents[0] # YOLOv5 root directory
if str(ROOT) not in sys.path: if str(ROOT) not in sys.path:
sys.path.append(str(ROOT)) # add ROOT to PATH sys.path.append(str(ROOT)) # add ROOT to PATH
ROOT = ROOT.relative_to(Path.cwd()) # relative ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative
from models.experimental import attempt_load from models.experimental import attempt_load
from utils.datasets import LoadImages, LoadStreams from utils.datasets import LoadImages, LoadStreams
......
...@@ -21,6 +21,7 @@ TensorFlow.js: ...@@ -21,6 +21,7 @@ TensorFlow.js:
""" """
import argparse import argparse
import os
import subprocess import subprocess
import sys import sys
import time import time
...@@ -34,7 +35,7 @@ FILE = Path(__file__).resolve() ...@@ -34,7 +35,7 @@ FILE = Path(__file__).resolve()
ROOT = FILE.parents[0] # YOLOv5 root directory ROOT = FILE.parents[0] # YOLOv5 root directory
if str(ROOT) not in sys.path: if str(ROOT) not in sys.path:
sys.path.append(str(ROOT)) # add ROOT to PATH sys.path.append(str(ROOT)) # add ROOT to PATH
ROOT = ROOT.relative_to(Path.cwd()) # relative ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative
from models.common import Conv from models.common import Conv
from models.experimental import attempt_load from models.experimental import attempt_load
......
...@@ -30,7 +30,7 @@ FILE = Path(__file__).resolve() ...@@ -30,7 +30,7 @@ FILE = Path(__file__).resolve()
ROOT = FILE.parents[0] # YOLOv5 root directory ROOT = FILE.parents[0] # YOLOv5 root directory
if str(ROOT) not in sys.path: if str(ROOT) not in sys.path:
sys.path.append(str(ROOT)) # add ROOT to PATH sys.path.append(str(ROOT)) # add ROOT to PATH
ROOT = ROOT.relative_to(Path.cwd()) # relative ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative
import val # for end-of-epoch mAP import val # for end-of-epoch mAP
from models.experimental import attempt_load from models.experimental import attempt_load
......
...@@ -21,7 +21,7 @@ FILE = Path(__file__).resolve() ...@@ -21,7 +21,7 @@ FILE = Path(__file__).resolve()
ROOT = FILE.parents[0] # YOLOv5 root directory ROOT = FILE.parents[0] # YOLOv5 root directory
if str(ROOT) not in sys.path: if str(ROOT) not in sys.path:
sys.path.append(str(ROOT)) # add ROOT to PATH sys.path.append(str(ROOT)) # add ROOT to PATH
ROOT = ROOT.relative_to(Path.cwd()) # relative ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative
from models.experimental import attempt_load from models.experimental import attempt_load
from utils.datasets import create_dataloader from utils.datasets import create_dataloader
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论