You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@singa.apache.org by zh...@apache.org on 2017/03/16 06:57:25 UTC
[1/3] incubator-singa git commit: SINGA-306 - Write the definition of
USE_GLOG into singa_config.h
Repository: incubator-singa
Updated Branches:
refs/heads/master 0695daa66 -> 0d4b97e0b
SINGA-306 - Write the definition of USE_GLOG into singa_config.h
add USE_GLOG into singa_config.h during building
let travis wait for longer time to install depdent libs
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/2247f111
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/2247f111
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/2247f111
Branch: refs/heads/master
Commit: 2247f11144c2c1edf8a3180efc3c82b1dda6f690
Parents: a6e7690
Author: Wei Wang <wa...@comp.nus.edu.sg>
Authored: Tue Mar 14 23:03:34 2017 +0800
Committer: wangwei <wa...@comp.nus.edu.sg>
Committed: Wed Mar 15 10:00:07 2017 +0800
----------------------------------------------------------------------
.travis.yml | 2 +-
cmake/Dependencies.cmake | 1 +
cmake/Templates/singa_config.h.in | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/2247f111/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 3c1fab4..eb9ff69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ matrix:
# - protobuf-compiler
install:
- - bash -ex tool/travis/depends.sh
+ - travis_wait bash -ex tool/travis/depends.sh
script:
- bash -ex tool/travis/build.sh
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/2247f111/cmake/Dependencies.cmake
----------------------------------------------------------------------
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index 708628b..a3cd4ff 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -69,6 +69,7 @@ FIND_PACKAGE(Glog)
IF(GLOG_FOUND)
#MESSAGE(STATUS "GLOG FOUND at ${GLOG_INCLUDE_DIR}")
ADD_DEFINITIONS("-DUSE_GLOG")
+ SET(USE_GLOG TRUE)
LIST(APPEND SINGA_LINKER_LIBS ${GLOG_LIBRARIES})
INCLUDE_DIRECTORIES(${GLOG_INCLUDE_DIR})
ENDIF()
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/2247f111/cmake/Templates/singa_config.h.in
----------------------------------------------------------------------
diff --git a/cmake/Templates/singa_config.h.in b/cmake/Templates/singa_config.h.in
index 24ee12d..e35230c 100644
--- a/cmake/Templates/singa_config.h.in
+++ b/cmake/Templates/singa_config.h.in
@@ -32,6 +32,8 @@
#cmakedefine USE_OPENCL
+#cmakedefine USE_GLOG
+
#cmakedefine ENABLE_DIST
// lmdb
[3/3] incubator-singa git commit: Merge branch 'SINGA-306'
Posted by zh...@apache.org.
Merge branch 'SINGA-306'
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/0d4b97e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/0d4b97e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/0d4b97e0
Branch: refs/heads/master
Commit: 0d4b97e0b0b65ccc7da72f541f1a58273d5f3bee
Parents: 0695daa d238042
Author: xiezl <xi...@comp.nus.edu.sg>
Authored: Thu Mar 16 14:56:38 2017 +0800
Committer: xiezl <xi...@comp.nus.edu.sg>
Committed: Thu Mar 16 14:56:38 2017 +0800
----------------------------------------------------------------------
.travis.yml | 2 +-
cmake/Dependencies.cmake | 3 ++-
cmake/Templates/singa_config.h.in | 2 ++
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-singa git commit: remove ADD_DEFINITION(DUSE_GLOG) in
Dependencies.cmake to avoid compilation warning
Posted by zh...@apache.org.
remove ADD_DEFINITION(DUSE_GLOG) in Dependencies.cmake to avoid compilation warning
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/d238042d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/d238042d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/d238042d
Branch: refs/heads/master
Commit: d238042df20efcfbfd60355a5030e6acaff02935
Parents: 2247f11
Author: wangwei <wa...@comp.nus.edu.sg>
Authored: Wed Mar 15 16:19:16 2017 +0800
Committer: wangwei <wa...@comp.nus.edu.sg>
Committed: Wed Mar 15 16:19:16 2017 +0800
----------------------------------------------------------------------
cmake/Dependencies.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/d238042d/cmake/Dependencies.cmake
----------------------------------------------------------------------
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index a3cd4ff..83c5187 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -68,7 +68,7 @@ ENDIF()
FIND_PACKAGE(Glog)
IF(GLOG_FOUND)
#MESSAGE(STATUS "GLOG FOUND at ${GLOG_INCLUDE_DIR}")
- ADD_DEFINITIONS("-DUSE_GLOG")
+ #ADD_DEFINITIONS("-DUSE_GLOG")
SET(USE_GLOG TRUE)
LIST(APPEND SINGA_LINKER_LIBS ${GLOG_LIBRARIES})
INCLUDE_DIRECTORIES(${GLOG_INCLUDE_DIR})