ultralytics 8.2.19 fix Conda CI relative import bug (#13006)
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
This commit is contained in:
parent
5298d57308
commit
f0b7c510db
8 changed files with 8 additions and 9 deletions
|
|
@ -3,7 +3,7 @@
|
||||||
import shutil
|
import shutil
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
TMP = Path(__file__).resolve().parent / "tmp" # temp directory for test files
|
from tests import TMP
|
||||||
|
|
||||||
|
|
||||||
def pytest_addoption(parser):
|
def pytest_addoption(parser):
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ import pytest
|
||||||
from ultralytics.cfg import TASK2DATA, TASK2MODEL, TASKS
|
from ultralytics.cfg import TASK2DATA, TASK2MODEL, TASKS
|
||||||
from ultralytics.utils import ASSETS, WEIGHTS_DIR, checks
|
from ultralytics.utils import ASSETS, WEIGHTS_DIR, checks
|
||||||
|
|
||||||
from . import CUDA_DEVICE_COUNT, CUDA_IS_AVAILABLE
|
from tests import CUDA_DEVICE_COUNT, CUDA_IS_AVAILABLE
|
||||||
|
|
||||||
# Constants
|
# Constants
|
||||||
TASK_MODEL_DATA = [(task, WEIGHTS_DIR / TASK2MODEL[task], TASK2DATA[task]) for task in TASKS]
|
TASK_MODEL_DATA = [(task, WEIGHTS_DIR / TASK2MODEL[task], TASK2DATA[task]) for task in TASKS]
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ from ultralytics import YOLO
|
||||||
from ultralytics.utils import ASSETS, WEIGHTS_DIR
|
from ultralytics.utils import ASSETS, WEIGHTS_DIR
|
||||||
from ultralytics.cfg import TASK2DATA, TASK2MODEL, TASKS
|
from ultralytics.cfg import TASK2DATA, TASK2MODEL, TASKS
|
||||||
|
|
||||||
from . import CUDA_DEVICE_COUNT, CUDA_IS_AVAILABLE, MODEL, SOURCE
|
from tests import CUDA_DEVICE_COUNT, CUDA_IS_AVAILABLE, MODEL, SOURCE
|
||||||
|
|
||||||
|
|
||||||
def test_checks():
|
def test_checks():
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ from ultralytics.engine.exporter import Exporter
|
||||||
from ultralytics.models.yolo import classify, detect, segment
|
from ultralytics.models.yolo import classify, detect, segment
|
||||||
from ultralytics.utils import ASSETS, DEFAULT_CFG, WEIGHTS_DIR
|
from ultralytics.utils import ASSETS, DEFAULT_CFG, WEIGHTS_DIR
|
||||||
|
|
||||||
from . import MODEL
|
from tests import MODEL
|
||||||
|
|
||||||
|
|
||||||
def test_func(*args): # noqa
|
def test_func(*args): # noqa
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,7 @@ from ultralytics.utils import (
|
||||||
checks,
|
checks,
|
||||||
)
|
)
|
||||||
from ultralytics.utils.torch_utils import TORCH_1_9, TORCH_1_13
|
from ultralytics.utils.torch_utils import TORCH_1_9, TORCH_1_13
|
||||||
|
from tests import MODEL, SOURCE
|
||||||
from . import MODEL, SOURCE
|
|
||||||
|
|
||||||
|
|
||||||
def test_export_torchscript():
|
def test_export_torchscript():
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ from ultralytics import YOLO, download
|
||||||
from ultralytics.utils import DATASETS_DIR, SETTINGS
|
from ultralytics.utils import DATASETS_DIR, SETTINGS
|
||||||
from ultralytics.utils.checks import check_requirements
|
from ultralytics.utils.checks import check_requirements
|
||||||
|
|
||||||
from . import MODEL, SOURCE, TMP
|
from tests import MODEL, SOURCE, TMP
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.skipif(not check_requirements("ray", install=False), reason="ray[tune] not installed")
|
@pytest.mark.skipif(not check_requirements("ray", install=False), reason="ray[tune] not installed")
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ from ultralytics.utils import (
|
||||||
)
|
)
|
||||||
from ultralytics.utils.downloads import download, is_url
|
from ultralytics.utils.downloads import download, is_url
|
||||||
from ultralytics.utils.torch_utils import TORCH_1_9
|
from ultralytics.utils.torch_utils import TORCH_1_9
|
||||||
from . import CFG, IS_TMP_WRITEABLE, MODEL, SOURCE, TMP
|
from tests import CFG, IS_TMP_WRITEABLE, MODEL, SOURCE, TMP
|
||||||
|
|
||||||
|
|
||||||
def test_model_forward():
|
def test_model_forward():
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Ultralytics YOLO 🚀, AGPL-3.0 license
|
# Ultralytics YOLO 🚀, AGPL-3.0 license
|
||||||
|
|
||||||
__version__ = "8.2.18"
|
__version__ = "8.2.19"
|
||||||
|
|
||||||
from ultralytics.data.explorer.explorer import Explorer
|
from ultralytics.data.explorer.explorer import Explorer
|
||||||
from ultralytics.models import RTDETR, SAM, YOLO, YOLOWorld
|
from ultralytics.models import RTDETR, SAM, YOLO, YOLOWorld
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue