Merge branch 'master' of https://github.com/vacancy/Jacinle

* 'master' of https://github.com/vacancy/Jacinle:
  [master] import bug fix
  [master] remove debug prints
  [master] fix default collator?
  [master] add iterable mixin for filterable datasets

Author: vacancy

jaclearn/visualize/html_table.py

@@ -142,6 +142,8 @@ def row(self, *args, **kwargs):
             elif c.type == 'text' or c.type == 'code':
                 tag = 'pre' if c.type == 'code' else 'div'
                 self._print('    <{} class="{}">{}</{}>'.format(tag, classname, obj, tag))
+            elif c.type == 'raw':
+                self._print('    {}'.format(obj))
             else:
                 raise ValueError('Unknown column type: {}.'.format(c.type))
             self._print('  </td>')

jactorch/data/dataset.py

@@ -70,7 +70,7 @@ def __len__(self):
         return len(self.list)
 
 
-class FilterableDatasetUnwrapped(Dataset):
+class FilterableDatasetUnwrapped(Dataset, IterableDatasetMixin):
     """
     A filterable dataset. User can call various `filter_*` operations to obtain a subset of the dataset.
     """

jactorch/parallel/dict_gather.py

@@ -12,6 +12,7 @@
 import functools
 import collections
 
+import torch
 from torch.autograd import Variable
 from torch.nn.parallel.data_parallel import DataParallel
 from torch.nn.parallel._functions import Gather

jactorch/train/env.py

@@ -33,6 +33,7 @@ def cuda_time(sync=True):
 def default_reduce_func(k, v):
     if torch.is_tensor(v):
         return v.mean()
+    return v
 
 
 class TrainerEnv(object):