Commit 65e28306 authored by Theo Steininger's avatar Theo Steininger
Browse files

Merge branch 'master' into working_on_demos

parents 0fd5d047 69792e0f
...@@ -170,6 +170,8 @@ class Field(Loggable, Versionable, object): ...@@ -170,6 +170,8 @@ class Field(Loggable, Versionable, object):
else: else:
dtype = np.dtype(dtype) dtype = np.dtype(dtype)
dtype = np.result_type(dtype, np.float)
return dtype return dtype
def _parse_distribution_strategy(self, distribution_strategy, val): def _parse_distribution_strategy(self, distribution_strategy, val):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment