From 765b98f44eb662c012e3470546bf95ea39345ee3 Mon Sep 17 00:00:00 2001
From: Glenn Jocher <glenn.jocher@ultralytics.com>
Date: Tue, 12 Dec 2023 01:40:24 +0100
Subject: [PATCH] `ultralytics 8.0.227` respect `defaults.yaml` data (#6935)

Signed-off-by: Glenn Jocher <glenn.jocher@ultralytics.com>
---
 ultralytics/__init__.py     | 2 +-
 ultralytics/cfg/__init__.py | 2 +-
 ultralytics/engine/model.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ultralytics/__init__.py b/ultralytics/__init__.py
index 0136193a..9f42aa82 100644
--- a/ultralytics/__init__.py
+++ b/ultralytics/__init__.py
@@ -1,6 +1,6 @@
 # Ultralytics YOLO 🚀, AGPL-3.0 license
 
-__version__ = '8.0.226'
+__version__ = '8.0.227'
 
 from ultralytics.models import RTDETR, SAM, YOLO
 from ultralytics.models.fastsam import FastSAM
diff --git a/ultralytics/cfg/__init__.py b/ultralytics/cfg/__init__.py
index 652e8fc2..88ef91db 100644
--- a/ultralytics/cfg/__init__.py
+++ b/ultralytics/cfg/__init__.py
@@ -437,7 +437,7 @@ def entrypoint(debug=''):
         LOGGER.warning(f"WARNING ⚠️ 'source' is missing. Using default 'source={overrides['source']}'.")
     elif mode in ('train', 'val'):
         if 'data' not in overrides and 'resume' not in overrides:
-            overrides['data'] = TASK2DATA.get(task or DEFAULT_CFG.task, DEFAULT_CFG.data)
+            overrides['data'] = DEFAULT_CFG.data or TASK2DATA.get(task or DEFAULT_CFG.task, DEFAULT_CFG.data)
             LOGGER.warning(f"WARNING ⚠️ 'data' is missing. Using default 'data={overrides['data']}'.")
     elif mode == 'export':
         if 'format' not in overrides:
diff --git a/ultralytics/engine/model.py b/ultralytics/engine/model.py
index 15427628..af3a8507 100644
--- a/ultralytics/engine/model.py
+++ b/ultralytics/engine/model.py
@@ -325,7 +325,7 @@ class Model(nn.Module):
         checks.check_pip_update_available()
 
         overrides = yaml_load(checks.check_yaml(kwargs['cfg'])) if kwargs.get('cfg') else self.overrides
-        custom = {'data': TASK2DATA[self.task]}  # method defaults
+        custom = {'data': DEFAULT_CFG_DICT['data'] or TASK2DATA[self.task]}  # method defaults
         args = {**overrides, **custom, **kwargs, 'mode': 'train'}  # highest priority args on the right
         if args.get('resume'):
             args['resume'] = self.ckpt_path