From 2fd7ad253f092b0d97908c30491807de155c761c Mon Sep 17 00:00:00 2001
From: tripl3a <triple_a@mailbox.org>
Date: Fri, 2 Aug 2019 11:20:44 +0200
Subject: [PATCH 1/2] do logging within run_experiment()

---
 farm/experiment.py     | 15 ++++++++++++++-
 run_all_experiments.py | 19 ++-----------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/farm/experiment.py b/farm/experiment.py
index 0ce969c44..047e3b6b0 100644
--- a/farm/experiment.py
+++ b/farm/experiment.py
@@ -11,7 +11,7 @@
 from farm.data_handler.processor import Processor
 from farm.train import Trainer
 from farm.train import WrappedDataParallel
-from farm.utils import set_all_seeds, initialize_device_settings
+from farm.utils import set_all_seeds, initialize_device_settings, MLFlowLogger
 from farm.utils import MLFlowLogger as MlLogger
 from farm.file_utils import read_config, unnestConfig
 
@@ -39,6 +39,19 @@ def load_experiments(file):
 
 
 def run_experiment(args):
+
+    logger.info(
+        "\n***********************************************"
+        f"\n************* Experiment: {args.name} ************"
+        "\n************************************************"
+    )
+    ml_logger = MLFlowLogger(tracking_uri=args.mlflow_url)
+    ml_logger.init_experiment(
+        experiment_name=args.mlflow_experiment,
+        run_name=args.mlflow_run_name,
+        nested=args.mlflow_nested
+    )
+
     validate_args(args)
     directory_setup(output_dir=args.output_dir, do_train=args.do_train)
     distributed = bool(args.local_rank != -1)
diff --git a/run_all_experiments.py b/run_all_experiments.py
index 6f284f06e..fe1cfbf6d 100644
--- a/run_all_experiments.py
+++ b/run_all_experiments.py
@@ -13,11 +13,7 @@
 # limitations under the License.
 """Downstream runner for all experiments in specified config files."""
 
-import logging
 from farm.experiment import run_experiment, load_experiments
-from farm.utils import MLFlowLogger
-
-logger = logging.getLogger(__name__)
 
 
 def main():
@@ -32,19 +28,8 @@ def main():
 
     for conf_file in config_files:
         experiments = load_experiments(conf_file)
-        for args in experiments:
-            logger.info(
-                "\n***********************************************"
-                f"\n************* Experiment: {args.name} ************"
-                "\n************************************************"
-            )
-            ml_logger = MLFlowLogger(tracking_uri=args.mlflow_url)
-            ml_logger.init_experiment(
-                experiment_name=args.mlflow_experiment,
-                run_name=args.mlflow_run_name,
-                nested=args.mlflow_nested,
-            )
-            run_experiment(args)
+        for experiment in experiments:
+            run_experiment(experiment)
 
 
 if __name__ == "__main__":

From 9d7c8c52095013223553669accdfc0dc5aa15a1f Mon Sep 17 00:00:00 2001
From: tripl3a <34123487+tripl3a@users.noreply.github.com>
Date: Fri, 13 Sep 2019 18:28:42 +0200
Subject: [PATCH 2/2] Update experiment.py

adjusted as suggested by @Timoeller + compatible with current FARM master branch
---
 farm/experiment.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/farm/experiment.py b/farm/experiment.py
index 047e3b6b0..c24107810 100644
--- a/farm/experiment.py
+++ b/farm/experiment.py
@@ -11,7 +11,7 @@
 from farm.data_handler.processor import Processor
 from farm.train import Trainer
 from farm.train import WrappedDataParallel
-from farm.utils import set_all_seeds, initialize_device_settings, MLFlowLogger
+from farm.utils import set_all_seeds, initialize_device_settings
 from farm.utils import MLFlowLogger as MlLogger
 from farm.file_utils import read_config, unnestConfig
 
@@ -42,14 +42,14 @@ def run_experiment(args):
 
     logger.info(
         "\n***********************************************"
-        f"\n************* Experiment: {args.name} ************"
+        f"\n************* Experiment: {args.task.name} ************"
         "\n************************************************"
     )
-    ml_logger = MLFlowLogger(tracking_uri=args.mlflow_url)
+    ml_logger = MlLogger(tracking_uri=args.logging.mlflow_url)
     ml_logger.init_experiment(
-        experiment_name=args.mlflow_experiment,
-        run_name=args.mlflow_run_name,
-        nested=args.mlflow_nested
+        experiment_name=args.logging.mlflow_experiment,
+        run_name=args.logging.mlflow_run_name,
+        nested=args.logging.mlflow_nested,
     )
 
     validate_args(args)