Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-singa
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/6fa84e4b Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/6fa84e4b Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/6fa84e4b Branch: refs/heads/master Commit: 6fa84e4b4a56d4252a7c0aa1eb051894480c190b Parents: a6c1b8e b5600d3 Author: Moaz Reyad <[email protected]> Authored: Fri May 11 16:01:27 2018 +0800 Committer: Moaz Reyad <[email protected]> Committed: Fri May 11 16:01:27 2018 +0800 ---------------------------------------------------------------------- doc/_templates/layout.html | 2 +- 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 | 34 +------ doc/zh/community/team-list.rst | 4 +- doc/zh/index.rst | 2 +- src/core/device/opencl_func.h | 6 +- tool/docker/runtime/Dockerfile | 4 +- tool/opencl/clsrc_to_str.py | 4 +- 10 files changed, 212 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
