From 30b369da904b446a28e97254320339b35b5c3f2e Mon Sep 17 00:00:00 2001 From: Ayush Chaurasia Date: Thu, 1 Sep 2022 09:43:54 +0530 Subject: [PATCH 1/5] update --- train.py | 13 ++++++------- utils/loggers/__init__.py | 10 ++++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/train.py b/train.py index 0cd4a7f065a6..111e6a2796af 100644 --- a/train.py +++ b/train.py @@ -91,16 +91,15 @@ def train(hyp, opt, device, callbacks): # hyp is path/to/hyp.yaml or hyp dictio data_dict = None if RANK in {-1, 0}: loggers = Loggers(save_dir, weights, opt, hyp, LOGGER) # loggers instance - if loggers.clearml: - data_dict = loggers.clearml.data_dict # None if no ClearML dataset or filled in by ClearML - if loggers.wandb: - data_dict = loggers.wandb.data_dict - if resume: - weights, epochs, hyp, batch_size = opt.weights, opt.epochs, opt.hyp, opt.batch_size - + # Register actions for k in methods(loggers): callbacks.register_action(k, callback=getattr(loggers, k)) + + # Process custom dataset artifact link + data_dict = loggers.remote_dataset + if resume: # If resuming runs from remote artifact + weights, epochs, hyp, batch_size = opt.weights, opt.epochs, opt.hyp, opt.batch_size # Config plots = not evolve and not opt.noplots # create plots diff --git a/utils/loggers/__init__.py b/utils/loggers/__init__.py index 880039b1914c..be69640dd973 100644 --- a/utils/loggers/__init__.py +++ b/utils/loggers/__init__.py @@ -106,6 +106,16 @@ def __init__(self, save_dir=None, weights=None, opt=None, hyp=None, logger=None, self.clearml = ClearmlLogger(self.opt, self.hyp) else: self.clearml = None + @property + def remote_dataset(self): + # Get data_dict if custom dataset artifact link is provided + data_dict = None + if self.clearml: + data_dict = self.clearml.data_dict # None if no ClearML dataset or filled in by ClearML + if self.wandb: + data_dict = self.wandb.data_dict + + return data_dict def on_train_start(self): # Callback runs on train start From 27195299b7d5fe82d9464e06990b8356022c6959 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 1 Sep 2022 04:22:13 +0000 Subject: [PATCH 2/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- train.py | 6 +++--- utils/loggers/__init__.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/train.py b/train.py index 111e6a2796af..29293aa612cf 100644 --- a/train.py +++ b/train.py @@ -91,14 +91,14 @@ def train(hyp, opt, device, callbacks): # hyp is path/to/hyp.yaml or hyp dictio data_dict = None if RANK in {-1, 0}: loggers = Loggers(save_dir, weights, opt, hyp, LOGGER) # loggers instance - + # Register actions for k in methods(loggers): callbacks.register_action(k, callback=getattr(loggers, k)) - + # Process custom dataset artifact link data_dict = loggers.remote_dataset - if resume: # If resuming runs from remote artifact + if resume: # If resuming runs from remote artifact weights, epochs, hyp, batch_size = opt.weights, opt.epochs, opt.hyp, opt.batch_size # Config diff --git a/utils/loggers/__init__.py b/utils/loggers/__init__.py index be69640dd973..89b3076da9d1 100644 --- a/utils/loggers/__init__.py +++ b/utils/loggers/__init__.py @@ -106,6 +106,7 @@ def __init__(self, save_dir=None, weights=None, opt=None, hyp=None, logger=None, self.clearml = ClearmlLogger(self.opt, self.hyp) else: self.clearml = None + @property def remote_dataset(self): # Get data_dict if custom dataset artifact link is provided @@ -114,7 +115,7 @@ def remote_dataset(self): data_dict = self.clearml.data_dict # None if no ClearML dataset or filled in by ClearML if self.wandb: data_dict = self.wandb.data_dict - + return data_dict def on_train_start(self): From ba904a89034f90b3124c71c04c574a0c3bd2b9b1 Mon Sep 17 00:00:00 2001 From: Ayush Chaurasia Date: Thu, 1 Sep 2022 09:54:09 +0530 Subject: [PATCH 3/5] update --- utils/loggers/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/loggers/__init__.py b/utils/loggers/__init__.py index be69640dd973..810826bc05fc 100644 --- a/utils/loggers/__init__.py +++ b/utils/loggers/__init__.py @@ -106,12 +106,13 @@ def __init__(self, save_dir=None, weights=None, opt=None, hyp=None, logger=None, self.clearml = ClearmlLogger(self.opt, self.hyp) else: self.clearml = None + @property def remote_dataset(self): # Get data_dict if custom dataset artifact link is provided data_dict = None if self.clearml: - data_dict = self.clearml.data_dict # None if no ClearML dataset or filled in by ClearML + data_dict = self.clearml.data_dict if self.wandb: data_dict = self.wandb.data_dict From b2451de0dcdb34e1a81e161ffc44944fa6a20d67 Mon Sep 17 00:00:00 2001 From: Ayush Chaurasia Date: Thu, 1 Sep 2022 09:55:04 +0530 Subject: [PATCH 4/5] update --- utils/loggers/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/loggers/__init__.py b/utils/loggers/__init__.py index 17a8ff95811b..4a4a3e1f2283 100644 --- a/utils/loggers/__init__.py +++ b/utils/loggers/__init__.py @@ -106,6 +106,7 @@ def __init__(self, save_dir=None, weights=None, opt=None, hyp=None, logger=None, self.clearml = ClearmlLogger(self.opt, self.hyp) else: self.clearml = None + @property def remote_dataset(self): # Get data_dict if custom dataset artifact link is provided From 01b173d3e33497b07b3c54f2827b7cba7a711c75 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 1 Sep 2022 04:25:37 +0000 Subject: [PATCH 5/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- utils/loggers/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/loggers/__init__.py b/utils/loggers/__init__.py index 4a4a3e1f2283..1aa8427f9127 100644 --- a/utils/loggers/__init__.py +++ b/utils/loggers/__init__.py @@ -106,7 +106,7 @@ def __init__(self, save_dir=None, weights=None, opt=None, hyp=None, logger=None, self.clearml = ClearmlLogger(self.opt, self.hyp) else: self.clearml = None - + @property def remote_dataset(self): # Get data_dict if custom dataset artifact link is provided