Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
antinucleon committed Nov 1, 2015
1 parent dba8e5a commit 7054c23
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ List of Contributors
- To contributors: please add your name to the list when you submit a patch to the project:)
* [Feng Wang](https://github.com/happynear)
- Feng makes mxnet compatible with Windows Visual Studio.
* [J Deng](https://github.com/jdeng)
- Jack created the amalgamation script for mxnet.
* [Jack Deng](https://github.com/jdeng)
- Jack created the amalgamation script and Go bind for mxnet.
* [Li Dong](https://github.com/donglixp)
* [Piji Li](https://github.com/lipiji)
* [Hu Shiwen](https://github.com/yajiedesign)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ deep learning programs together to maximize the efficiency and your productivity

What's New
----------
* [Minimum MXNet Library in one File](amalgamation)
* [Minimum MXNet Library in One File](amalgamation)
* [Training Deep Net on 14 Million Images on A Single Machine](https://mxnet-bing.readthedocs.org/en/latest/tutorial/imagenet_full.html)
* [MXNet.jl Julia binding initial release](https://github.com/dmlc/MXNet.jl)
* [Design Note: Squeeze the Memory Consumption of Deep Learning](http://mxnet.readthedocs.org/en/latest/developer-guide/note_memory.html)
Expand Down
2 changes: 1 addition & 1 deletion amalgamation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ The only dependency is a BLAS library.

Acknowledgement
---------------
This module is created by [J Deng](https://github.com/jdeng).
This module is created by [Jack Deng](https://github.com/jdeng).
6 changes: 5 additions & 1 deletion src/operator/softmax_output-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,13 @@ class SoftmaxOutputProp : public OperatorProperty {

class DeprecatedSoftmaxProp : public SoftmaxOutputProp {
public:
std::string TypeString() const override {
void Init(const std::vector<std::pair<std::string, std::string> >& kwargs) override {
LOG(INFO) << "Softmax symbol is renamed to SoftmaxOutput. "
<< "This API will be deprecated in Dec, 2015";
SoftmaxOutputProp::param_.Init(kwargs);
}

std::string TypeString() const override {
return "Softmax";
}
};
Expand Down

0 comments on commit 7054c23

Please sign in to comment.