From 6c0d3f47581acb2c83af3c53524c882fd0ff564b Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Sat, 26 Mar 2022 11:47:42 +0100 Subject: [PATCH 1/5] Sidestep os.path.relpath() Windows bug os.path.relpath() seems to have a major bug on Windows due to Windows horrible path handling. This fix attempts to sidestep the issue. ``` File "C:\Users\mkokg/.cache\torch\hub\ultralytics_yolov5_master\export.py", line 64, in ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative File "C:\Users\mkokg\AppData\Local\Programs\Python\Python310\lib\ntpath.py", line 718, in relpath raise ValueError("path is on mount %r, start on mount %r" % ( ValueError: path is on mount 'C:', start on mount 'D:' ``` --- export.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/export.py b/export.py index 2d4a68e62f89..d51ff776a7f2 100644 --- a/export.py +++ b/export.py @@ -61,7 +61,8 @@ ROOT = FILE.parents[0] # YOLOv5 root directory if str(ROOT) not in sys.path: sys.path.append(str(ROOT)) # add ROOT to PATH -ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative +if sys.platform != 'Windows': + ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative from models.common import Conv from models.experimental import attempt_load From ac369a68d795d053b618e2ba6aca7d6683d4d8c9 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Sat, 26 Mar 2022 12:59:51 +0100 Subject: [PATCH 2/5] Update yolo.py --- models/yolo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/models/yolo.py b/models/yolo.py index 9f4701c49f9d..7fe961cdd5e5 100644 --- a/models/yolo.py +++ b/models/yolo.py @@ -15,7 +15,8 @@ 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 +if sys.platform != 'Windows': + ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative from models.common import * from models.experimental import * From 1224d7ad47fa468edbc3e0efc0c2f72ab3a6d2a7 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Sat, 26 Mar 2022 13:02:42 +0100 Subject: [PATCH 3/5] Update yolo.py --- models/yolo.py | 1 + 1 file changed, 1 insertion(+) diff --git a/models/yolo.py b/models/yolo.py index 7fe961cdd5e5..de970404d68a 100644 --- a/models/yolo.py +++ b/models/yolo.py @@ -7,6 +7,7 @@ """ import argparse +import os import sys from copy import deepcopy from pathlib import Path From 40b40d6efe1bf0adba7dd9457a6557130e5c1401 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Sat, 26 Mar 2022 13:07:30 +0100 Subject: [PATCH 4/5] Update yolo.py --- models/yolo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/models/yolo.py b/models/yolo.py index de970404d68a..11e17d28fa47 100644 --- a/models/yolo.py +++ b/models/yolo.py @@ -8,6 +8,7 @@ import argparse import os +import platform import sys from copy import deepcopy from pathlib import Path @@ -16,7 +17,7 @@ ROOT = FILE.parents[1] # YOLOv5 root directory if str(ROOT) not in sys.path: sys.path.append(str(ROOT)) # add ROOT to PATH -if sys.platform != 'Windows': +if platform.system() != 'Windows': ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative from models.common import * From dd3b874ef18839ae1a09db07a636c4bd083f6f2d Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Sat, 26 Mar 2022 13:08:26 +0100 Subject: [PATCH 5/5] Update export.py --- export.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/export.py b/export.py index d51ff776a7f2..7517dc4678da 100644 --- a/export.py +++ b/export.py @@ -61,7 +61,7 @@ ROOT = FILE.parents[0] # YOLOv5 root directory if str(ROOT) not in sys.path: sys.path.append(str(ROOT)) # add ROOT to PATH -if sys.platform != 'Windows': +if platform.system() != 'Windows': ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative from models.common import Conv