Merge branch 'master' of github.com:apache/incubator-singa into SINGA-341-351
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/a44d2e76 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/a44d2e76 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/a44d2e76 Branch: refs/heads/master Commit: a44d2e76b70a54e6ad1e063c0b8e895c43018b63 Parents: 75f9a0e b5600d3 Author: Vaan Ng <[email protected]> Authored: Fri May 11 15:29:56 2018 +0800 Committer: Vaan Ng <[email protected]> Committed: Fri May 11 15:29:56 2018 +0800 ---------------------------------------------------------------------- .gitignore | 1 + .travis.yml | 3 +- CMakeLists.txt | 14 +- cmake/Dependencies.cmake | 14 +- doc/_static/style.css | 3 + doc/_templates/layout.html | 2 +- doc/conf.py | 8 +- doc/en/community/team-list.rst | 2 +- doc/en/docs/install_macos1013.rst | 18 ++ doc/en/docs/install_win.rst | 178 +++++++++++++++++++ doc/en/docs/installation.md | 36 +--- doc/zh/community/issue-tracking.md | 9 + doc/zh/community/mail-lists.rst | 28 +++ doc/zh/community/source-repository.md | 22 +++ doc/zh/community/team-list.rst | 84 +++++++++ doc/zh/develop/contribute-code.md | 48 +++++ doc/zh/develop/how-contribute.md | 9 + doc/zh/develop/schedule.rst | 66 +++++++ doc/zh/docs.rst | 23 +++ doc/zh/downloads.md | 109 ++++++++++++ doc/zh/index.rst | 42 ++++- python/CMakeLists.txt | 10 +- python/setup.py.in | 2 +- python/singa/layer.py | 6 +- python/singa/net.py | 24 +-- python/singa/tensor.py | 135 ++++++++++++++ src/api/model_layer.i | 21 +++ src/core/device/opencl_func.h | 6 +- src/model/layer/cudnn_activation.cc | 13 -- src/model/layer/cudnn_convolution.cc | 13 +- src/model/layer/cudnn_pooling.cc | 8 - src/model/layer/cudnn_rnn.cc | 4 +- test/python/run.py | 11 +- test/python/test_tensor.py | 16 ++ tool/conda/README.md | 33 ++++ tool/conda/build.sh | 29 +-- tool/conda/meta.yaml | 9 +- tool/docker/README.md | 33 ++-- tool/docker/build.sh | 19 +- tool/docker/devel/Dockerfile | 36 ---- tool/docker/devel/conda/cuda/Dockerfile | 52 ++++++ tool/docker/devel/cuda/Dockerfile | 39 ---- tool/docker/devel/native/centos6/Dockerfile | 48 +++++ .../devel/native/ubuntu/cuda/py2/Dockerfile | 53 ++++++ .../devel/native/ubuntu/cuda/py3/Dockerfile | 54 ++++++ tool/docker/runtime/Dockerfile | 31 +++- tool/docker/runtime/cuda/Dockerfile | 31 ---- tool/jenkins/README.md | 97 +++++----- tool/jenkins/docker/devel/centos6/Dockerfile | 64 ------- tool/jenkins/docker/devel/ubuntu/Dockerfile | 70 -------- tool/jenkins/docker/runtime/Dockerfile | 51 ------ tool/jenkins/gen_doc.sh | 39 ++++ tool/jenkins/jenkins_doc.sh | 37 ---- tool/jenkins/jenkins_test.sh | 57 ------ tool/jenkins/test.sh | 63 +++++++ tool/opencl/clsrc_to_str.py | 4 +- tool/travis/build.sh | 40 +++-- tool/travis/conda.sh | 38 ---- tool/travis/depends.sh | 41 ++--- 59 files changed, 1369 insertions(+), 687 deletions(-) ----------------------------------------------------------------------
