fix build issues

src/c_api/c_api_executor.cc

@@ -515,146 +515,6 @@ int MXExecutorSimpleBind(SymbolHandle symbol_handle,
   API_END();
 }
 
-/*!
- * \brief
- * \param symbol_handle symbol handle
- * \param dev_type default device type
- * \param dev_id default device id
- * \param num_g2c_keys number of group2ctx keys
- * \param g2c_keys key list of group2ctx
- * \param g2c_dev_types device type list of group2ctx
- * \param g2c_dev_ids id list of group2ctx
- * \param provided_grad_req_list_len grad_req length provided by users in front-end
- * \param provided_grad_req_names grad_req names provided by users in front-end
- * \param provided_grad_req_types req types provided by users in front-end
- * \param num_provided_arg_shapes number of user provided in_arg and aux_state shapes
- * \param provided_arg_shape_names name list of provided shapes
- * \param provided_arg_shape_data provided shape data
- * \param provided_arg_shape_idx provided shape data index
- * \param num_provided_arg_dtypes number of user provided in_arg and axu_state dtypes
- * \param provided_arg_dtype_names argument name list of provided dtypes
- * \param provided_arg_dtypes data of provided dtypes
- * \param num_provided_arg_stypes number of user provided in_arg and axu_state storage types
- * \param provided_arg_stype_names argument name list of provided storage types
- * \param provided_arg_stypes data of provided storage types
- * \param num_shared_arg_names number of parameter names passed from _bind_ith_exec
- * \param shared_arg_name_list parameter name list passed from _bind_ith_exec
- * \param shared_buffer_len number of shared data arrays passed from _bind_ith_exec
- * \param shared_buffer_name_list shared data array names passed from _bind_ith_exec
- * \param shared_buffer_handle_list shared data array handles passed from _bind_ith_exec
- * \param updated_shared_buffer_name_list updated shared data array names after binding
- * \param updated_shared_buffer_handle_list updated shared data arrays after binding
- * \param num_in_args number of input arguments of this sym
- * \param in_args list_arguments associated with the current executor
- * \param arg_grads list of gradients of in_args associated with the current executor
- * \param num_aux_states number of aux states of this sym
- * \param aux_states list_auxiliary_states associated with the current executor
- * \param shared_exec_handle shared excutor handle passed from _bind_ith_exec
- * \param out the handle of the executor to be created
- */
-int MXExecutorSimpleBindEx(SymbolHandle symbol_handle,
-                           int dev_type,
-                           int dev_id,
-                           const uint32_t num_g2c_keys,
-                           const char** g2c_keys,
-                           const int* g2c_dev_types,
-                           const int* g2c_dev_ids,
-                           const uint32_t provided_grad_req_list_len,
-                           const char** provided_grad_req_names,
-                           const char** provided_grad_req_types,
-                           const uint32_t num_provided_arg_shapes,
-                           const char** provided_arg_shape_names,
-                           const int* provided_arg_shape_data,
-                           const uint32_t* provided_arg_shape_idx,
-                           const uint32_t num_provided_arg_dtypes,
-                           const char** provided_arg_dtype_names,
-                           const int* provided_arg_dtypes,
-                           const uint32_t num_provided_arg_stypes,
-                           const char** provided_arg_stype_names,
-                           const int* provided_arg_stypes,
-                           const uint32_t num_shared_arg_names,
-                           const char** shared_arg_name_list,
-                           int* shared_buffer_len,
-                           const char** shared_buffer_name_list,
-                           NDArrayHandle* shared_buffer_handle_list,
-                           const char*** updated_shared_buffer_name_list,
-                           NDArrayHandle** updated_shared_buffer_handle_list,
-                           uint32_t* num_in_args,
-                           NDArrayHandle** in_args,
-                           NDArrayHandle** arg_grads,
-                           uint32_t* num_aux_states,
-                           NDArrayHandle** aux_states,
-                           ExecutorHandle shared_exec_handle,
-                           ExecutorHandle* out) {
-  return SimpleBindExMaster(symbol_handle,
-                            dev_type, dev_id,
-                            num_g2c_keys, g2c_keys, g2c_dev_types, g2c_dev_ids,
-                            provided_grad_req_list_len, provided_grad_req_names, provided_grad_req_types,
-                            num_provided_arg_shapes, provided_arg_shape_names,
-                            provided_arg_shape_data, provided_arg_shape_idx,
-                            num_provided_arg_dtypes, provided_arg_dtype_names, provided_arg_dtypes,
-                            num_provided_arg_stypes, provided_arg_stype_names, provided_arg_stypes,
-                            num_shared_arg_names, shared_arg_name_list,
-                            shared_buffer_len, shared_buffer_name_list,
-                            shared_buffer_handle_list, updated_shared_buffer_name_list,
-                            updated_shared_buffer_handle_list,
-                            num_in_args, in_args, arg_grads,
-                            num_aux_states, aux_states,
-                            shared_exec_handle, out)
-}
-
-
-int MXExecutorSimpleBindEx64(SymbolHandle symbol_handle,
-                           int dev_type,
-                           int dev_id,
-                           const uint32_t num_g2c_keys,
-                           const char** g2c_keys,
-                           const int* g2c_dev_types,
-                           const int* g2c_dev_ids,
-                           const uint32_t provided_grad_req_list_len,
-                           const char** provided_grad_req_names,
-                           const char** provided_grad_req_types,
-                           const uint32_t num_provided_arg_shapes,
-                           const char** provided_arg_shape_names,
-                           const int64_t* provided_arg_shape_data,
-                           const uint32_t* provided_arg_shape_idx,
-                           const uint32_t num_provided_arg_dtypes,
-                           const char** provided_arg_dtype_names,
-                           const int* provided_arg_dtypes,
-                           const uint32_t num_provided_arg_stypes,
-                           const char** provided_arg_stype_names,
-                           const int* provided_arg_stypes,
-                           const uint32_t num_shared_arg_names,
-                           const char** shared_arg_name_list,
-                           int* shared_buffer_len,
-                           const char** shared_buffer_name_list,
-                           NDArrayHandle* shared_buffer_handle_list,
-                           const char*** updated_shared_buffer_name_list,
-                           NDArrayHandle** updated_shared_buffer_handle_list,
-                           uint32_t* num_in_args,
-                           NDArrayHandle** in_args,
-                           NDArrayHandle** arg_grads,
-                           uint32_t* num_aux_states,
-                           NDArrayHandle** aux_states,
-                           ExecutorHandle shared_exec_handle,
-                           ExecutorHandle* out) {
-  return SimpleBindExMaster(symbol_handle,
-                            dev_type, dev_id,
-                            num_g2c_keys, g2c_keys, g2c_dev_types, g2c_dev_ids,
-                            provided_grad_req_list_len, provided_grad_req_names, provided_grad_req_types,
-                            num_provided_arg_shapes, provided_arg_shape_names,
-                            provided_arg_shape_data, provided_arg_shape_idx,
-                            num_provided_arg_dtypes, provided_arg_dtype_names, provided_arg_dtypes,
-                            num_provided_arg_stypes, provided_arg_stype_names, provided_arg_stypes,
-                            num_shared_arg_names, shared_arg_name_list,
-                            shared_buffer_len, shared_buffer_name_list,
-                            shared_buffer_handle_list, updated_shared_buffer_name_list,
-                            updated_shared_buffer_handle_list,
-                            num_in_args, in_args, arg_grads,
-                            num_aux_states, aux_states,
-                            shared_exec_handle, out)
-}
-
 
 template<typename DType>
 int SimpleBindExMaster(SymbolHandle symbol_handle,
@@ -954,6 +814,148 @@ int SimpleBindExMaster(SymbolHandle symbol_handle,
   API_END();
 }
 
+
+/*!
+ * \brief
+ * \param symbol_handle symbol handle
+ * \param dev_type default device type
+ * \param dev_id default device id
+ * \param num_g2c_keys number of group2ctx keys
+ * \param g2c_keys key list of group2ctx
+ * \param g2c_dev_types device type list of group2ctx
+ * \param g2c_dev_ids id list of group2ctx
+ * \param provided_grad_req_list_len grad_req length provided by users in front-end
+ * \param provided_grad_req_names grad_req names provided by users in front-end
+ * \param provided_grad_req_types req types provided by users in front-end
+ * \param num_provided_arg_shapes number of user provided in_arg and aux_state shapes
+ * \param provided_arg_shape_names name list of provided shapes
+ * \param provided_arg_shape_data provided shape data
+ * \param provided_arg_shape_idx provided shape data index
+ * \param num_provided_arg_dtypes number of user provided in_arg and axu_state dtypes
+ * \param provided_arg_dtype_names argument name list of provided dtypes
+ * \param provided_arg_dtypes data of provided dtypes
+ * \param num_provided_arg_stypes number of user provided in_arg and axu_state storage types
+ * \param provided_arg_stype_names argument name list of provided storage types
+ * \param provided_arg_stypes data of provided storage types
+ * \param num_shared_arg_names number of parameter names passed from _bind_ith_exec
+ * \param shared_arg_name_list parameter name list passed from _bind_ith_exec
+ * \param shared_buffer_len number of shared data arrays passed from _bind_ith_exec
+ * \param shared_buffer_name_list shared data array names passed from _bind_ith_exec
+ * \param shared_buffer_handle_list shared data array handles passed from _bind_ith_exec
+ * \param updated_shared_buffer_name_list updated shared data array names after binding
+ * \param updated_shared_buffer_handle_list updated shared data arrays after binding
+ * \param num_in_args number of input arguments of this sym
+ * \param in_args list_arguments associated with the current executor
+ * \param arg_grads list of gradients of in_args associated with the current executor
+ * \param num_aux_states number of aux states of this sym
+ * \param aux_states list_auxiliary_states associated with the current executor
+ * \param shared_exec_handle shared excutor handle passed from _bind_ith_exec
+ * \param out the handle of the executor to be created
+ */
+int MXExecutorSimpleBindEx(SymbolHandle symbol_handle,
+                           int dev_type,
+                           int dev_id,
+                           const uint32_t num_g2c_keys,
+                           const char** g2c_keys,
+                           const int* g2c_dev_types,
+                           const int* g2c_dev_ids,
+                           const uint32_t provided_grad_req_list_len,
+                           const char** provided_grad_req_names,
+                           const char** provided_grad_req_types,
+                           const uint32_t num_provided_arg_shapes,
+                           const char** provided_arg_shape_names,
+                           const int* provided_arg_shape_data,
+                           const uint32_t* provided_arg_shape_idx,
+                           const uint32_t num_provided_arg_dtypes,
+                           const char** provided_arg_dtype_names,
+                           const int* provided_arg_dtypes,
+                           const uint32_t num_provided_arg_stypes,
+                           const char** provided_arg_stype_names,
+                           const int* provided_arg_stypes,
+                           const uint32_t num_shared_arg_names,
+                           const char** shared_arg_name_list,
+                           int* shared_buffer_len,
+                           const char** shared_buffer_name_list,
+                           NDArrayHandle* shared_buffer_handle_list,
+                           const char*** updated_shared_buffer_name_list,
+                           NDArrayHandle** updated_shared_buffer_handle_list,
+                           uint32_t* num_in_args,
+                           NDArrayHandle** in_args,
+                           NDArrayHandle** arg_grads,
+                           uint32_t* num_aux_states,
+                           NDArrayHandle** aux_states,
+                           ExecutorHandle shared_exec_handle,
+                           ExecutorHandle* out) {
+  return mxnet::SimpleBindExMaster(symbol_handle,
+                            dev_type, dev_id,
+                            num_g2c_keys, g2c_keys, g2c_dev_types, g2c_dev_ids,
+                            provided_grad_req_list_len, provided_grad_req_names, provided_grad_req_types,
+                            num_provided_arg_shapes, provided_arg_shape_names,
+                            provided_arg_shape_data, provided_arg_shape_idx,
+                            num_provided_arg_dtypes, provided_arg_dtype_names, provided_arg_dtypes,
+                            num_provided_arg_stypes, provided_arg_stype_names, provided_arg_stypes,
+                            num_shared_arg_names, shared_arg_name_list,
+                            shared_buffer_len, shared_buffer_name_list,
+                            shared_buffer_handle_list, updated_shared_buffer_name_list,
+                            updated_shared_buffer_handle_list,
+                            num_in_args, in_args, arg_grads,
+                            num_aux_states, aux_states,
+                            shared_exec_handle, out);
+}
+
+
+int MXExecutorSimpleBindEx64(SymbolHandle symbol_handle,
+                           int dev_type,
+                           int dev_id,
+                           const uint32_t num_g2c_keys,
+                           const char** g2c_keys,
+                           const int* g2c_dev_types,
+                           const int* g2c_dev_ids,
+                           const uint32_t provided_grad_req_list_len,
+                           const char** provided_grad_req_names,
+                           const char** provided_grad_req_types,
+                           const uint32_t num_provided_arg_shapes,
+                           const char** provided_arg_shape_names,
+                           const int64_t* provided_arg_shape_data,
+                           const uint32_t* provided_arg_shape_idx,
+                           const uint32_t num_provided_arg_dtypes,
+                           const char** provided_arg_dtype_names,
+                           const int* provided_arg_dtypes,
+                           const uint32_t num_provided_arg_stypes,
+                           const char** provided_arg_stype_names,
+                           const int* provided_arg_stypes,
+                           const uint32_t num_shared_arg_names,
+                           const char** shared_arg_name_list,
+                           int* shared_buffer_len,
+                           const char** shared_buffer_name_list,
+                           NDArrayHandle* shared_buffer_handle_list,
+                           const char*** updated_shared_buffer_name_list,
+                           NDArrayHandle** updated_shared_buffer_handle_list,
+                           uint32_t* num_in_args,
+                           NDArrayHandle** in_args,
+                           NDArrayHandle** arg_grads,
+                           uint32_t* num_aux_states,
+                           NDArrayHandle** aux_states,
+                           ExecutorHandle shared_exec_handle,
+                           ExecutorHandle* out) {
+  return mxnet::SimpleBindExMaster(symbol_handle,
+                            dev_type, dev_id,
+                            num_g2c_keys, g2c_keys, g2c_dev_types, g2c_dev_ids,
+                            provided_grad_req_list_len, provided_grad_req_names, provided_grad_req_types,
+                            num_provided_arg_shapes, provided_arg_shape_names,
+                            provided_arg_shape_data, provided_arg_shape_idx,
+                            num_provided_arg_dtypes, provided_arg_dtype_names, provided_arg_dtypes,
+                            num_provided_arg_stypes, provided_arg_stype_names, provided_arg_stypes,
+                            num_shared_arg_names, shared_arg_name_list,
+                            shared_buffer_len, shared_buffer_name_list,
+                            shared_buffer_handle_list, updated_shared_buffer_name_list,
+                            updated_shared_buffer_handle_list,
+                            num_in_args, in_args, arg_grads,
+                            num_aux_states, aux_states,
+                            shared_exec_handle, out);
+}
+
+
 int MXExecutorReshape(int partial_shaping,
                       int allow_up_sizing,
                       int dev_type,