SINGA-55 Refactor main.cc and singa.h

add driver.cc in make configuration
moretwo · Aug 15, 2015 · 2498ff1 · 2498ff1
2 parents 75b2e04 + f3cc20a
commit 2498ff1
Show file tree

Hide file tree

Showing 18 changed files with 10,849 additions and 11,556 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -23,7 +23,8 @@ PROTO_PYS := tool/pb2/singa_pb2.py \
              tool/pb2/job_pb2.py \
              tool/pb2/common_pb2.py
 
-SINGA_SRCS := src/utils/cluster.cc \
+SINGA_SRCS := src/driver.cc \
+              src/utils/cluster.cc \
               src/utils/cluster_rt.cc \
               src/utils/graph.cc \
               src/utils/common.cc \
@@ -89,22 +90,6 @@ bin_PROGRAMS = singa
 singa_SOURCES = src/main.cc
 singa_CXXFLAGS = -O3 -Wall -pthread -fPIC -std=c++11 -MMD -Wno-unknown-pragmas \
                  $(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops -DTHREADED
-if LMDB
-singa_LDFLAGS = -I./include \
-                -lsinga \
-                -lglog  \
-                -lgflags \
-                -lprotobuf \
-                -lrt \
-                -lopencv_highgui \
-                -lopencv_imgproc \
-                -lopencv_core \
-                -lopenblas \
-                -lzmq \
-                -lczmq \
-                -llmdb \
-                -lzookeeper_mt
-else
 singa_LDFLAGS = -I./include \
                 -lsinga \
                 -lglog  \
@@ -117,8 +102,9 @@ singa_LDFLAGS = -I./include \
                 -lopenblas \
                 -lzmq \
                 -lczmq \
-                -llmdb \
                 -lzookeeper_mt
+if LMDB
+singa_LDFLAGS += -llmdb
 endif
 
 bin_PROGRAMS += singatool