diff --git a/ultralytics/__init__.py b/ultralytics/__init__.py index e0a54c27..2a92c713 100644 --- a/ultralytics/__init__.py +++ b/ultralytics/__init__.py @@ -1,6 +1,6 @@ # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license -__version__ = "8.4.15" +__version__ = "8.4.16" import importlib import os diff --git a/ultralytics/models/nas/model.py b/ultralytics/models/nas/model.py index 4331f368..413b1595 100644 --- a/ultralytics/models/nas/model.py +++ b/ultralytics/models/nas/model.py @@ -75,7 +75,7 @@ class NAS(Model): self.model.names = dict(enumerate(self.model._class_names)) self.model.is_fused = lambda: False # for info() self.model.yaml = {} # for info() - self.model.pt_path = weights # for export() + self.model.pt_path = str(weights) # for export() self.model.task = "detect" # for export() self.model.args = {**DEFAULT_CFG_DICT, **self.overrides} # for export() self.model.eval() diff --git a/ultralytics/nn/tasks.py b/ultralytics/nn/tasks.py index f368bbd1..1b47c680 100644 --- a/ultralytics/nn/tasks.py +++ b/ultralytics/nn/tasks.py @@ -73,7 +73,7 @@ from ultralytics.nn.modules import ( YOLOESegment26, v10Detect, ) -from ultralytics.utils import DEFAULT_CFG_DICT, LOGGER, YAML, colorstr, emojis +from ultralytics.utils import DEFAULT_CFG_DICT, LOGGER, WINDOWS, YAML, colorstr, emojis from ultralytics.utils.checks import check_requirements, check_suffix, check_yaml from ultralytics.utils.loss import ( E2ELoss, @@ -1444,6 +1444,12 @@ def torch_safe_load(weight, safe_only=False): "ultralytics.nn.modules.block.Silence": "torch.nn.Identity", # YOLOv9e "ultralytics.nn.tasks.YOLOv10DetectionModel": "ultralytics.nn.tasks.DetectionModel", # YOLOv10 "ultralytics.utils.loss.v10DetectLoss": "ultralytics.utils.loss.E2EDetectLoss", # YOLOv10 + # resolve cross-platform pathlib pickle incompatibility + **( + {"pathlib.PosixPath": "pathlib.WindowsPath"} + if WINDOWS + else {"pathlib.WindowsPath": "pathlib.PosixPath"} + ), }, ): if safe_only: @@ -1512,7 +1518,7 @@ def load_checkpoint(weight, device=None, inplace=True, fuse=False): # Model compatibility updates model.args = args # attach args to model - model.pt_path = weight # attach *.pt file path to model + model.pt_path = str(weight) # attach *.pt file path to model as string (avoids WindowsPath pickle issues) model.task = getattr(model, "task", guess_model_task(model)) if not hasattr(model, "stride"): model.stride = torch.tensor([32.0])