You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ta...@apache.org on 2019/01/17 09:40:45 UTC
[incubator-mxnet] branch master updated: Add error checking for cpp
examples. (#13828)
This is an automated email from the ASF dual-hosted git repository.
taolv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 26f5580 Add error checking for cpp examples. (#13828)
26f5580 is described below
commit 26f55803f040d19f53b3e432f500b66573414352
Author: Frank Liu <fr...@gmail.com>
AuthorDate: Thu Jan 17 01:40:23 2019 -0800
Add error checking for cpp examples. (#13828)
---
cpp-package/example/alexnet.cpp | 8 ++++++--
cpp-package/example/googlenet.cpp | 8 ++++++--
cpp-package/example/inception_bn.cpp | 8 ++++++--
cpp-package/example/lenet_with_mxdataiter.cpp | 8 ++++++--
cpp-package/example/mlp_cpu.cpp | 8 ++++++--
cpp-package/example/mlp_gpu.cpp | 8 ++++++--
cpp-package/example/resnet.cpp | 8 ++++++--
cpp-package/example/test_score.cpp | 8 ++++++--
cpp-package/example/utils.h | 5 +++--
9 files changed, 51 insertions(+), 18 deletions(-)
diff --git a/cpp-package/example/alexnet.cpp b/cpp-package/example/alexnet.cpp
index 7564d43..1c0f713 100644
--- a/cpp-package/example/alexnet.cpp
+++ b/cpp-package/example/alexnet.cpp
@@ -244,10 +244,14 @@ int main(int argc, char const *argv[]) {
};
auto train_iter = MXDataIter("MNISTIter");
- setDataIter(&train_iter, "Train", data_files, batch_size);
+ if (!setDataIter(&train_iter, "Train", data_files, batch_size)) {
+ return 1;
+ }
auto val_iter = MXDataIter("MNISTIter");
- setDataIter(&val_iter, "Label", data_files, batch_size);
+ if (!setDataIter(&val_iter, "Label", data_files, batch_size)) {
+ return 1;
+ }
Optimizer* opt = OptimizerRegistry::Find("sgd");
opt->SetParam("momentum", 0.9)
diff --git a/cpp-package/example/googlenet.cpp b/cpp-package/example/googlenet.cpp
index 4bd3be2..c8078af 100644
--- a/cpp-package/example/googlenet.cpp
+++ b/cpp-package/example/googlenet.cpp
@@ -139,10 +139,14 @@ int main(int argc, char const *argv[]) {
};
auto train_iter = MXDataIter("MNISTIter");
- setDataIter(&train_iter, "Train", data_files, batch_size);
+ if (!setDataIter(&train_iter, "Train", data_files, batch_size)) {
+ return 1;
+ }
auto val_iter = MXDataIter("MNISTIter");
- setDataIter(&val_iter, "Label", data_files, batch_size);
+ if (!setDataIter(&val_iter, "Label", data_files, batch_size)) {
+ return 1;
+ }
Optimizer* opt = OptimizerRegistry::Find("sgd");
opt->SetParam("momentum", 0.9)
diff --git a/cpp-package/example/inception_bn.cpp b/cpp-package/example/inception_bn.cpp
index 5b444e4..456e0d9 100644
--- a/cpp-package/example/inception_bn.cpp
+++ b/cpp-package/example/inception_bn.cpp
@@ -168,10 +168,14 @@ int main(int argc, char const *argv[]) {
};
auto train_iter = MXDataIter("MNISTIter");
- setDataIter(&train_iter, "Train", data_files, batch_size);
+ if (!setDataIter(&train_iter, "Train", data_files, batch_size)) {
+ return 1;
+ }
auto val_iter = MXDataIter("MNISTIter");
- setDataIter(&val_iter, "Label", data_files, batch_size);
+ if (!setDataIter(&val_iter, "Label", data_files, batch_size)) {
+ return 1;
+ }
// initialize parameters
Xavier xavier = Xavier(Xavier::gaussian, Xavier::in, 2);
diff --git a/cpp-package/example/lenet_with_mxdataiter.cpp b/cpp-package/example/lenet_with_mxdataiter.cpp
index 4df6fbe..39550a3 100644
--- a/cpp-package/example/lenet_with_mxdataiter.cpp
+++ b/cpp-package/example/lenet_with_mxdataiter.cpp
@@ -97,10 +97,14 @@ int main(int argc, char const *argv[]) {
};
auto train_iter = MXDataIter("MNISTIter");
- setDataIter(&train_iter, "Train", data_files, batch_size);
+ if (!setDataIter(&train_iter, "Train", data_files, batch_size)) {
+ return 1;
+ }
auto val_iter = MXDataIter("MNISTIter");
- setDataIter(&val_iter, "Label", data_files, batch_size);
+ if (!setDataIter(&val_iter, "Label", data_files, batch_size)) {
+ return 1;
+ }
Optimizer* opt = OptimizerRegistry::Find("sgd");
opt->SetParam("momentum", 0.9)
diff --git a/cpp-package/example/mlp_cpu.cpp b/cpp-package/example/mlp_cpu.cpp
index dc1ab36..93eaf05 100644
--- a/cpp-package/example/mlp_cpu.cpp
+++ b/cpp-package/example/mlp_cpu.cpp
@@ -63,10 +63,14 @@ int main(int argc, char** argv) {
};
auto train_iter = MXDataIter("MNISTIter");
- setDataIter(&train_iter, "Train", data_files, batch_size);
+ if (!setDataIter(&train_iter, "Train", data_files, batch_size)) {
+ return 1;
+ }
auto val_iter = MXDataIter("MNISTIter");
- setDataIter(&val_iter, "Label", data_files, batch_size);
+ if (!setDataIter(&val_iter, "Label", data_files, batch_size)) {
+ return 1;
+ }
auto net = mlp(layers);
diff --git a/cpp-package/example/mlp_gpu.cpp b/cpp-package/example/mlp_gpu.cpp
index 67992a1..0befde8 100644
--- a/cpp-package/example/mlp_gpu.cpp
+++ b/cpp-package/example/mlp_gpu.cpp
@@ -63,10 +63,14 @@ int main(int argc, char** argv) {
};
auto train_iter = MXDataIter("MNISTIter");
- setDataIter(&train_iter, "Train", data_files, batch_size);
+ if (!setDataIter(&train_iter, "Train", data_files, batch_size)) {
+ return 1;
+ }
auto val_iter = MXDataIter("MNISTIter");
- setDataIter(&val_iter, "Label", data_files, batch_size);
+ if (!setDataIter(&val_iter, "Label", data_files, batch_size)) {
+ return 1;
+ }
auto net = mlp(layers);
diff --git a/cpp-package/example/resnet.cpp b/cpp-package/example/resnet.cpp
index 0bb77a1..7c9dd4d 100644
--- a/cpp-package/example/resnet.cpp
+++ b/cpp-package/example/resnet.cpp
@@ -179,10 +179,14 @@ int main(int argc, char const *argv[]) {
};
auto train_iter = MXDataIter("MNISTIter");
- setDataIter(&train_iter, "Train", data_files, batch_size);
+ if (!setDataIter(&train_iter, "Train", data_files, batch_size)) {
+ return 1;
+ }
auto val_iter = MXDataIter("MNISTIter");
- setDataIter(&val_iter, "Label", data_files, batch_size);
+ if (!setDataIter(&val_iter, "Label", data_files, batch_size)) {
+ return 1;
+ }
// initialize parameters
Xavier xavier = Xavier(Xavier::gaussian, Xavier::in, 2);
diff --git a/cpp-package/example/test_score.cpp b/cpp-package/example/test_score.cpp
index 9252701..7e5096a 100644
--- a/cpp-package/example/test_score.cpp
+++ b/cpp-package/example/test_score.cpp
@@ -70,10 +70,14 @@ int main(int argc, char** argv) {
};
auto train_iter = MXDataIter("MNISTIter");
- setDataIter(&train_iter, "Train", data_files, batch_size);
+ if (!setDataIter(&train_iter, "Train", data_files, batch_size)) {
+ return 1;
+ }
auto val_iter = MXDataIter("MNISTIter");
- setDataIter(&val_iter, "Label", data_files, batch_size);
+ if (!setDataIter(&val_iter, "Label", data_files, batch_size)) {
+ return 1;
+ }
auto net = mlp(layers);
diff --git a/cpp-package/example/utils.h b/cpp-package/example/utils.h
index 2ed5c4c..020d1ec 100644
--- a/cpp-package/example/utils.h
+++ b/cpp-package/example/utils.h
@@ -40,12 +40,13 @@ bool check_datafiles(const std::vector<std::string> &data_files) {
}
}
return true;
- }
+}
bool setDataIter(MXDataIter *iter , const std::string &useType,
const std::vector<std::string> &data_files, int batch_size) {
- if (!check_datafiles(data_files))
+ if (!check_datafiles(data_files)) {
return false;
+ }
iter->SetParam("batch_size", batch_size);
iter->SetParam("shuffle", 1);