From 155219bab0fb0ec4326b1d063afe697aa777f3dd Mon Sep 17 00:00:00 2001
From: lukas leufen <l.leufen@fz-juelich.de>
Date: Wed, 15 Jul 2020 12:03:08 +0200
Subject: [PATCH] included compile options in reporting
---
mlair/run_modules/model_setup.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/mlair/run_modules/model_setup.py b/mlair/run_modules/model_setup.py
index c0890624..9b282c50 100644
--- a/mlair/run_modules/model_setup.py
+++ b/mlair/run_modules/model_setup.py
@@ -156,8 +156,13 @@ class ModelSetup(RunEnvironment):
def report_model(self):
model_settings = self.model.get_settings()
+ model_settings.update(self.model.compile_options)
df = pd.DataFrame(columns=["model setting"])
- for k,v in model_settings.items():
+ for k, v in model_settings.items():
+ if v is None:
+ continue
+ if isinstance(v, list):
+ v = ",".join(self._clean_name(str(u)) for u in v)
if "<" in str(v):
v = self._clean_name(str(v))
df.loc[k] = v
@@ -172,6 +177,6 @@ class ModelSetup(RunEnvironment):
@staticmethod
def _clean_name(orig_name: str):
mod_name = re.sub(r'^{0}'.format(re.escape("<")), '', orig_name).replace("'", "").split(" ")
- mod_name = mod_name[1] if "class" in mod_name[0] else mod_name[0]
+ mod_name = mod_name[1] if any(map(lambda x: x in mod_name[0], ["class", "function", "method"])) else mod_name[0]
return mod_name[:-1] if mod_name[-1] == ">" else mod_name
--
GitLab