scope 0.2.0__tar.gz → 0.2.2__tar.gz

scope-0.2.2/MANIFEST.in

@@ -0,0 +1 @@
+include requirements.txt

{scope-0.2.0 → scope-0.2.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: scope
-Version: 0.2.0
-Summary: Metrics logging and analysis.
+Version: 0.2.2
+Summary: Metrics logging and analysis
 Home-page: http://github.com/danijar/scope
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License

scope-0.2.2/requirements.txt

@@ -0,0 +1,2 @@
+av
+numpy

{scope-0.2.0 → scope-0.2.2}/scope/__init__.py

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

{scope-0.2.0 → scope-0.2.2}/scope/columns.py

@@ -131,10 +131,12 @@ class ImageColumn(FileColumn):
   def validate(self, value):
     assert (
         value.dtype == np.uint8 and value.ndim == 3 and
-        value.shape[-1] == 3), (value.dtype, value.shape)
+        value.shape[-1] in (1, 3)), (value.dtype, value.shape)
     return value
 
   def encode(self, value):
+    if value.shape[-1] == 1:
+      value = value.repeat(3, -1)
     fmt = ('jpeg' if self.fmt == 'jpg' else self.fmt).upper()
     fp = io.BytesIO()
     Image.fromarray(value).save(fp, format=fmt, quality=self.quality)
@@ -155,11 +157,13 @@ class VideoColumn(FileColumn):
   def validate(self, value):
     assert (
         value.dtype == np.uint8 and value.ndim == 4 and
-        value.shape[-1] == 3), (value.dtype, value.shape)
+        value.shape[-1] in (1, 3)), (value.dtype, value.shape)
     return value
 
-  def encode(self, array):
-    T, H, W, C = array.shape
+  def encode(self, value):
+    if value.shape[-1] == 1:
+      value = value.repeat(3, -1)
+    T, H, W, C = value.shape
     fp = io.BytesIO()
     output = av.open(fp, mode='w', format=self.fmt)
     stream = output.add_stream(self.codec, rate=float(self.fps))
@@ -167,7 +171,7 @@ class VideoColumn(FileColumn):
     stream.height = H
     stream.pix_fmt = 'yuv420p'
     for t in range(T):
-      frame = av.VideoFrame.from_ndarray(array[t], format='rgb24')
+      frame = av.VideoFrame.from_ndarray(value[t], format='rgb24')
       frame.pts = t
       output.mux(stream.encode(frame))
     output.mux(stream.encode(None))
@@ -176,9 +180,9 @@ class VideoColumn(FileColumn):
 
   def decode(self, buffer):
     container = av.open(io.BytesIO(buffer))
-    array = []
+    value = []
     for frame in container.decode(video=0):
-      array.append(frame.to_ndarray(format='rgb24'))
-    array = np.stack(array)
+      value.append(frame.to_ndarray(format='rgb24'))
+    value = np.stack(value)
     container.close()
-    return array
+    return value

{scope-0.2.0 → scope-0.2.2}/scope.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: scope
-Version: 0.2.0
-Summary: Metrics logging and analysis.
+Version: 0.2.2
+Summary: Metrics logging and analysis
 Home-page: http://github.com/danijar/scope
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License

{scope-0.2.0 → scope-0.2.2}/scope.egg-info/SOURCES.txt

@@ -1,5 +1,7 @@
+MANIFEST.in
 README.md
 pyproject.toml
+requirements.txt
 setup.py
 scope/__init__.py
 scope/columns.py
@@ -8,6 +10,7 @@ scope/writer.py
 scope.egg-info/PKG-INFO
 scope.egg-info/SOURCES.txt
 scope.egg-info/dependency_links.txt
+scope.egg-info/requires.txt
 scope.egg-info/top_level.txt
 tests/test_float.py
 tests/test_image.py

scope-0.2.2/scope.egg-info/requires.txt

@@ -0,0 +1,2 @@
+av
+numpy

{scope-0.2.0 → scope-0.2.2}/setup.py

@@ -19,7 +19,7 @@ def parse_version(filename):
 setuptools.setup(
     name='scope',
     version=parse_version('scope/__init__.py'),
-    description='Metrics logging and analysis.',
+    description='Metrics logging and analysis',
     url='http://github.com/danijar/scope',
     long_description=pathlib.Path('README.md').read_text(),
     long_description_content_type='text/markdown',