Return-Path: X-Original-To: apmail-singa-commits-archive@minotaur.apache.org Delivered-To: apmail-singa-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D453A17CBC for ; Wed, 24 Jun 2015 14:33:28 +0000 (UTC) Received: (qmail 39363 invoked by uid 500); 24 Jun 2015 14:33:28 -0000 Delivered-To: apmail-singa-commits-archive@singa.apache.org Received: (qmail 39346 invoked by uid 500); 24 Jun 2015 14:33:28 -0000 Mailing-List: contact commits-help@singa.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@singa.incubator.apache.org Delivered-To: mailing list commits@singa.incubator.apache.org Received: (qmail 39336 invoked by uid 99); 24 Jun 2015 14:33:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Jun 2015 14:33:28 +0000 X-ASF-Spam-Status: No, hits=-2001.4 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 24 Jun 2015 14:31:15 +0000 Received: (qmail 39007 invoked by uid 99); 24 Jun 2015 14:33:02 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Jun 2015 14:33:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 867A8E35EA; Wed, 24 Jun 2015 14:33:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wangwei@apache.org To: commits@singa.incubator.apache.org Date: Wed, 24 Jun 2015 14:33:04 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/10] incubator-singa git commit: Merge branch 'master' of https://github.com/apache/incubator-singa X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'master' of https://github.com/apache/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/8133ac5f Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/8133ac5f Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/8133ac5f Branch: refs/heads/master Commit: 8133ac5f75ed85c20faec541ed4958a2c737d5c3 Parents: 1c124e3 7d39f88 Author: xiezl Authored: Wed Jun 24 21:54:03 2015 +0800 Committer: xiezl Committed: Wed Jun 24 21:54:03 2015 +0800 ---------------------------------------------------------------------- Makefile.am | 26 +- Makefile.in | 1011 +- aclocal.m4 | 7371 +------ config.h.in | 9 +- config/config.guess | 615 +- config/config.sub | 434 +- config/depcomp | 637 +- config/install-sh | 538 +- config/ltmain.sh | 14884 +++++++------ config/missing | 453 +- configure | 32340 +++++++++++++--------------- examples/cifar10/Makefile | 20 - examples/cifar10/Makefile.example | 20 + examples/cifar10/cluster.conf | 1 + examples/cifar10/model-lmdb.conf | 218 - examples/cifar10/model-prefetch.conf | 241 - examples/cifar10/model.conf | 79 +- examples/mnist/Makefile.example | 22 + examples/mnist/cluster.conf | 4 +- examples/mnist/create_shard.cc | 17 +- examples/mnist/mlp-lmdb.conf | 223 - examples/mnist/mlp.conf | 221 - examples/mnist/model.conf | 224 + include/communication/msg.h | 33 +- include/communication/socket.h | 161 +- include/neuralnet/base_layer.h | 7 +- include/neuralnet/layer.h | 9 +- include/trainer/server.h | 20 +- include/trainer/trainer.h | 138 +- include/utils/blob.h | 2 +- include/utils/cluster.h | 13 +- include/utils/cluster_rt.h | 123 +- include/utils/common.h | 116 +- include/utils/data_shard.h | 99 +- include/utils/factory.h | 80 +- include/utils/param.h | 145 +- include/utils/singleton.h | 18 +- src/communication/msg.cc | 8 +- src/communication/socket.cc | 159 +- src/main.cc | 4 +- src/neuralnet/base_layer.cc | 13 +- src/neuralnet/layer.cc | 100 +- src/neuralnet/neuralnet.cc | 78 +- src/proto/cluster.proto | 47 +- src/proto/common.proto | 80 + src/proto/model.proto | 581 +- src/test/test_cluster.cc | 30 +- src/test/test_shard.cc | 64 + src/trainer/server.cc | 54 +- src/trainer/trainer.cc | 574 +- src/trainer/worker.cc | 31 +- src/utils/cluster.cc | 50 +- src/utils/cluster_rt.cc | 248 +- src/utils/common.cc | 54 +- src/utils/data_shard.cc | 308 +- src/utils/param.cc | 239 +- src/utils/updater.cc | 53 +- tool/cpplint.py | 12 +- 58 files changed, 28678 insertions(+), 34681 deletions(-) ----------------------------------------------------------------------