You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@singa.apache.org by wa...@apache.org on 2015/06/16 09:26:25 UTC
[1/2] incubator-singa git commit: SINGA-13 Separate intermediate
files of compilation from source files Modify Makefile.am to support advanced
compilation. Add corresponding guidance in README.
Repository: incubator-singa
Updated Branches:
refs/heads/master 4df2bb5a8 -> d98c9efc6
SINGA-13 Separate intermediate files of compilation from source files
Modify Makefile.am to support advanced compilation. Add corresponding guidance in README.
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/a1e449e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/a1e449e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/a1e449e5
Branch: refs/heads/master
Commit: a1e449e54971bfd7eff0841890457675c5c5f5cf
Parents: 4df2bb5
Author: xiezl <xi...@comp.nus.edu.sg>
Authored: Tue Jun 16 14:23:00 2015 +0800
Committer: xiezl <xi...@comp.nus.edu.sg>
Committed: Tue Jun 16 14:23:00 2015 +0800
----------------------------------------------------------------------
Makefile.am | 9 +++++----
Makefile.in | 9 +++++----
README.md | 8 ++++++++
3 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/a1e449e5/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 8d1774a..e0df55e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
CLOCAL_AMFLAGS = -I config
+AUTOMAKE_OPTIONS = foreign subdir-objects
AM_CPPFLAGS = -I$(top_srcdir)/src
@@ -9,7 +10,7 @@ AC_CXXFLAGS = -O3 -Wall -pthread -fPIC -std=c++11 -Wno-unknown-pragmas \
INCLUDES=-I$(top_srcdir)/include
-PROTOS := src/proto/cluster.proto src/proto/model.proto
+PROTOS := $(top_srcdir)/src/proto/cluster.proto $(top_srcdir)/src/proto/model.proto
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
@@ -120,7 +121,7 @@ clean-local:
$(PROTO_HDRS) $(PROTO_SRCS): $(PROTOS)
- protoc --proto_path=src/proto --cpp_out=src/proto $(PROTOS)
- mkdir -p include/proto/
- cp src/proto/*.pb.h include/proto/
+ protoc --proto_path=$(top_srcdir)/src/proto --cpp_out=$(top_srcdir)/src/proto $(PROTOS)
+ mkdir -p $(top_srcdir)/include/proto/
+ cp $(top_srcdir)/src/proto/*.pb.h $(top_srcdir)/include/proto/
@echo
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/a1e449e5/Makefile.in
----------------------------------------------------------------------
diff --git a/Makefile.in b/Makefile.in
index 341343d..fa047b9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -230,13 +230,14 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
CLOCAL_AMFLAGS = -I config
+AUTOMAKE_OPTIONS = foreign subdir-objects
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
INCLUDES = -I$(top_srcdir)/include
-PROTOS := src/proto/cluster.proto src/proto/model.proto
+PROTOS := $(top_srcdir)/src/proto/cluster.proto $(top_srcdir)/src/proto/model.proto
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
@@ -1111,9 +1112,9 @@ clean-local:
rm -rf $(PROTO_SRCS) $(PROTO_HDRS)
$(PROTO_HDRS) $(PROTO_SRCS): $(PROTOS)
- protoc --proto_path=src/proto --cpp_out=src/proto $(PROTOS)
- mkdir -p include/proto/
- cp src/proto/*.pb.h include/proto/
+ protoc --proto_path=$(top_srcdir)/src/proto --cpp_out=$(top_srcdir)/src/proto $(PROTOS)
+ mkdir -p $(top_srcdir)/include/proto/
+ cp $(top_srcdir)/src/proto/*.pb.h $(top_srcdir)/include/proto/
@echo
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/a1e449e5/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 5effdb8..faa9893 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,14 @@ If you want to specify your own installation directory, use the following comman
$ ./configure --prefix=/YOUR/OWN/FOLDER
+Also, you can create your own build directory and run those commands. For example, please try:
+
+ $ cd SINGA/FOLDER
+ $ mkdir build && cd build
+ $ ../configure
+ $ make
+ $ make install
+
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 & install the thirdparty dependencies:
[2/2] incubator-singa git commit: SINGA-13 Separate intermediate
files of compilation from source files (optional)
Posted by wa...@apache.org.
SINGA-13 Separate intermediate files of compilation from source files (optional)
This patch enables developers to compile the source files into a separate folder by
mkdir build && cd build
../configure
make
The executable file (singa) is inside the build/ folder. Developers should manually copy it
into the bin/ folder to run the singa-run script.
The previous compilation flow is still supported, i.e., run ./configure in top folder directly.
Merge branch 'update-compile'
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/d98c9efc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/d98c9efc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/d98c9efc
Branch: refs/heads/master
Commit: d98c9efc6126206413b390d2e3998d57a75a6337
Parents: 4df2bb5 a1e449e
Author: wang wei <wa...@comp.nus.edu.sg>
Authored: Tue Jun 16 15:21:20 2015 +0800
Committer: wang wei <wa...@comp.nus.edu.sg>
Committed: Tue Jun 16 15:21:20 2015 +0800
----------------------------------------------------------------------
Makefile.am | 9 +++++----
Makefile.in | 9 +++++----
README.md | 8 ++++++++
3 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------