Merge PR #319
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/b35e03f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/b35e03f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/b35e03f6 Branch: refs/heads/master Commit: b35e03f6f6ea8fa529c8c9ce25ae426b9e14e2b7 Parents: 38da789 f5cb70c Author: kaiping <kaip...@comp.nus.edu.sg> Authored: Tue Apr 11 19:51:54 2017 +0800 Committer: kaiping <kaip...@comp.nus.edu.sg> Committed: Tue Apr 11 19:51:54 2017 +0800 ---------------------------------------------------------------------- python/singa/optimizer.py | 8 ++- test/python/test_optimizer.py | 42 ++++++++++++ tool/conda/build.sh | 2 + tool/conda/meta.yaml | 6 +- tool/jenkins/README.md | 1 + tool/jenkins/docker/devel/Dockerfile | 67 -------------------- tool/jenkins/docker/devel/centos6/Dockerfile | 64 +++++++++++++++++++ .../jenkins/docker/devel/ubuntu14.04/Dockerfile | 67 ++++++++++++++++++++ 8 files changed, 186 insertions(+), 71 deletions(-) ----------------------------------------------------------------------
