HongChuang/ultralytics-ascend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Update MANIFEST.in (#4894)

Browse source 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Glenn Jocher 2023-09-15 01:32:10 +02:00 • committed by GitHub
parent 32f7c522b5
commit daf16ecf31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ultralytics/utils/callbacks/dvc.py
View file

@ -11,15 +11,12 @@ try:
import os
import re
from importlib.metadata import version
from pathlib import Path
import pkg_resources as pkg
from ultralytics.utils.checks import check_version
ver = version('dvclive')
if pkg.parse_version(ver) < pkg.parse_version('2.11.0'):
LOGGER.debug(f'DVCLive is detected but version {ver} is incompatible (>=2.11 required).')
dvclive = None # noqa: F811
if not check_version(dvclive.__version__, '2.11.0', name='dvclive', verbose=True):
dvclive = None
# DVCLive logger instance
live = None
@ -74,9 +71,7 @@ def on_pretrain_routine_start(trainer):
try:
global live
live = dvclive.Live(save_dvc_exp=True, cache_images=True)
LOGGER.info(
f'DVCLive is detected and auto logging is enabled (can be disabled in the {SETTINGS.file} with `dvc: false`).'
)
LOGGER.info("DVCLive is detected and auto logging is enabled (run 'yolo settings dvc=False' to disable).")
except Exception as e:
LOGGER.warning(f'WARNING ⚠️ DVCLive installed but not initialized correctly, not logging this run. {e}')

8
ultralytics/utils/checks.py
View file

@ -1,4 +1,5 @@
# Ultralytics YOLO 🚀, AGPL-3.0 license
import contextlib
import glob
import inspect
@ -15,7 +16,6 @@ from typing import Optional
import cv2
import numpy as np
import pkg_resources as pkg
import psutil
import requests
import torch
from matplotlib import font_manager
@ -141,7 +141,7 @@ def check_version(current: str = '0.0.0',
elif op == '<' and not (current < version):
result = False
if not result:
warning_message = f'WARNING ⚠️ {name}{required} is required, but {name}{current} is currently installed'
warning_message = f'WARNING ⚠️ {name}{op}{required} is required, but {name}=={current} is currently installed'
if hard:
raise ModuleNotFoundError(emojis(warning_message)) # assert version requirements met
if verbose:
@ -321,7 +321,7 @@ def check_torchvision():
if v_torch in compatibility_table:
compatible_versions = compatibility_table[v_torch]
if all(pkg.parse_version(v_torchvision) != pkg.parse_version(v) for v in compatible_versions):
if all(v_torchvision != v for v in compatible_versions):
print(f'WARNING ⚠️ torchvision=={v_torchvision} is incompatible with torch=={v_torch}.\n'
f"Run 'pip install torchvision=={compatible_versions[0]}' to fix torchvision or "
"'pip install -U torch torchvision' to update both.\n"
@ -404,6 +404,8 @@ def check_imshow(warn=False):
def check_yolo(verbose=True, device=''):
"""Return a human-readable YOLO software and hardware summary."""
import psutil
from ultralytics.utils.torch_utils import select_device
if is_jupyter():