Repository: incubator-singa Updated Branches: refs/heads/dev 790b7b4cd -> dbc720d03
SINGA-221 Travis-CI configuration 1. Added language and compiler to .travis.yml. 2. Fixed CMakeLists.txt to not find cnmem when CUDA is turned off. 3. Modified README.md for Travis build status. 4. Edited src/CMakeLists to exclude generating Python protobufs 5. Added test_singa execution to travis. Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/dbc720d0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/dbc720d0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/dbc720d0 Branch: refs/heads/dev Commit: dbc720d03615b930f9d56cc30dfcb6fdf5e6291b Parents: 790b7b4 Author: Tan Li Boon <[email protected]> Authored: Thu Jul 7 15:47:27 2016 +0800 Committer: Tan Li Boon <[email protected]> Committed: Fri Jul 8 17:25:11 2016 +0800 ---------------------------------------------------------------------- .travis.yml | 18 ++++++++++++++++++ CMakeLists.txt | 6 ++++-- README.md | 2 ++ src/CMakeLists.txt | 5 ++++- 4 files changed, 28 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/dbc720d0/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..effde83 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,18 @@ +sudo: required +language: cpp +compiler: gcc +dist: trusty + +before_install: + - sudo apt-get -qq update + - sudo apt-get install -qq -y libopenblas-dev libgoogle-glog-dev libprotobuf-dev protobuf-compiler +#- sudo apt-get install -qq libgtest-dev + +before_script: + - mkdir build && cd build + - cmake .. -DUSE_CUDA=OFF -DUSE_CUDNN=OFF -DUSE_PYTHON=OFF + +script: + - make + - ./bin/test_singa --gtest_output=xml:./../gtest.xml + http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/dbc720d0/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index 9eac5ee..3eade27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,8 +39,10 @@ CONFIGURE_FILE ( SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) -ADD_SUBDIRECTORY(lib/cnmem) -LIST(APPEND SINGA_LINKER_LIBS cnmem) +IF (USE_CUDA) + ADD_SUBDIRECTORY(lib/cnmem) + LIST(APPEND SINGA_LINKER_LIBS cnmem) +ENDIF() ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(examples) http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/dbc720d0/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 8cbc603..890c161 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ #Apache SINGA +[](https://travis-ci.org/undisputed-seraphim/incubator-singa) + Distributed deep learning system This is the dev branch for V1.0, please refer to the master branch and the following links for V0.3. http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/dbc720d0/src/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 38ef6cc..aa3ab36 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,10 @@ # generate protobuf sources + FILE(GLOB proto_files proto/*.proto) protobuf_generate_cpp(proto_srcs proto_hdrs ${proto_files}) -protobuf_generate_python(proto_pys ${proto_files}) +IF (USE_PYTHON) + protobuf_generate_python(proto_pys ${proto_files}) +ENDIF() INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}/include") #message(STATUS "include: ${CMAKE_BINARY_DIR} ") #message(STATUS "srcs: ${proto_srcs}")
