From 55c890b4e620edc0f69bf166d40bad32bb08655b Mon Sep 17 00:00:00 2001 From: Qiang Kou Date: Wed, 23 Dec 2015 10:57:30 -0500 Subject: [PATCH] misc update --- R-package/DESCRIPTION | 2 +- R-package/demo/00Index | 6 ++++++ R-package/src/io.cc | 1 - R-package/src/symbol.cc | 4 +++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/R-package/DESCRIPTION b/R-package/DESCRIPTION index a58759426cb1..00021fdefbd3 100644 --- a/R-package/DESCRIPTION +++ b/R-package/DESCRIPTION @@ -2,7 +2,7 @@ Package: mxnet Type: Package Title: MXNet Version: 0.5 -Date: 2015-10-02 +Date: 2015-12-23 Author: Tianqi Chen, Qiang Kou, Tong He Maintainer: Qiang Kou Description: MXNet is a deep learning framework designed for both efficiency diff --git a/R-package/demo/00Index b/R-package/demo/00Index index 059f16492fc7..086e8a06ddcd 100644 --- a/R-package/demo/00Index +++ b/R-package/demo/00Index @@ -1 +1,7 @@ +basic_bench Basic benchmark +basic_executor Basic executor operations +basic_kvstore Basic kvstore operations +basic_model Basic model operations basic_ndarray Basic ndarray operations +basic_random Basic random number generators +basic_symbol Basic symbol operations \ No newline at end of file diff --git a/R-package/src/io.cc b/R-package/src/io.cc index f84fd2159aea..8da9fbba839c 100644 --- a/R-package/src/io.cc +++ b/R-package/src/io.cc @@ -151,7 +151,6 @@ DataIterCreateFunction::DataIterCreateFunction const char **arg_names; const char **arg_type_infos; const char **arg_descriptions; - const char *key_var_num_args; MX_CALL(MXDataIterGetIterInfo( handle_, &name, &description, &num_args, diff --git a/R-package/src/symbol.cc b/R-package/src/symbol.cc index 82cd2cb86696..62aab69b1823 100644 --- a/R-package/src/symbol.cc +++ b/R-package/src/symbol.cc @@ -109,7 +109,7 @@ Symbol::RObjectType Symbol::GetInternals() const { Symbol::RObjectType Symbol::GetOutput(mx_uint index) const { SymbolHandle out; - MX_CALL(MXSymbolGetOutput(handle_, index, &out)); + MX_CALL(MXSymbolGetOutput(handle_, index - 1, &out)); return Symbol::RObject(out); } @@ -316,6 +316,8 @@ void Symbol::InitRcppModule() { "Get a symbol that contains all the internals") .method("get.output", &Symbol::GetOutput, "Get index-th output symbol of current one") + .method("[[", &Symbol::GetOutput, + "Get index-th output symbol of current one") .method("infer.shape", &Symbol::InferShape, "Inference the shape information given unknown ones");