SINGA-21 Code review - 2

Fix a bug caused by gflags version by adding a macro at main.cc to redefine the namespace gflags=google Update mnist/cifar10 example by adding a Makefile.example
kaiping · Jun 24, 2015 · cfde471 · cfde471
1 parent acfc409
commit cfde471
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/examples/cifar10/Makefile → examples/cifar10/Makefile.example b/examples/cifar10/Makefile → examples/cifar10/Makefile.example
diff --git a/examples/cifar10/model.conf b/examples/cifar10/model.conf
@@ -1,6 +1,6 @@
 name: "cifar10-convnet"
 train_steps: 1000
-test_steps:10
+test_steps:100
 test_frequency:300
 display_frequency:30
 alg: kBackPropagation

diff --git a/examples/mnist/mlp.conf → examples/mnist/model.conf b/examples/mnist/mlp.conf → examples/mnist/model.conf
diff --git a/src/main.cc b/src/main.cc
@@ -1,7 +1,9 @@
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 #include "trainer/trainer.h"
-
+#ifndef GFLAGS_GFLAGS_H_
+  namespace gflags = google;
+#endif  // GFLAGS_GFLAGS_H_
 /**
  * \file main.cc is the main entry of SINGA, like the driver program for Hadoop.
  *