ClearML/clearml
1
0
Fork 0
mirror of https://github.com/clearml/clearml synced 2025-01-31 09:07:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve plotly value type conforming

Browse Source
This commit is contained in:
allegroai 2021-01-18 11:36:10 +02:00
parent 8c4d3aca5b
commit 59d26e675b
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
clearml/backend_interface/metrics/reporter.py
View File

@ -203,15 +203,20 @@ class Reporter(InterfaceBase, AbstractContextManager, SetupUploadMixin, AsyncMan
:param round_digits: number of digits after the dot to leave :param round_digits: number of digits after the dot to leave
:type round_digits: int :type round_digits: int
""" """
def floatstr(o): inf_value = math.inf if six.PY3 else float("inf")
inf_value = math.inf if six.PY3 else float("inf")
if o != o: def to_base_type(o):
return 'nan' if isinstance(o, float):
elif o == inf_value: if o != o:
return 'inf' return 'nan'
elif o == -inf_value: elif o == inf_value:
return '-inf' return 'inf'
return round(o, ndigits=round_digits) if round_digits is not None else o elif o == -inf_value:
return '-inf'
return round(o, ndigits=round_digits) if round_digits is not None else o
elif isinstance(o, (datetime.date, datetime.datetime)):
return o.isoformat()
return o
# noinspection PyBroadException # noinspection PyBroadException
try: try:
@ -222,12 +227,8 @@ class Reporter(InterfaceBase, AbstractContextManager, SetupUploadMixin, AsyncMan
elif isinstance(obj, np.floating): elif isinstance(obj, np.floating):
return float(round(obj, ndigits=round_digits) if round_digits is not None else obj) return float(round(obj, ndigits=round_digits) if round_digits is not None else obj)
elif isinstance(obj, np.ndarray): elif isinstance(obj, np.ndarray):
if obj.dtype in (datetime.date, datetime.datetime): return [to_base_type(a) for a in obj.tolist()]
return [dt.isoformat() for dt in obj] return to_base_type(obj)
else:
return [floatstr(a) for a in obj.tolist()]
elif isinstance(obj, (datetime.date, datetime.datetime)):
return obj.isoformat()
except Exception: except Exception:
default = None default = None
@ -245,14 +246,15 @@ class Reporter(InterfaceBase, AbstractContextManager, SetupUploadMixin, AsyncMan
continue continue
for k, v in d.items(): for k, v in d.items():
if isinstance(v, list): if isinstance(v, list):
d[k] = list(floatstr(s) if isinstance(s, float) else s for s in v) d[k] = list(to_base_type(s) for s in v)
elif isinstance(v, tuple): elif isinstance(v, tuple):
d[k] = tuple(floatstr(s) if isinstance(s, float) else s for s in v) d[k] = tuple(to_base_type(s) for s in v)
elif isinstance(v, float): else:
d[k] = floatstr(v) d[k] = to_base_type(v)
plot = json.dumps(plot, default=default) plot = json.dumps(plot, default=default)
elif not isinstance(plot, six.string_types): elif not isinstance(plot, six.string_types):
raise ValueError('Plot should be a string or a dict') raise ValueError('Plot should be a string or a dict')
ev = PlotEvent(metric=self._normalize_name(title), variant=self._normalize_name(series), ev = PlotEvent(metric=self._normalize_name(title), variant=self._normalize_name(series),
plot_str=plot, iter=iter) plot_str=plot, iter=iter)
self._report(ev) self._report(ev)