Merge pull request apache#1774 from jermainewang/merge

Code changes needed for Minpy examples
oza · Apr 2, 2016 · e04ba1d · e04ba1d
2 parents e0b420b + 087db50
commit e04ba1d
Show file tree

Hide file tree

Showing 6 changed files with 440 additions and 35 deletions.
diff --git a/python/mxnet/base.py b/python/mxnet/base.py
@@ -15,13 +15,13 @@
 #----------------------------
 if sys.version_info[0] == 3:
     string_types = str,
-    numeric_types = (float, int)
+    numeric_types = (float, int, np.float32, np.int32)
     # this function is needed for python3
     # to convert ctypes.char_p .value back to python str
     py_str = lambda x: x.decode('utf-8')
 else:
     string_types = basestring,
-    numeric_types = (float, int, long)
+    numeric_types = (float, int, long, np.float32, np.int32)
     py_str = lambda x: x