scope 0.5.1__tar.gz → 0.5.3__tar.gz

{scope-0.5.1 → scope-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scope
-Version: 0.5.1
+Version: 0.5.3
 Summary: Metrics logging and analysis
 Home-page: http://github.com/danijar/scope
 Classifier: Intended Audience :: Science/Research

{scope-0.5.1 → scope-0.5.3}/scope/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.5.1'
+__version__ = '0.5.3'
 
 from .reader import Reader
 from .writer import Writer

{scope-0.5.1 → scope-0.5.3}/scope/formats.py

@@ -13,7 +13,14 @@ class Float:
     return 'float'
 
   def valid(self, x):
-    return x.ndim == 0 and np.isreal(x)
+    if isinstance(x, (int, float)):
+      return True
+    if isinstance(x, np.ndarray):
+      return x.ndim == 0 and np.isreal(x)
+    return False
+
+  def convert(self, x):
+    return np.asarray(x, np.float64)
 
   def create(self, path):
     pass
@@ -40,6 +47,9 @@ class Text:
   def valid(self, x):
     return isinstance(x, str)
 
+  def convert(self, x):
+    return x
+
   def create(self, path):
     path.mkdir(exist_ok=True)
 
@@ -71,10 +81,14 @@ class Image:
 
   def valid(self, x):
     return (
+        isinstance(x, np.ndarray) and
         x.dtype == np.uint8 and
         x.ndim == 3 and
         x.shape[-1] in (1, 3))
 
+  def convert(self, x):
+    return x
+
   def create(self, path):
     path.mkdir(exist_ok=True)
 
@@ -112,10 +126,14 @@ class Video:
 
   def valid(self, x):
     return (
+        isinstance(x, np.ndarray) and
         x.dtype == np.uint8 and
         x.ndim == 4 and
         x.shape[-1] in (1, 3))
 
+  def convert(self, x):
+    return x
+
   def create(self, path):
     path.mkdir(exist_ok=True)
 

{scope-0.5.1 → scope-0.5.3}/scope/writer.py

@@ -37,7 +37,7 @@ class Writer:
     self.logdir.mkdir(parents=True, exist_ok=True)
     self.workers = workers
     self.rng = np.random.default_rng(seed=None)
-    self.fmts = FORMATS
+    self.fmts = formats
     self.cols = {}
     if workers:
       self.pool = concurrent.futures.ThreadPoolExecutor(workers, 'scope')
@@ -48,8 +48,6 @@ class Writer:
     step = int(step)
     mapping = dict(*args, **kwargs)
     for key, value in mapping.items():
-      if not isinstance(value, str):
-        value = np.asarray(value)
       if key not in self.cols:
         assert re.match(r'[a-z0-9_]+(/[a-z0-9_]+)?', key), key
         for fmt in self.fmts:
@@ -64,6 +62,7 @@ class Writer:
       if not col.fmt.valid(value):
         raise ValueError(
             f"Key '{key}' contains invalid value {self._info(value)}")
+      value = col.fmt.convert(value)
       col.steps.append(step)
       col.values.append(value)