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

ultralytics 8.1.3 ResNet models and lighter dependencies (#7700)

Browse source 
Signed-off-by: Glenn Jocher <glenn.jocher@ultralytics.com>
Co-authored-by: Vivek Malvi <vivekmalvi@raoinformationtechnology.com>
Co-authored-by: UltralyticsAssistant <web@ultralytics.com>
Co-authored-by: iscyy <wenvoi@163.com>
Co-authored-by: Laughing-q <1185102784@qq.com>
Co-authored-by: Laughing <61612323+Laughing-q@users.noreply.github.com>
Co-authored-by: Prince kumar <85225054+prince0310@users.noreply.github.com>
This commit is contained in:
Glenn Jocher 2024-01-20 00:52:50 +01:00 • committed by GitHub
parent c13315bbf8
commit fcc4496b12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 96 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ultralytics/engine/model.py
View file

@ -52,13 +52,14 @@ class Model(nn.Module):
list(ultralytics.engine.results.Results): The prediction results.
"""
def __init__(self, model: Union[str, Path] = "yolov8n.pt", task=None) -> None:
def __init__(self, model: Union[str, Path] = "yolov8n.pt", task=None, verbose=False) -> None:
"""
Initializes the YOLO model.
Args:
model (Union[str, Path], optional): Path or name of the model to load or create. Defaults to 'yolov8n.pt'.
task (Any, optional): Task type for the YOLO model. Defaults to None.
verbose (bool, optional): Whether to enable verbose mode.
"""
super().__init__()
self.callbacks = callbacks.get_default_callbacks()
@ -77,6 +78,7 @@ class Model(nn.Module):
# Check if Ultralytics HUB model from https://hub.ultralytics.com
if self.is_hub_model(model):
# Fetch model from HUB
checks.check_requirements("hub-sdk>0.0.2")
self.session = self._get_hub_session(model)
model = self.session.model_file
@ -89,9 +91,9 @@ class Model(nn.Module):
# Load or create new YOLO model
model = checks.check_model_file_from_stem(model) # add suffix, i.e. yolov8n -> yolov8n.pt
if Path(model).suffix in (".yaml", ".yml"):
self._new(model, task)
self._new(model, task=task, verbose=verbose)
else:
self._load(model, task)
self._load(model, task=task)
self.model_name = model
@ -126,7 +128,7 @@ class Model(nn.Module):
)
)
def _new(self, cfg: str, task=None, model=None, verbose=True):
def _new(self, cfg: str, task=None, model=None, verbose=False):
"""
Initializes a new model and infers the task type from the model definitions.
@ -381,8 +383,8 @@ class Model(nn.Module):
# Check model was created
if not getattr(self.session.model, "id", None):
self.session = None
except PermissionError:
# Ignore permission error
except (PermissionError, ModuleNotFoundError):
# Ignore PermissionError and ModuleNotFoundError which indicates hub-sdk not installed
pass
self.trainer.hub_session = self.session # attach optional HUB session