SINGA-72 Minor updates to be consisten with documentation Add OpenBLAS installation details to FAQ of README.md. Remove compiling flags (-O2, gdwarf-2, gstric-dwarf, -Woverloaded-virtual) that hinder debug.
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/243f2106 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/243f2106 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/243f2106 Branch: refs/heads/master Commit: 243f21061139b2934d7dac52645209f69f80eade Parents: 6bb1a8a Author: xiezl <[email protected]> Authored: Fri Sep 25 12:03:00 2015 +0800 Committer: Wei Wang <[email protected]> Committed: Sat Sep 26 23:23:45 2015 +0800 ---------------------------------------------------------------------- Makefile.am | 14 ++++++-------- README.md | 14 ++++++++++++++ configure.ac | 2 +- 3 files changed, 21 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/243f2106/Makefile.am ---------------------------------------------------------------------- diff --git a/Makefile.am b/Makefile.am index 6f3be4c..3f68e29 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,15 +1,15 @@ ACLOCAL_AMFLAGS = -I config AUTOMAKE_OPTIONS = foreign subdir-objects -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 DEFAULT_FLAGS = -Wall -pthread -fPIC -std=c++11 -Wno-unknown-pragmas \ $(MSHADOW_FLAGS) -DCPU_ONLY=1 -funroll-loops -DTHREADED -CFLAGS = -O2 $(DEBUG) -CXXFLAGS = -O2 $(DEBUG) -AC_CXXFLAGS = -O2 $(DEBUG) +CFLAGS = $(DEBUG) +CXXFLAGS = $(DEBUG) +AC_CXXFLAGS = $(DEBUG) INCLUDES = -I$(top_srcdir)/include @@ -101,8 +101,7 @@ bin_PROGRAMS = singa singatool $(PROGS) #lib_LTLIBRARIES = libsinga.la libsinga_la_SOURCES = $(PROTO_HDRS) $(PROTO_SRCS) $(SINGA_HDRS) $(SINGA_SRCS) -libsinga_la_CXXFLAGS = $(DEFAULT_FLAGS) -gdwarf-2 -msse3 \ - -gstrict-dwarf -Woverloaded-virtual -fpermissive +libsinga_la_CXXFLAGS = $(DEFAULT_FLAGS) -msse3 -fpermissive if LMDB libsinga_la_CXXFLAGS += -DUSE_LMDB endif @@ -138,8 +137,7 @@ singatool_LDFLAGS = -I./include \ #lib_LTLIBRARIES += libgtest.la libgtest_la_SOURCES = $(GTEST_HDRS) $(GTEST_SRCS) -libgtest_la_CXXFLAGS = $(DEFAULT_FLAGS) -gdwarf-2 -msse3 \ - -gstrict-dwarf -Woverloaded-virtual -fpermissive +libgtest_la_CXXFLAGS = $(DEFAULT_FLAGS) -msse3 -fpermissive if LMDB libgtest_la_CXXFLAGS += -DUSE_LMDB endif http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/243f2106/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 080f4f5..af903a9 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,8 @@ The current code depends on the following external libraries: * czmq (Mozilla Public License Version 2.0) * zookeeper (Apache 2.0) +To install openblas, you need a fortran compiler. + ##Documentation Full documentation is available online at [Official Documentation](https://singa.incubator.apache.org/docs/overview.html#). @@ -142,3 +144,15 @@ google.protobuf.internal when I try to import .py files. check it by $ java --version + +* Q8: When I build OpenBLAS from source, I am told that I need a fortran compiler. + + A8: Since OpenBLAS use fortran compiler to build the library, you need a compiler with fortran support. As an alternative, you can build OpenBLAS from system tools. For example, if you have APT, just run: + + $ sudo apt-get install openblas + + or you can also run the following command if you have yum: + + $ sudo yum install openblas-devel + + It is worth noting that you need root access to run the aforementioned commands. http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/243f2106/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 1ae5cec..65068ba 100644 --- a/configure.ac +++ b/configure.ac @@ -84,7 +84,7 @@ AM_CONDITIONAL(DEBUG, test "$enable_debug" = yes) if test x"$enable_debug" != x"no"; then DEBUG='-g' else - DEBUG='' + DEBUG='-O2' fi AC_SUBST([DEBUG])
