Merge branch 'pr367' into latest

Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/600f27ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/600f27ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/600f27ed

Branch: refs/heads/master
Commit: 600f27ede2bdf6cb6c1e502ec46bbf79f5bed243
Parents: 394d78d 3e2b75c
Author: Wang Wei <[email protected]>
Authored: Sun May 13 23:26:07 2018 +0800
Committer: Wang Wei <[email protected]>
Committed: Sun May 13 23:26:07 2018 +0800

----------------------------------------------------------------------
 include/singa/core/tensor.h        |  65 ++-
 src/core/tensor/tensor.cc          | 410 +++++++++------
 src/core/tensor/tensor_math.h      | 143 ++---
 src/core/tensor/tensor_math_cpp.h  | 817 +++++++++++++++++------------
 src/core/tensor/tensor_math_cuda.h | 898 +++++++++++++++++++++++++-------
 src/proto/core.proto               |  21 +-
 6 files changed, 1567 insertions(+), 787 deletions(-)
----------------------------------------------------------------------


Reply via email to