Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[R] Fix the R interface #3334

Merged
merged 2 commits into from
Sep 23, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,6 @@ else
endif

# For quick compile test, used smaller subset
ALLX_DEP = $(filter-out build/src/operator/%, $(ALL_DEP))
ALLX_DEP+= build/src/operator/fully_connected.o
ALLX_DEP+= build/src/operator/fully_connected_gpu.o
ALLX_DEP+= build/src/operator/operator.o
ALLX_DEP+= build/src/operator/operator_util.o
ALLX_DEP+= build/src/operator/elementwise_unary_op.o
ALLX_DEP+= build/src/operator/custom.o

ALLX_DEP= $(ALL_DEP)

ifeq ($(USE_NVRTC), 1)
Expand Down Expand Up @@ -272,6 +264,7 @@ rpkg: roxygen
mkdir -p R-package/inst/include
cp -rf include/* R-package/inst/include
cp -rf dmlc-core/include/* R-package/inst/include/
cp -rf nnvm/include/* R-package/inst/include
R CMD build --no-build-vignettes R-package

scalapkg:
Expand Down
98 changes: 98 additions & 0 deletions R-package/NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -52,34 +52,94 @@ export(mx.mlp)
export(mx.model.FeedForward.create)
export(mx.model.load)
export(mx.model.save)
export(mx.nd.Activation)
export(mx.nd.BatchNorm)
export(mx.nd.BlockGrad)
export(mx.nd.Cast)
export(mx.nd.Concat)
export(mx.nd.Convolution)
export(mx.nd.Correlation)
export(mx.nd.Crop)
export(mx.nd.Custom)
export(mx.nd.Deconvolution)
export(mx.nd.Dropout)
export(mx.nd.ElementWiseSum)
export(mx.nd.Embedding)
export(mx.nd.Flatten)
export(mx.nd.FullyConnected)
export(mx.nd.IdentityAttachKLSparseReg)
export(mx.nd.L2Normalization)
export(mx.nd.LRN)
export(mx.nd.LeakyReLU)
export(mx.nd.LinearRegressionOutput)
export(mx.nd.LogisticRegressionOutput)
export(mx.nd.MAERegressionOutput)
export(mx.nd.MakeLoss)
export(mx.nd.Pooling)
export(mx.nd.RNN)
export(mx.nd.ROIPooling)
export(mx.nd.Reshape)
export(mx.nd.SVMOutput)
export(mx.nd.SliceChannel)
export(mx.nd.Softmax)
export(mx.nd.SoftmaxActivation)
export(mx.nd.SoftmaxOutput)
export(mx.nd.SpatialTransformer)
export(mx.nd.SwapAxis)
export(mx.nd.UpSampling)
export(mx.nd.abs)
export(mx.nd.adam.update)
export(mx.nd.arccos)
export(mx.nd.arcsin)
export(mx.nd.arctan)
export(mx.nd.argmax.channel)
export(mx.nd.array)
export(mx.nd.batch.dot)
export(mx.nd.broadcast.axis)
export(mx.nd.broadcast.div)
export(mx.nd.broadcast.maximum)
export(mx.nd.broadcast.minimum)
export(mx.nd.broadcast.minus)
export(mx.nd.broadcast.mul)
export(mx.nd.broadcast.plus)
export(mx.nd.broadcast.power)
export(mx.nd.broadcast.to)
export(mx.nd.ceil)
export(mx.nd.choose.element.0index)
export(mx.nd.clip)
export(mx.nd.copyto)
export(mx.nd.cos)
export(mx.nd.crop)
export(mx.nd.dot)
export(mx.nd.exp)
export(mx.nd.expand.dims)
export(mx.nd.fill.element.0index)
export(mx.nd.flip)
export(mx.nd.floor)
export(mx.nd.load)
export(mx.nd.log)
export(mx.nd.max)
export(mx.nd.min)
export(mx.nd.negative)
export(mx.nd.norm)
export(mx.nd.normal)
export(mx.nd.ones)
export(mx.nd.round)
export(mx.nd.rsqrt)
export(mx.nd.save)
export(mx.nd.sgd.mom.update)
export(mx.nd.sgd.update)
export(mx.nd.sign)
export(mx.nd.sin)
export(mx.nd.slice.axis)
export(mx.nd.smooth.l1)
export(mx.nd.softmax.cross.entropy)
export(mx.nd.sqrt)
export(mx.nd.square)
export(mx.nd.sum)
export(mx.nd.tan)
export(mx.nd.transpose)
export(mx.nd.uniform)
export(mx.nd.zeros)
export(mx.opt.create)
export(mx.opt.get.updater)
Expand All @@ -96,7 +156,9 @@ export(mx.symbol.BlockGrad)
export(mx.symbol.Cast)
export(mx.symbol.Concat)
export(mx.symbol.Convolution)
export(mx.symbol.Correlation)
export(mx.symbol.Crop)
export(mx.symbol.Custom)
export(mx.symbol.Deconvolution)
export(mx.symbol.Dropout)
export(mx.symbol.ElementWiseSum)
Expand All @@ -111,36 +173,72 @@ export(mx.symbol.LeakyReLU)
export(mx.symbol.LinearRegressionOutput)
export(mx.symbol.LogisticRegressionOutput)
export(mx.symbol.MAERegressionOutput)
export(mx.symbol.MakeLoss)
export(mx.symbol.Pooling)
export(mx.symbol.RNN)
export(mx.symbol.ROIPooling)
export(mx.symbol.Reshape)
export(mx.symbol.SVMOutput)
export(mx.symbol.SliceChannel)
export(mx.symbol.Softmax)
export(mx.symbol.SoftmaxActivation)
export(mx.symbol.SoftmaxOutput)
export(mx.symbol.SpatialTransformer)
export(mx.symbol.SwapAxis)
export(mx.symbol.UpSampling)
export(mx.symbol.Variable)
export(mx.symbol.abs)
export(mx.symbol.adam_update)
export(mx.symbol.arccos)
export(mx.symbol.arcsin)
export(mx.symbol.arctan)
export(mx.symbol.argmax_channel)
export(mx.symbol.batch_dot)
export(mx.symbol.broadcast_axis)
export(mx.symbol.broadcast_div)
export(mx.symbol.broadcast_maximum)
export(mx.symbol.broadcast_minimum)
export(mx.symbol.broadcast_minus)
export(mx.symbol.broadcast_mul)
export(mx.symbol.broadcast_plus)
export(mx.symbol.broadcast_power)
export(mx.symbol.broadcast_to)
export(mx.symbol.ceil)
export(mx.symbol.choose_element_0index)
export(mx.symbol.clip)
export(mx.symbol.cos)
export(mx.symbol.crop)
export(mx.symbol.dot)
export(mx.symbol.exp)
export(mx.symbol.expand_dims)
export(mx.symbol.fill_element_0index)
export(mx.symbol.flip)
export(mx.symbol.floor)
export(mx.symbol.infer.shape)
export(mx.symbol.load)
export(mx.symbol.load.json)
export(mx.symbol.log)
export(mx.symbol.max)
export(mx.symbol.min)
export(mx.symbol.negative)
export(mx.symbol.norm)
export(mx.symbol.normal)
export(mx.symbol.round)
export(mx.symbol.rsqrt)
export(mx.symbol.save)
export(mx.symbol.sgd_mom_update)
export(mx.symbol.sgd_update)
export(mx.symbol.sign)
export(mx.symbol.sin)
export(mx.symbol.slice_axis)
export(mx.symbol.smooth_l1)
export(mx.symbol.softmax_cross_entropy)
export(mx.symbol.sqrt)
export(mx.symbol.square)
export(mx.symbol.sum)
export(mx.symbol.tan)
export(mx.symbol.transpose)
export(mx.symbol.uniform)
export(mxnet.export)
export(outputs)
import(Rcpp)
Expand Down
Loading