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

fix batchNorm cpp example #6454

Merged
merged 2 commits into from
May 26, 2017
Merged

fix batchNorm cpp example #6454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abdc31b
fix batchNorm cpp example
vsooda May 25, 2017
be8786d
Merge branch 'master' into fix_cpp_batchnorm
piiswrong May 26, 2017
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
10 changes: 6 additions & 4 deletions cpp-package/example/inception_bn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@

using namespace mxnet::cpp;

static const Symbol BN_BETA;
static const Symbol BN_GAMMA;

Symbol ConvFactoryBN(Symbol data, int num_filter,
Shape kernel, Shape stride, Shape pad,
const std::string & name,
Expand All @@ -23,7 +20,12 @@ Symbol ConvFactoryBN(Symbol data, int num_filter,
Symbol conv = Convolution("conv_" + name + suffix, data,
conv_w, conv_b, kernel,
num_filter, stride, Shape(1, 1), pad);
Symbol bn = BatchNorm("bn_" + name + suffix, conv, Symbol(), Symbol(), Symbol(), Symbol());
std::string name_suffix = name + suffix;
Symbol gamma(name_suffix + "_gamma");
Symbol beta(name_suffix + "_beta");
Symbol mmean(name_suffix + "_mmean");
Symbol mvar(name_suffix + "_mvar");
Symbol bn = BatchNorm("bn_" + name + suffix, conv, gamma, beta, mmean, mvar);
return Activation("relu_" + name + suffix, bn, "relu");
}

Expand Down
21 changes: 14 additions & 7 deletions cpp-package/example/resnet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ Symbol ConvolutionNoBias(const std::string& symbol_name,
.CreateSymbol(symbol_name);
}

static const Symbol BN_BETA;
static const Symbol BN_GAMMA;

Symbol getConv(const std::string & name, Symbol data,
int num_filter,
Shape kernel, Shape stride, Shape pad,
Expand All @@ -48,8 +45,13 @@ Symbol getConv(const std::string & name, Symbol data,
kernel, num_filter, stride, Shape(1, 1),
pad, 1, 512);

Symbol bn = BatchNorm(name + "_bn", conv, Symbol(), Symbol(), Symbol(),
Symbol(), 2e-5, bn_momentum, false);
Symbol gamma(name + "_gamma");
Symbol beta(name + "_beta");
Symbol mmean(name + "_mmean");
Symbol mvar(name + "_mvar");

Symbol bn = BatchNorm(name + "_bn", conv, gamma,
beta, mmean, mvar, 2e-5, bn_momentum, false);

if (with_relu) {
return Activation(name + "_relu", bn, "relu");
Expand Down Expand Up @@ -109,8 +111,13 @@ Symbol ResNetSymbol(int num_class, int num_level = 3, int num_block = 9,
Symbol data = Symbol::Variable("data");
Symbol data_label = Symbol::Variable("data_label");

Symbol zscore = BatchNorm("zscore", data, Symbol(), Symbol(), Symbol(),
Symbol(), 0.001, bn_momentum);
Symbol gamma("gamma");
Symbol beta("beta");
Symbol mmean("mmean");
Symbol mvar("mvar");

Symbol zscore = BatchNorm("zscore", data, gamma,
beta, mmean, mvar, 0.001, bn_momentum);

Symbol conv = getConv("conv0", zscore, num_filter,
Shape(3, 3), Shape(1, 1), Shape(1, 1),
Expand Down