Malte Lorbach glenn-jocher commited on
Commit
153873e
1 Parent(s): 4cf7d48

Fix `ROOT` as relative path (#5129)

Browse files

* 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: Glenn Jocher <glenn.jocher@ultralytics.com>

Files changed (4) hide show
  1. detect.py +2 -1
  2. export.py +2 -1
  3. train.py +1 -1
  4. val.py +1 -1
detect.py CHANGED
@@ -7,6 +7,7 @@ Usage:
7
  """
8
 
9
  import argparse
 
10
  import sys
11
  from pathlib import Path
12
 
@@ -19,7 +20,7 @@ FILE = Path(__file__).resolve()
19
  ROOT = FILE.parents[0] # YOLOv5 root directory
20
  if str(ROOT) not in sys.path:
21
  sys.path.append(str(ROOT)) # add ROOT to PATH
22
- ROOT = ROOT.relative_to(Path.cwd()) # relative
23
 
24
  from models.experimental import attempt_load
25
  from utils.datasets import LoadImages, LoadStreams
 
7
  """
8
 
9
  import argparse
10
+ import os
11
  import sys
12
  from pathlib import Path
13
 
 
20
  ROOT = FILE.parents[0] # YOLOv5 root directory
21
  if str(ROOT) not in sys.path:
22
  sys.path.append(str(ROOT)) # add ROOT to PATH
23
+ ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative
24
 
25
  from models.experimental import attempt_load
26
  from utils.datasets import LoadImages, LoadStreams
export.py CHANGED
@@ -21,6 +21,7 @@ TensorFlow.js:
21
  """
22
 
23
  import argparse
 
24
  import subprocess
25
  import sys
26
  import time
@@ -34,7 +35,7 @@ FILE = Path(__file__).resolve()
34
  ROOT = FILE.parents[0] # YOLOv5 root directory
35
  if str(ROOT) not in sys.path:
36
  sys.path.append(str(ROOT)) # add ROOT to PATH
37
- ROOT = ROOT.relative_to(Path.cwd()) # relative
38
 
39
  from models.common import Conv
40
  from models.experimental import attempt_load
 
21
  """
22
 
23
  import argparse
24
+ import os
25
  import subprocess
26
  import sys
27
  import time
 
35
  ROOT = FILE.parents[0] # YOLOv5 root directory
36
  if str(ROOT) not in sys.path:
37
  sys.path.append(str(ROOT)) # add ROOT to PATH
38
+ ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative
39
 
40
  from models.common import Conv
41
  from models.experimental import attempt_load
train.py CHANGED
@@ -30,7 +30,7 @@ FILE = Path(__file__).resolve()
30
  ROOT = FILE.parents[0] # YOLOv5 root directory
31
  if str(ROOT) not in sys.path:
32
  sys.path.append(str(ROOT)) # add ROOT to PATH
33
- ROOT = ROOT.relative_to(Path.cwd()) # relative
34
 
35
  import val # for end-of-epoch mAP
36
  from models.experimental import attempt_load
 
30
  ROOT = FILE.parents[0] # YOLOv5 root directory
31
  if str(ROOT) not in sys.path:
32
  sys.path.append(str(ROOT)) # add ROOT to PATH
33
+ ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative
34
 
35
  import val # for end-of-epoch mAP
36
  from models.experimental import attempt_load
val.py CHANGED
@@ -21,7 +21,7 @@ FILE = Path(__file__).resolve()
21
  ROOT = FILE.parents[0] # YOLOv5 root directory
22
  if str(ROOT) not in sys.path:
23
  sys.path.append(str(ROOT)) # add ROOT to PATH
24
- ROOT = ROOT.relative_to(Path.cwd()) # relative
25
 
26
  from models.experimental import attempt_load
27
  from utils.datasets import create_dataloader
 
21
  ROOT = FILE.parents[0] # YOLOv5 root directory
22
  if str(ROOT) not in sys.path:
23
  sys.path.append(str(ROOT)) # add ROOT to PATH
24
+ ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative
25
 
26
  from models.experimental import attempt_load
27
  from utils.datasets import create_dataloader