Merge pull request #21 from antinucleon/master

fix travis

.travis.yml

@@ -26,6 +26,7 @@ addons:
       - gcc-4.8
       - g++-4.8
       - clang
+      - python-numpy
 
 before_install:
   - export NVCC_PREFIX=${HOME}

include/mxnet/c_api.h

@@ -38,7 +38,7 @@ typedef void *AtomicSymbolHandle;
 typedef void *ExecutorHandle;
 /*! \brief handle to a DataIterator */
 typedef void *DataIterHandle;
-/*
+/*!
  * \brief return str message of the last error
  *  all function in this file will return 0 when success
  *  and -1 when an error occured,
@@ -389,6 +389,8 @@ MXNET_DLL int MXExecutorHeads(ExecutorHandle handle,
  * \brief Generate Executor from symbol
  *
  * \param symbol_handle symbol handle
+ * \param dev_mask device mask
+ * \param dev_id device id
  * \param len length
  * \param in_args in args array
  * \param arg_grad_store arg grads handle array

include/mxnet/narray.h

@@ -138,7 +138,7 @@ class NArray {
     CHECK_GE(shape_[0], end) << "Chunk is smaller than required";
     size_t length = 1;
     if (shape_.ndim() == 1) {
-      ret.offset_= begin;
+      ret.offset_ = begin;
     } else {
       for (index_t i = 1; i < shape_.ndim(); ++i) {
         length *= shape_[i];

python/mxnet/executor.py

@@ -1,10 +1,11 @@
 # coding: utf-8
+# pylint: disable=invalid-name, protected-access, too-many-locals, fixme
 """ code for executor. """
 from __future__ import absolute_import
 
 import ctypes
 from .base import _LIB
-from .base import c_array, c_str, mx_uint, NArrayHandle, ExecutorHandle
+from .base import c_array, mx_uint, NArrayHandle, ExecutorHandle
 from .base import check_call
 from .narray import NArray
 

python/mxnet/function.py

@@ -124,7 +124,7 @@ def __init__(self):
                                         ctypes.byref(plist)))
         hmap = {}
         for i in range(size.value):
-            hdl = plist[i]
+            hdl = ctypes.c_void_p(plist[i])
             name = ctypes.c_char_p()
             check_call(_LIB.MXFuncGetName(hdl, ctypes.byref(name)))
             hmap[name.value] = _Function(hdl, name.value)

python/mxnet/symbol.py

@@ -1,13 +1,12 @@
 # coding: utf-8
-# pylint: disable=invalid-name, protected-access, too-many-locals
+# pylint: disable=invalid-name, protected-access, too-many-locals, fixme
 """Symbol support of mxnet"""
 from __future__ import absolute_import
 
 import ctypes
 from .base import _LIB
 from .base import c_array, c_str, mx_uint, NArrayHandle, ExecutorHandle, SymbolHandle
 from .base import check_call
-from .narray import NArray
 from .context import Context
 from .executor import Executor
 

python/mxnet/symbol_creator.py

@@ -83,9 +83,10 @@ def __init__(self):
                                                          ctypes.byref(plist)))
         hmap = {}
         for i in range(size.value):
+            hdl = ctypes.c_void_p(plist[i])
             name = ctypes.c_char_p()
-            check_call(_LIB.MXSymbolGetAtomicSymbolName(plist[i], ctypes.byref(name)))
-            hmap[name.value] = _SymbolCreator(name, plist[i])
+            check_call(_LIB.MXSymbolGetAtomicSymbolName(hdl, ctypes.byref(name)))
+            hmap[name.value] = _SymbolCreator(name, hdl)
         self.__dict__.update(hmap)
 
     def Variable(self, name):

src/symbol/graph_executor.h

@@ -8,6 +8,7 @@
 
 #include <mxnet/symbolic.h>
 #include <memory>
+#include <string>
 #include <vector>
 #include <utility>
 #include "./graph_memory_allocator.h"