merged conflicts

setup.py

@@ -25,6 +25,6 @@ setuptools.setup(
     include_package_data=True,
     install_requires=[
           'matplotlib', 'numpy', 'pyzmq', 'plotly', 'torchstat', 'ipywidgets', 
-          'sklearn', 'nbformat', 'scikit-image', 'nbformat', 'yaml' # , 'receptivefield'
+          'nbformat', 'scikit-image', 'nbformat', 'yaml', 'scikit-image', 'graphviz' # , 'receptivefield'
     ]
-)
+)

tensorwatch/file_stream.py

@@ -28,6 +28,8 @@ class FileStream(Stream):
 
         if self.for_write:
             pickle.dump(stream_item, self._file)
+            self._file.flush()
+            #os.fsync()
         super(FileStream, self).write(stream_item)
 
     def read_all(self, from_stream:'Stream'=None):

tensorwatch/model_graph/hiddenlayer/pytorch_builder.py

@@ -47,6 +47,7 @@ def pytorch_id(node):
     return node.scopeName() + "/outputs/" + "/".join([o.debugName() for o in node.outputs()])
 
 
+
 def get_shape(torch_node):
     """Return the output shape of the given Pytorch node."""
     # Extract node output shape from the node string representation