Merge pull request #1 from tqchen/R

Re-organize based on KK's code

R-package/.Rbuildignore

@@ -0,0 +1,7 @@
+\.o$
+\.so$
+\.dll$
+^.*\.Rproj$
+^\.Rproj\.user$
+
+README.md

R-package/.gitignore

@@ -0,0 +1,2 @@
+.Rhistory
+R-package.Rproj

R-package/mxnet/DESCRIPTION → R-package/DESCRIPTION

@@ -1,11 +1,13 @@
 Package: mxnet
 Type: Package
 Title: MXNet
-Version: 1.0
+Version: 0.5
 Date: 2015-10-02
-Author: Your Name
-Maintainer: Your Name <your@email.com>
+Author: Qiang Kou
+Maintainer: Your <your@email.com>
 Description: MXNet is a deep learning framework designed for both efficiency and flexibility. It allows you to mix the flavours of deep learning programs together to maximize the efficiency and your productivity.
 License: Apache-2.0
-Imports: Rcpp (>= 0.12.1)
+URL: /~https://github.com/dmlc/mxnet
+BugReports: /~https://github.com/dmlc/mxnet/issues
+Imports: Rcpp (>= 0.11.1)
 LinkingTo: Rcpp

R-package/R/zzz.r

@@ -0,0 +1 @@
+loadModule("mxnet", TRUE)

R-package/README.md

@@ -0,0 +1,11 @@
+MXNet R-Package
+===============
+This is an on-going effort to support mxnet in R, stay tuned.
+
+Bleeding edge Installation
+- First build ```../lib/libmxnet.so``` by following [Build Instruction](doc/build.md)
+- Set the path to ```lib/libmxnet.so``` in ```LD_LIBRARY_PATH```, you can do it by modify ```~/.bashrc```
+```bash
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/path/to/lib/libmxnet.so
+```
+- Type ```R CMD INSTALL R-package``` in the root folder.

R-package/demo/00Index

@@ -0,0 +1 @@
+basic_ndarray               Basic ndarray operations

R-package/demo/basic_ndarray.R

@@ -0,0 +1 @@
+library(mxnet)

R-package/src/Makevars

@@ -0,0 +1,24 @@
+# _*_ mode: makefile; _*_
+PKGROOT=../../
+
+# This file is only used for compilation from github
+# It will be replaced by more formal Rpackage structure
+# Where PKGROOT moved to root directory
+
+.PHONY: all mxlib
+all: $(SHLIB)
+
+$(SHLIB): mxlib
+mxlib:
+	cd $(PKGROOT); make CXX="$(CXX)"; cd -
+	cp $(PKGROOT)/lib/libmxnet.so libmxnet.so
+	mkdir -p ../inst
+	mkdir -p ../inst/libs
+	cp $(PKGROOT)/lib/libmxnet.so ../inst/libs/libmxnet.so
+
+# Need to add libmxnet.so to LD_LIBRARY_PATH
+# TODO: make it install together with mxnet.so
+LINKMXNET = -L../inst/libs -lmxnet
+
+PKG_CPPFLAGS = -I$(PKGROOT)/include -I$(PKGROOT)/dmlc-core/include
+PKG_LIBS = $(LINKMXNET) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)

R-package/src/base.h

@@ -0,0 +1,33 @@
+/*!
+ *  Copyright (c) 2015 by Contributors
+ * \file base.h
+ * \brief Rcpp interface of MXNet
+ */
+#ifndef MXNET_RCPP_BASE_H_
+#define MXNET_RCPP_BASE_H_
+
+#include <Rcpp.h>
+#include <mxnet/c_api.h>
+// to be removed
+#include <dmlc/logging.h>
+
+namespace mxnet {
+namespace R {
+
+// change to Rcpp::cerr later, for compatiblity of older version for now
+#define RLOG_FATAL LOG(FATAL)
+
+/*!
+ * \brief protected MXNet C API call, report R error if happens.
+ * \param func Expression to call.
+ */
+#define MX_CALL(func)                                              \
+  {                                                                \
+    int e = (func);                                                \
+    if (e != 0) {                                                  \
+      RLOG_FATAL << MXGetLastError();                              \
+    }                                                              \
+  }
+}  // namespace Rcpp
+}  // namespace mxnet
+#endif  // MXNET_RCPP_BASE_H_

R-package/src/mxnet.cc

@@ -0,0 +1,8 @@
+#include <Rcpp.h>
+#include "./ndarray.h"
+
+RCPP_MODULE(mxnet) {
+  using namespace mxnet::R; // NOLINT(*)
+  NDArray::InitRcppModule();
+  NDArrayFunction::InitRcppModule();
+}