Merge branch 'pr358'
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/f73ae5a5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/f73ae5a5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/f73ae5a5 Branch: refs/heads/master Commit: f73ae5a5f73cbfebaa208aa269bfe0b9a6b4a1af Parents: 3a37398 bd774b5 Author: Chonho Lee <[email protected]> Authored: Fri May 4 23:50:14 2018 +0900 Committer: Chonho Lee <[email protected]> Committed: Fri May 4 23:50:14 2018 +0900 ---------------------------------------------------------------------- cmake/Dependencies.cmake | 2 +- python/singa/layer.py | 2 +- python/singa/optimizer.py | 16 ++++++++-------- src/api/model_layer.i | 21 +++++++++++++++++++++ tool/conda/build.sh | 5 +++-- 5 files changed, 34 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
