add zookeeper
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/5e111c3c Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/5e111c3c Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/5e111c3c Branch: refs/heads/master Commit: 5e111c3ca51085f5c5e9bf0fdc873ee92e3f3d4f Parents: 09c1b4e Author: xiezl <[email protected]> Authored: Wed May 27 18:16:55 2015 +0800 Committer: xiezl <[email protected]> Committed: Wed May 27 18:16:55 2015 +0800 ---------------------------------------------------------------------- Makefile.am | 23 +- Makefile.in | 88 +- README.md | 18 +- config.h.in | 5 +- configure | 11156 ++++++++++++++++++++++----------------- examples/cifar10/Makefile | 4 +- thirdparty/install.sh | 17 +- 7 files changed, 6299 insertions(+), 5012 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5e111c3c/Makefile.am ---------------------------------------------------------------------- diff --git a/Makefile.am b/Makefile.am index 89062df..8d1774a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ CLOCAL_AMFLAGS = -I config -AM_CPPFLAGS = -I$(top_srcdir)src +AM_CPPFLAGS = -I$(top_srcdir)/src MSHADOW_FLAGS = -DMSHADOW_USE_CUDA=0 -DMSHADOW_USE_CBLAS=1 -DMSHADOW_USE_MKL=0 @@ -15,6 +15,7 @@ PROTO_HDRS := src/proto/cluster.pb.h src/proto/model.pb.h PROTO_OBJS := src/proto/cluster.pb.o src/proto/model.pb.o SINGA_SRCS := src/utils/cluster.cc \ + src/utils/cluster_rt.cc \ src/utils/graph.cc \ src/utils/common.cc \ src/utils/param.cc \ @@ -31,6 +32,7 @@ SINGA_SRCS := src/utils/cluster.cc \ src/communication/msg.cc SINGA_HDRS := include/utils/cluster.h \ + include/utils/cluster_rt.h \ include/utils/param.h \ include/utils/common.h \ include/utils/factory.h \ @@ -59,6 +61,7 @@ SINGA_HDRS := include/utils/cluster.h \ SINGA_OBJS := src/proto/cluster.pb.o \ src/proto/model.pb.o \ src/utils/cluster.o \ + src/utils/cluster_rt.o \ src/utils/graph.o \ src/utils/common.o \ src/utils/param.o \ @@ -79,13 +82,24 @@ SINGA_OBJS := src/proto/cluster.pb.o \ lib_LTLIBRARIES = libsinga.la libsinga_la_SOURCES = $(PROTO_HDRS) $(PROTO_SRCS) $(SINGA_SRCS) $(SINGA_HDRS) libsinga_la_CXXFLAGS = -O3 -Wall -pthread -fPIC -std=c++11 -Wno-unknown-pragmas \ - $(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops -gdwarf-2 -gstrict-dwarf -Woverloaded-virtual + $(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops -gdwarf-2 -gstrict-dwarf -Woverloaded-virtual -DTHREADED -fpermissive libsinga_la_LDFLAGS = -I./include +lib_LTLIBRARIES += libsingashard.la +libsingashard_la_SOURCES = src/utils/data_shard.cc \ + src/proto/model.pb.cc \ + src/utils/common.cc \ + include/proto/model.pb.h \ + include/utils/common.h \ + include/utils/data_shard.h +libsingashard_la_CXXFLAGS = -O3 -Wall -pthread -fPIC -std=c++11 -Wno-unknown-pragmas \ + $(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops -gdwarf-2 -gstrict-dwarf -Woverloaded-virtual +libsingashard_la_LDFLAGS = -I./include + 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 + $(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops -DTHREADED -fpermissive singa_LDFLAGS = -I./include \ -lsinga \ -lglog \ @@ -98,7 +112,8 @@ singa_LDFLAGS = -I./include \ -lopenblas \ -lzmq \ -lczmq \ - -llmdb + -llmdb \ + -lzookeeper_mt clean-local: rm -rf $(PROTO_SRCS) $(PROTO_HDRS) http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5e111c3c/Makefile.in ---------------------------------------------------------------------- diff --git a/Makefile.in b/Makefile.in index 2e84e2b..341343d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -68,6 +68,7 @@ am__dirstamp = $(am__leading_dot)dirstamp am__objects_2 = src/proto/libsinga_la-cluster.pb.lo \ src/proto/libsinga_la-model.pb.lo am__objects_3 = src/utils/libsinga_la-cluster.lo \ + src/utils/libsinga_la-cluster_rt.lo \ src/utils/libsinga_la-graph.lo src/utils/libsinga_la-common.lo \ src/utils/libsinga_la-param.lo \ src/utils/libsinga_la-updater.lo \ @@ -84,6 +85,12 @@ am__objects_3 = src/utils/libsinga_la-cluster.lo \ am_libsinga_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ $(am__objects_3) $(am__objects_1) libsinga_la_OBJECTS = $(am_libsinga_la_OBJECTS) +libsingashard_la_LIBADD = +am_libsingashard_la_OBJECTS = \ + src/utils/libsingashard_la-data_shard.lo \ + src/proto/libsingashard_la-model.pb.lo \ + src/utils/libsingashard_la-common.lo +libsingashard_la_OBJECTS = $(am_libsingashard_la_OBJECTS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_singa_OBJECTS = src/singa-main.$(OBJEXT) @@ -108,8 +115,10 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libsinga_la_SOURCES) $(singa_SOURCES) -DIST_SOURCES = $(libsinga_la_SOURCES) $(singa_SOURCES) +SOURCES = $(libsinga_la_SOURCES) $(libsingashard_la_SOURCES) \ + $(singa_SOURCES) +DIST_SOURCES = $(libsinga_la_SOURCES) $(libsingashard_la_SOURCES) \ + $(singa_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -221,7 +230,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ CLOCAL_AMFLAGS = -I config -AM_CPPFLAGS = -I$(top_srcdir)src +AM_CPPFLAGS = -I$(top_srcdir)/src MSHADOW_FLAGS = -DMSHADOW_USE_CUDA=0 -DMSHADOW_USE_CBLAS=1 -DMSHADOW_USE_MKL=0 AC_CXXFLAGS = -O3 -Wall -pthread -fPIC -std=c++11 -Wno-unknown-pragmas \ $(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops @@ -232,6 +241,7 @@ PROTO_SRCS := src/proto/cluster.pb.cc src/proto/model.pb.cc PROTO_HDRS := src/proto/cluster.pb.h src/proto/model.pb.h PROTO_OBJS := src/proto/cluster.pb.o src/proto/model.pb.o SINGA_SRCS := src/utils/cluster.cc \ + src/utils/cluster_rt.cc \ src/utils/graph.cc \ src/utils/common.cc \ src/utils/param.cc \ @@ -248,6 +258,7 @@ SINGA_SRCS := src/utils/cluster.cc \ src/communication/msg.cc SINGA_HDRS := include/utils/cluster.h \ + include/utils/cluster_rt.h \ include/utils/param.h \ include/utils/common.h \ include/utils/factory.h \ @@ -276,6 +287,7 @@ SINGA_HDRS := include/utils/cluster.h \ SINGA_OBJS := src/proto/cluster.pb.o \ src/proto/model.pb.o \ src/utils/cluster.o \ + src/utils/cluster_rt.o \ src/utils/graph.o \ src/utils/common.o \ src/utils/param.o \ @@ -293,15 +305,26 @@ SINGA_OBJS := src/proto/cluster.pb.o \ src/communication/socket.o \ src/communication/msg.o -lib_LTLIBRARIES = libsinga.la +lib_LTLIBRARIES = libsinga.la libsingashard.la libsinga_la_SOURCES = $(PROTO_HDRS) $(PROTO_SRCS) $(SINGA_SRCS) $(SINGA_HDRS) libsinga_la_CXXFLAGS = -O3 -Wall -pthread -fPIC -std=c++11 -Wno-unknown-pragmas \ - $(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops -gdwarf-2 -gstrict-dwarf -Woverloaded-virtual + $(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops -gdwarf-2 -gstrict-dwarf -Woverloaded-virtual -DTHREADED -fpermissive libsinga_la_LDFLAGS = -I./include +libsingashard_la_SOURCES = src/utils/data_shard.cc \ + src/proto/model.pb.cc \ + src/utils/common.cc \ + include/proto/model.pb.h \ + include/utils/common.h \ + include/utils/data_shard.h + +libsingashard_la_CXXFLAGS = -O3 -Wall -pthread -fPIC -std=c++11 -Wno-unknown-pragmas \ + $(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops -gdwarf-2 -gstrict-dwarf -Woverloaded-virtual + +libsingashard_la_LDFLAGS = -I./include 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 + $(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops -DTHREADED -fpermissive singa_LDFLAGS = -I./include \ -lsinga \ @@ -315,7 +338,8 @@ singa_LDFLAGS = -I./include \ -lopenblas \ -lzmq \ -lczmq \ - -llmdb + -llmdb \ + -lzookeeper_mt all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -417,6 +441,8 @@ src/utils/$(DEPDIR)/$(am__dirstamp): @: > src/utils/$(DEPDIR)/$(am__dirstamp) src/utils/libsinga_la-cluster.lo: src/utils/$(am__dirstamp) \ src/utils/$(DEPDIR)/$(am__dirstamp) +src/utils/libsinga_la-cluster_rt.lo: src/utils/$(am__dirstamp) \ + src/utils/$(DEPDIR)/$(am__dirstamp) src/utils/libsinga_la-graph.lo: src/utils/$(am__dirstamp) \ src/utils/$(DEPDIR)/$(am__dirstamp) src/utils/libsinga_la-common.lo: src/utils/$(am__dirstamp) \ @@ -468,6 +494,14 @@ src/communication/libsinga_la-msg.lo: \ src/communication/$(DEPDIR)/$(am__dirstamp) libsinga.la: $(libsinga_la_OBJECTS) $(libsinga_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(libsinga_la_LDFLAGS) $(libsinga_la_OBJECTS) $(libsinga_la_LIBADD) $(LIBS) +src/utils/libsingashard_la-data_shard.lo: src/utils/$(am__dirstamp) \ + src/utils/$(DEPDIR)/$(am__dirstamp) +src/proto/libsingashard_la-model.pb.lo: src/proto/$(am__dirstamp) \ + src/proto/$(DEPDIR)/$(am__dirstamp) +src/utils/libsingashard_la-common.lo: src/utils/$(am__dirstamp) \ + src/utils/$(DEPDIR)/$(am__dirstamp) +libsingashard.la: $(libsingashard_la_OBJECTS) $(libsingashard_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libsingashard_la_LDFLAGS) $(libsingashard_la_OBJECTS) $(libsingashard_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" @@ -524,6 +558,8 @@ mostlyclean-compile: -rm -f src/proto/libsinga_la-cluster.pb.lo -rm -f src/proto/libsinga_la-model.pb.$(OBJEXT) -rm -f src/proto/libsinga_la-model.pb.lo + -rm -f src/proto/libsingashard_la-model.pb.$(OBJEXT) + -rm -f src/proto/libsingashard_la-model.pb.lo -rm -f src/singa-main.$(OBJEXT) -rm -f src/trainer/libsinga_la-server.$(OBJEXT) -rm -f src/trainer/libsinga_la-server.lo @@ -535,6 +571,8 @@ mostlyclean-compile: -rm -f src/utils/libsinga_la-blob.lo -rm -f src/utils/libsinga_la-cluster.$(OBJEXT) -rm -f src/utils/libsinga_la-cluster.lo + -rm -f src/utils/libsinga_la-cluster_rt.$(OBJEXT) + -rm -f src/utils/libsinga_la-cluster_rt.lo -rm -f src/utils/libsinga_la-common.$(OBJEXT) -rm -f src/utils/libsinga_la-common.lo -rm -f src/utils/libsinga_la-data_shard.$(OBJEXT) @@ -545,6 +583,10 @@ mostlyclean-compile: -rm -f src/utils/libsinga_la-param.lo -rm -f src/utils/libsinga_la-updater.$(OBJEXT) -rm -f src/utils/libsinga_la-updater.lo + -rm -f src/utils/libsingashard_la-common.$(OBJEXT) + -rm -f src/utils/libsingashard_la-common.lo + -rm -f src/utils/libsingashard_la-data_shard.$(OBJEXT) + -rm -f src/utils/libsingashard_la-data_shard.lo distclean-compile: -rm -f *.tab.c @@ -557,16 +599,20 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/neuralnet/$(DEPDIR)/libsinga_la-neuralnet.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/proto/$(DEPDIR)/libsinga_la-cluster.pb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/proto/$(DEPDIR)/libsinga_la-model.pb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/proto/$(DEPDIR)/libsingashard_la-model.pb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/trainer/$(DEPDIR)/libsinga_la-server.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/trainer/$(DEPDIR)/libsinga_la-trainer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/trainer/$(DEPDIR)/libsinga_la-worker.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libsinga_la-blob.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libsinga_la-cluster.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libsinga_la-cluster_rt.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libsinga_la-common.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libsinga_la-data_shard.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libsinga_la-graph.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libsinga_la-param.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libsinga_la-updater.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libsingashard_la-common.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libsingashard_la-data_shard.Plo@am__quote@ .cc.o: @am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \ @@ -613,6 +659,13 @@ src/utils/libsinga_la-cluster.lo: src/utils/cluster.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsinga_la_CXXFLAGS) $(CXXFLAGS) -c -o src/utils/libsinga_la-cluster.lo `test -f 'src/utils/cluster.cc' || echo '$(srcdir)/'`src/utils/cluster.cc +src/utils/libsinga_la-cluster_rt.lo: src/utils/cluster_rt.cc +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsinga_la_CXXFLAGS) $(CXXFLAGS) -MT src/utils/libsinga_la-cluster_rt.lo -MD -MP -MF "src/utils/$(DEPDIR)/libsinga_la-cluster_rt.Tpo" -c -o src/utils/libsinga_la-cluster_rt.lo `test -f 'src/utils/cluster_rt.cc' || echo '$(srcdir)/'`src/utils/cluster_rt.cc; \ +@am__fastdepCXX_TRUE@ then mv -f "src/utils/$(DEPDIR)/libsinga_la-cluster_rt.Tpo" "src/utils/$(DEPDIR)/libsinga_la-cluster_rt.Plo"; else rm -f "src/utils/$(DEPDIR)/libsinga_la-cluster_rt.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/utils/cluster_rt.cc' object='src/utils/libsinga_la-cluster_rt.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsinga_la_CXXFLAGS) $(CXXFLAGS) -c -o src/utils/libsinga_la-cluster_rt.lo `test -f 'src/utils/cluster_rt.cc' || echo '$(srcdir)/'`src/utils/cluster_rt.cc + src/utils/libsinga_la-graph.lo: src/utils/graph.cc @am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsinga_la_CXXFLAGS) $(CXXFLAGS) -MT src/utils/libsinga_la-graph.lo -MD -MP -MF "src/utils/$(DEPDIR)/libsinga_la-graph.Tpo" -c -o src/utils/libsinga_la-graph.lo `test -f 'src/utils/graph.cc' || echo '$(srcdir)/'`src/utils/graph.cc; \ @am__fastdepCXX_TRUE@ then mv -f "src/utils/$(DEPDIR)/libsinga_la-graph.Tpo" "src/utils/$(DEPDIR)/libsinga_la-graph.Plo"; else rm -f "src/utils/$(DEPDIR)/libsinga_la-graph.Tpo"; exit 1; fi @@ -711,6 +764,27 @@ src/communication/libsinga_la-msg.lo: src/communication/msg.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsinga_la_CXXFLAGS) $(CXXFLAGS) -c -o src/communication/libsinga_la-msg.lo `test -f 'src/communication/msg.cc' || echo '$(srcdir)/'`src/communication/msg.cc +src/utils/libsingashard_la-data_shard.lo: src/utils/data_shard.cc +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsingashard_la_CXXFLAGS) $(CXXFLAGS) -MT src/utils/libsingashard_la-data_shard.lo -MD -MP -MF "src/utils/$(DEPDIR)/libsingashard_la-data_shard.Tpo" -c -o src/utils/libsingashard_la-data_shard.lo `test -f 'src/utils/data_shard.cc' || echo '$(srcdir)/'`src/utils/data_shard.cc; \ +@am__fastdepCXX_TRUE@ then mv -f "src/utils/$(DEPDIR)/libsingashard_la-data_shard.Tpo" "src/utils/$(DEPDIR)/libsingashard_la-data_shard.Plo"; else rm -f "src/utils/$(DEPDIR)/libsingashard_la-data_shard.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/utils/data_shard.cc' object='src/utils/libsingashard_la-data_shard.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsingashard_la_CXXFLAGS) $(CXXFLAGS) -c -o src/utils/libsingashard_la-data_shard.lo `test -f 'src/utils/data_shard.cc' || echo '$(srcdir)/'`src/utils/data_shard.cc + +src/proto/libsingashard_la-model.pb.lo: src/proto/model.pb.cc +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsingashard_la_CXXFLAGS) $(CXXFLAGS) -MT src/proto/libsingashard_la-model.pb.lo -MD -MP -MF "src/proto/$(DEPDIR)/libsingashard_la-model.pb.Tpo" -c -o src/proto/libsingashard_la-model.pb.lo `test -f 'src/proto/model.pb.cc' || echo '$(srcdir)/'`src/proto/model.pb.cc; \ +@am__fastdepCXX_TRUE@ then mv -f "src/proto/$(DEPDIR)/libsingashard_la-model.pb.Tpo" "src/proto/$(DEPDIR)/libsingashard_la-model.pb.Plo"; else rm -f "src/proto/$(DEPDIR)/libsingashard_la-model.pb.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/proto/model.pb.cc' object='src/proto/libsingashard_la-model.pb.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsingashard_la_CXXFLAGS) $(CXXFLAGS) -c -o src/proto/libsingashard_la-model.pb.lo `test -f 'src/proto/model.pb.cc' || echo '$(srcdir)/'`src/proto/model.pb.cc + +src/utils/libsingashard_la-common.lo: src/utils/common.cc +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsingashard_la_CXXFLAGS) $(CXXFLAGS) -MT src/utils/libsingashard_la-common.lo -MD -MP -MF "src/utils/$(DEPDIR)/libsingashard_la-common.Tpo" -c -o src/utils/libsingashard_la-common.lo `test -f 'src/utils/common.cc' || echo '$(srcdir)/'`src/utils/common.cc; \ +@am__fastdepCXX_TRUE@ then mv -f "src/utils/$(DEPDIR)/libsingashard_la-common.Tpo" "src/utils/$(DEPDIR)/libsingashard_la-common.Plo"; else rm -f "src/utils/$(DEPDIR)/libsingashard_la-common.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/utils/common.cc' object='src/utils/libsingashard_la-common.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsingashard_la_CXXFLAGS) $(CXXFLAGS) -c -o src/utils/libsingashard_la-common.lo `test -f 'src/utils/common.cc' || echo '$(srcdir)/'`src/utils/common.cc + src/singa-main.o: src/main.cc @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(singa_CXXFLAGS) $(CXXFLAGS) -MT src/singa-main.o -MD -MP -MF "src/$(DEPDIR)/singa-main.Tpo" -c -o src/singa-main.o `test -f 'src/main.cc' || echo '$(srcdir)/'`src/main.cc; \ @am__fastdepCXX_TRUE@ then mv -f "src/$(DEPDIR)/singa-main.Tpo" "src/$(DEPDIR)/singa-main.Po"; else rm -f "src/$(DEPDIR)/singa-main.Tpo"; exit 1; fi http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5e111c3c/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 2d5aa06..66a2964 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,8 @@ SINGA is developed and tested on Linux platforms with the following external lib * czmq version >= 3 + * zookeeper version >= 3.4.6 + Tips: For libraries like openblas, opencv, older versions may also work, because we do not use any newly added features. @@ -53,23 +55,19 @@ If you want to specify your own installation directory, use the following comman The result of configure script will indicate you whether there exist dependency missings in your system. If you do not install the dependencies, you can run the following commands. -To download the thirdparty dependencies: - - $ ./script/download.sh - -After downloading, to install the thirdparty dependencies: +To download & install the thirdparty dependencies: $ cd thirdparty - $ ./install-dependencies.sh MISSING_LIBRARY_NAME1 YOUR_INSTALL_PATH1 MISSING_LIBRARY_NAME2 YOUR_INSTALL_PATH2 ... + $ ./install.sh MISSING_LIBRARY_NAME1 YOUR_INSTALL_PATH1 MISSING_LIBRARY_NAME2 YOUR_INSTALL_PATH2 ... If you do not specify the installation path, the library will be installed in default folder. For example, if you want to build zeromq library in system folder and gflags in /usr/local, just run: - $ ./install-dependencies.sh zeromq gflags /usr/local + $ ./install.sh zeromq gflags /usr/local Another example can be to install all dependencies in /usr/local directory: - $ ./install-dependencies.sh all /usr/local + $ ./install.sh all /usr/local Here is a table showing the first arguments: @@ -83,11 +81,12 @@ Here is a table showing the first arguments: opencv OpenCV protobuf Google protobuf zeromq zeromq lib + zookeeper Apache zookeeper *: Since czmq depends on zeromq, the script offers you one more argument to indicate zeromq location. The installation commands of czmq can be: - $ ./install-dependencies.sh czmq /usr/local /usr/local/zeromq + $ ./install.sh czmq /usr/local /usr/local/zeromq After the execution, czmq will be installed in /usr/local while zeromq is installed in /usr/local/zeromq. @@ -99,6 +98,7 @@ A1:You may install glog individually and try command : $ make CFLAGS='-stdlib=libstdc++' CXXFLAGS='stdlib=libstdc++' # + Q2:While compiling Singa, I get error "SSE2 instruction set not enabled" A2:You can try following command: http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/5e111c3c/config.h.in ---------------------------------------------------------------------- diff --git a/config.h.in b/config.h.in index b1330db..800fa92 100644 --- a/config.h.in +++ b/config.h.in @@ -102,9 +102,6 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME -/* Define to the home page for this package. */ -#undef PACKAGE_URL - /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -126,7 +123,7 @@ /* Define to rpl_malloc if the replacement function should be used. */ #undef malloc -/* Define to `unsigned int' if <sys/types.h> does not define. */ +/* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t /* Define to empty if the keyword `volatile' does not work. Warning: valid
