[master] some minor bug fixes

Author: vacancy

jacinle/cli/argument.py

@@ -77,13 +77,18 @@ def __init__(self, string):
 
         for i, kv in enumerate(kvs):
             k, v = kv.split('=')
+
             if v.startswith('"') or v.startswith("'"):
                 assert v.endswith('"') or v.endswith("'")
                 v = v[1:-1]
-            else:
+
+            try:
                 v = float(v)
                 if int(v) == v:
                     v = int(v)
+            except:
+                pass
+
             kvs[i] = (k, v)
 
         self.kvs = kvs

jactorch/data/collate/__init__.py

@@ -8,10 +8,13 @@
 # This file is part of NSCL-PyTorch.
 # Distributed under terms of the MIT license.
 
-
-from .collate_v1 import VarLengthCollateV1
 from .collate_v2 import VarLengthCollateV2
 from .collate_v3 import VarLengthCollateV3
 from .utils import user_scattered_collate, VarLengthCollateMode
 
-VarLengthCollate = VarLengthCollateV1
+import torch
+
+if torch.__version__ <= '0.3.1':
+    from .collate_v1 import VarLengthCollateV1
+    VarLengthCollate = VarLengthCollateV1
+

jactorch/data/collate/collate_v1.py

@@ -21,8 +21,7 @@
 from six import string_types
 
 from jacinle.utils.argument import UniqueValueGetter
-from .utils import numpy_type_map
-from .collate import use_shared_memory, numpy_type_map, VarLengthCollateMode, VarLengthCollateMode
+from .utils import use_shared_memory, numpy_type_map, VarLengthCollateMode, VarLengthCollateMode
 
 __all__ = ['VarLengthCollateV1']
 

jactorch/nn/mask/functional.py

@@ -17,7 +17,7 @@
 
 
 def masked_softmax(logits, mask=None, dim=-1, eps=1e-20, ninf=-1e4):
-    if logits is not None:
+    if mask is not None:
         logits = logits * mask + ninf * (1 - mask)
 
     probs = F.softmax(logits, dim=dim)