Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
terrytangyuan committed Dec 27, 2015
2 parents 3916e8e + ac38dc4 commit d4e397f
Show file tree
Hide file tree
Showing 81 changed files with 3,608 additions and 190 deletions.
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,4 @@ List of Contributors
* [Xianliang Wang](https://github.com/wangxianliang)
* [Junru Shao](https://github.com/yzgysjr)
* [Xiao Liu](https://github.com/skylook)
* [Lowik CHANUSSOT](https://github.com/Nzeuwik)
2 changes: 1 addition & 1 deletion R-package/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
Description: MXNet is a deep learning framework designed for both efficiency
Expand Down
26 changes: 26 additions & 0 deletions R-package/NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export(mx.gpu)
export(mx.init.create)
export(mx.init.normal)
export(mx.init.uniform)
export(mx.io.CSVIter)
export(mx.io.ImageRecordIter)
export(mx.io.MNISTIter)
export(mx.io.arrayiter)
Expand All @@ -42,19 +43,30 @@ export(mx.mlp)
export(mx.model.FeedForward.create)
export(mx.model.load)
export(mx.model.save)
export(mx.nd.abs)
export(mx.nd.array)
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.dot)
export(mx.nd.exp)
export(mx.nd.floor)
export(mx.nd.load)
export(mx.nd.log)
export(mx.nd.max)
export(mx.nd.min)
export(mx.nd.norm)
export(mx.nd.ones)
export(mx.nd.round)
export(mx.nd.rsqrt)
export(mx.nd.save)
export(mx.nd.sign)
export(mx.nd.sin)
export(mx.nd.sqrt)
export(mx.nd.square)
export(mx.nd.sum)
export(mx.nd.zeros)
export(mx.opt.create)
export(mx.opt.get.updater)
Expand All @@ -70,24 +82,38 @@ export(mx.symbol.Convolution)
export(mx.symbol.Deconvolution)
export(mx.symbol.Dropout)
export(mx.symbol.ElementWiseSum)
export(mx.symbol.Embedding)
export(mx.symbol.Flatten)
export(mx.symbol.FullyConnected)
export(mx.symbol.Group)
export(mx.symbol.IdentityAttachKLSparseReg)
export(mx.symbol.LRN)
export(mx.symbol.LeakyReLU)
export(mx.symbol.LinearRegressionOutput)
export(mx.symbol.LogisticRegressionOutput)
export(mx.symbol.MAERegressionOutput)
export(mx.symbol.Pooling)
export(mx.symbol.Reshape)
export(mx.symbol.SliceChannel)
export(mx.symbol.Softmax)
export(mx.symbol.SoftmaxActivation)
export(mx.symbol.SoftmaxOutput)
export(mx.symbol.SwapAxis)
export(mx.symbol.UpSampling)
export(mx.symbol.Variable)
export(mx.symbol.abs)
export(mx.symbol.ceil)
export(mx.symbol.cos)
export(mx.symbol.exp)
export(mx.symbol.floor)
export(mx.symbol.infer.shape)
export(mx.symbol.load)
export(mx.symbol.log)
export(mx.symbol.round)
export(mx.symbol.rsqrt)
export(mx.symbol.save)
export(mx.symbol.sign)
export(mx.symbol.sin)
export(mx.symbol.sqrt)
export(mx.symbol.square)
export(mxnet.export)
Expand Down
Loading

0 comments on commit d4e397f

Please sign in to comment.