SINGA-53 Add lmdb compiling options Remove unused macros.
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/9d43056a Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/9d43056a Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/9d43056a Branch: refs/heads/master Commit: 9d43056af8d523b6191b92ec2a2d2ea3961352de Parents: 975f0cf Author: Wei Wang <[email protected]> Authored: Thu Aug 13 14:34:44 2015 +0800 Committer: Wei Wang <[email protected]> Committed: Thu Aug 13 14:34:44 2015 +0800 ---------------------------------------------------------------------- include/neuralnet/optional_layer.h | 1 - src/neuralnet/neuralnet.cc | 6 ++---- src/neuralnet/optional_layer.cc | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/9d43056a/include/neuralnet/optional_layer.h ---------------------------------------------------------------------- diff --git a/include/neuralnet/optional_layer.h b/include/neuralnet/optional_layer.h index a6db9b8..34dd43b 100644 --- a/include/neuralnet/optional_layer.h +++ b/include/neuralnet/optional_layer.h @@ -1,4 +1,3 @@ -//#ifdef USE_OPTIONAL_LAYER #ifdef USE_LMDB #ifndef SINGA_NEURALNET_OPTIONAL_LAYER_ #define SINGA_NEURALNET_OPTIONAL_LAYER_ http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/9d43056a/src/neuralnet/neuralnet.cc ---------------------------------------------------------------------- diff --git a/src/neuralnet/neuralnet.cc b/src/neuralnet/neuralnet.cc index 83bd4fd..2b1f054 100644 --- a/src/neuralnet/neuralnet.cc +++ b/src/neuralnet/neuralnet.cc @@ -2,10 +2,8 @@ #include <queue> #include "neuralnet/neuralnet.h" -#include "utils/singleton.h" -#ifdef USE_OPTIONAL_LAYER #include "neuralnet/optional_layer.h" -#endif +#include "utils/singleton.h" namespace singa { // macros to shorten the code @@ -39,7 +37,7 @@ void NeuralNet::RegisterLayers() { RegisterLayer(factory, RBMVis); RegisterLayer(factory, RBMHid); -#ifdef USE_OPTIONAL_LAYER +#ifdef USE_LMDB RegisterLayer(factory, LMDBData); #endif } http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/9d43056a/src/neuralnet/optional_layer.cc ---------------------------------------------------------------------- diff --git a/src/neuralnet/optional_layer.cc b/src/neuralnet/optional_layer.cc index 8cc7f5e..a05a657 100644 --- a/src/neuralnet/optional_layer.cc +++ b/src/neuralnet/optional_layer.cc @@ -1,4 +1,3 @@ -//#ifdef USE_OPTIONAL_LAYER #ifdef USE_LMDB #include "neuralnet/optional_layer.h" namespace singa {
