Skip to content

Commit

Permalink
add output information
Browse files Browse the repository at this point in the history
  • Loading branch information
xiezl committed May 7, 2015
1 parent e900cd4 commit 86977fb
Show file tree
Hide file tree
Showing 5 changed files with 192 additions and 191 deletions.
4 changes: 3 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ CLOCAL_AMFLAGS = -I config
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
$(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops

INCLUDES=-I$(top_srcdir)/include

Expand All @@ -30,6 +31,7 @@ SINGA_SRCS := src/utils/cluster.cc \
src/neuralnet/layer.cc \
src/communication/socket.cc \
src/communication/msg.cc

SINGA_HDRS := include/utils/cluster.h \
include/utils/param.h \
include/utils/common.h \
Expand Down
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ CLOCAL_AMFLAGS = -I config
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
$(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops

INCLUDES = -I$(top_srcdir)/include
PROTOS := src/proto/cluster.proto src/proto/model.proto
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@ Tips:
For libraries like openblas, opencv, older versions may also work, because we do not use any newly added features.



BUILDING SINGA SOFTWARE FROM SOURCES
BUILDING SINGA FROM SOURCES
=====
Build steps
-----
The build system of SINGA is based on GNU autotools.
The build system of SINGA is based on GNU autotools. To build singa, you need gcc version >= 4.8.
The common steps to build SINGA can be:

1.Extract source files;
Expand Down Expand Up @@ -65,7 +64,7 @@ To download the thirdparty dependencies:
After downloading, to install the thirdparty dependencies:

$ cd thirdparty
$ ./install-dependencies.sh MISSING_LIBRARY_NAME1 YOUR_INSTALL_PATH1 MISSING_LIBRARY_NAME2 YOUR_INSTALL_PATH2
$ ./install-dependencies.sh MISSING_LIBRARY_NAME1 YOUR_INSTALL_PATH1 MISSING_LIBRARY_NAME2 YOUR_INSTALL_PATH2 ...

If you do not specify the installation path, the lirary 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:
Expand Down
Loading

0 comments on commit 86977fb

Please sign in to comment.