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

* 'master' of https://github.com/vacancy/Jacinle:
  [master] sync mldash
  [master] mldash sync
  [master] bump jacmldash version
  [master] fix git command error, jactorch dataset supports sort and shuffle
  [master] as_numpy now does detach

Author: vacancy

jacinle/cli/git.py

@@ -12,9 +12,12 @@
 
 
 def get_git_revision_hash(short=False):
-    if short:
-        return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'])
-    return subprocess.check_output(['git', 'rev-parse', 'HEAD']).decode('utf-8').strip()
+    try:
+        if short:
+            return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'])
+        return subprocess.check_output(['git', 'rev-parse', 'HEAD']).decode('utf-8').strip()
+    except subprocess.CalledProcessError:
+        return None
 
 
 def get_git_uncommitted_files():

jactorch/data/dataset.py

@@ -207,6 +207,17 @@ def repeat(self, nr_repeats):
         logger.critical('Repeat the dataset: #before={}, #after={}.'.format(len(self), len(indices)))
         return type(self)(self, indices=indices, filter_name='repeat[{}]'.format(nr_repeats))
 
+    def sort(self, key, key_name=None):
+        if key_name is None:
+            key_name = str(key)
+        indices = sorted(range(len(self)), key=lambda x: key(self.get_metainfo(x)))
+        return type(self)(self, indices=indices, filter_name='sort[{}]'.format(key_name))
+
+    def random_shuffle(self):
+        indices = list(range(len(self)))
+        random.shuffle(indices)
+        return type(self)(self, indices=indices, filter_name='random_shuffle')
+
     def __getitem__(self, index):
         if self.indices is None:
             return self.owner_dataset[index]

jactorch/utils/meta.py

@@ -76,7 +76,7 @@ def _as_numpy(o):
     if isinstance(o, Variable):
         o = o
     if torch.is_tensor(o):
-        return o.cpu().numpy()
+        return o.detach().cpu().numpy()
     return np.array(o)