change all `as_mode` to `with mode`

server/visualdl/lib.py

@@ -16,7 +16,7 @@ def get_modes(storage):
 def get_scalar_tags(storage, mode):
     result = {}
     for mode in storage.modes():
-        reader = storage.as_mode(mode)
+        with storage.mode(mode) as reader:
             tags = reader.tags('scalar')
             if tags:
                 result[mode] = {}
@@ -29,7 +29,7 @@ def get_scalar_tags(storage, mode):
 
 
 def get_scalar(storage, mode, tag):
-    reader = storage.as_mode(mode)
+    with storage.mode(mode) as reader:
         scalar = reader.scalar(tag)
 
         records = scalar.records()
@@ -44,7 +44,7 @@ def get_image_tags(storage):
     result = {}
 
     for mode in storage.modes():
-        reader = storage.as_mode(mode)
+        with storage.mode(mode) as reader:
             tags = reader.tags('image')
             if tags:
                 result[mode] = {}
@@ -70,7 +70,7 @@ def get_image_tag_steps(storage, mode, tag):
         tag = tag[:tag.rfind('/')]
         sample_index = int(res.groups()[0])
 
-    reader = storage.as_mode(mode)
+    with storage.mode(mode) as reader:
         image = reader.image(tag)
         res = []
 
@@ -95,7 +95,7 @@ def get_image_tag_steps(storage, mode, tag):
 
 
 def get_invididual_image(storage, mode, tag, step_index):
-    reader = storage.as_mode(mode)
+    with storage.mode(mode) as reader:
         res = re.search(r".*/([0-9]+$)", tag)
         # remove suffix '/x'
         if res:

server/visualdl/storage_mock.py

@@ -6,7 +6,7 @@ import numpy as np
 
 
 def add_scalar(writer, mode, tag, num_steps, skip):
-    my_writer = writer.as_mode(mode)
+    with writer.mode(mode) as my_writer:
         scalar = my_writer.scalar(tag)
         for i in range(num_steps):
             if i % skip == 0:
@@ -20,7 +20,7 @@ def add_image(writer,
               num_passes,
               step_cycle,
               shape=[50, 50, 3]):
-    writer_ = writer.as_mode(mode)
+    with writer.mode(mode) as writer_:
         image_writer = writer_.image(tag, num_samples, step_cycle)
 
         for pass_ in xrange(num_passes):

visualdl/python/test_storage.py

@@ -22,8 +22,9 @@ class StorageTest(unittest.TestCase):
             scalar.add_record(i, float(i))
 
         print 'test read'
-        self.reader = storage.StorageReader(self.dir).as_mode("train")
-        scalar = self.reader.scalar("model/scalar/min")
+        self.reader = storage.StorageReader(self.dir)
+        with self.reader.mode("train") as reader:
+            scalar = reader.scalar("model/scalar/min")
             self.assertEqual(scalar.caption(), "train")
             records = scalar.records()
             ids = scalar.ids()
@@ -49,8 +50,9 @@ class StorageTest(unittest.TestCase):
                     image_writer.set_sample(index, shape, list(data))
             image_writer.finish_sampling()
 
-        self.reader = storage.StorageReader(self.dir).as_mode("train")
-        image_reader = self.reader.image(tag)
+        self.reader = storage.StorageReader(self.dir)
+        with self.reader.mode("train") as reader:
+            image_reader = reader.image(tag)
             self.assertEqual(image_reader.caption(), tag)
             self.assertEqual(image_reader.num_records(), num_passes)
 
@@ -59,7 +61,7 @@ class StorageTest(unittest.TestCase):
             data = image_record.data()
             self.assertEqual(len(data), np.prod(shape))
 
-        image_tags = self.reader.tags("image")
+            image_tags = reader.tags("image")
             self.assertTrue(image_tags)
             self.assertEqual(len(image_tags), 1)
 
@@ -75,7 +77,8 @@ class StorageTest(unittest.TestCase):
         shape = [image.size[1], image.size[0], 3]
         origin_data = np.array(image.getdata()).flatten()
 
-        self.reader = storage.StorageReader(self.dir).as_mode("train")
+        self.reader = storage.StorageReader(self.dir)
+        with self.reader.mode("train") as reader:
 
             image_writer.start_sampling()
             index = image_writer.is_sample_taken()
@@ -84,7 +87,7 @@ class StorageTest(unittest.TestCase):
 
             # read and check whether the original image will be displayed
 
-        image_reader = self.reader.image(tag)
+            image_reader = reader.image(tag)
             image_record = image_reader.record(0, 0)
             data = image_record.data()
             shape = image_record.shape()