Quellcode durchsuchen

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: Glenn Jocher <glenn.jocher@ultralytics.com>
modifyDataloader
Malte Lorbach GitHub vor 3 Jahren
Ursprung
Commit
153873e9e4
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden GPG-Schlüssel-ID: 4AEE18F83AFDEB23
4 geänderte Dateien mit 6 neuen und 4 gelöschten Zeilen
  1. +2
    -1
      detect.py
  2. +2
    -1
      export.py
  3. +1
    -1
      train.py
  4. +1
    -1
      val.py

+ 2
- 1
detect.py Datei anzeigen

@@ -7,6 +7,7 @@ Usage:
"""

import argparse
import os
import sys
from pathlib import Path

@@ -19,7 +20,7 @@ FILE = Path(__file__).resolve()
ROOT = FILE.parents[0] # 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
ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative

from models.experimental import attempt_load
from utils.datasets import LoadImages, LoadStreams

+ 2
- 1
export.py Datei anzeigen

@@ -21,6 +21,7 @@ TensorFlow.js:
"""

import argparse
import os
import subprocess
import sys
import time
@@ -34,7 +35,7 @@ FILE = Path(__file__).resolve()
ROOT = FILE.parents[0] # 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
ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative

from models.common import Conv
from models.experimental import attempt_load

+ 1
- 1
train.py Datei anzeigen

@@ -30,7 +30,7 @@ FILE = Path(__file__).resolve()
ROOT = FILE.parents[0] # 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
ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative

import val # for end-of-epoch mAP
from models.experimental import attempt_load

+ 1
- 1
val.py Datei anzeigen

@@ -21,7 +21,7 @@ FILE = Path(__file__).resolve()
ROOT = FILE.parents[0] # 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
ROOT = Path(os.path.relpath(ROOT, Path.cwd())) # relative

from models.experimental import attempt_load
from utils.datasets import create_dataloader

Laden…
Abbrechen
Speichern