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 197CC18E0E for ; Wed, 17 Jun 2015 08:00:57 +0000 (UTC) Received: (qmail 50374 invoked by uid 500); 17 Jun 2015 08:00:57 -0000 Delivered-To: apmail-singa-commits-archive@singa.apache.org Received: (qmail 50357 invoked by uid 500); 17 Jun 2015 08:00:57 -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 50348 invoked by uid 99); 17 Jun 2015 08:00:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jun 2015 08:00:57 +0000 X-ASF-Spam-Status: No, hits=-2000.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, 17 Jun 2015 07:58:46 +0000 Received: (qmail 49273 invoked by uid 99); 17 Jun 2015 08:00:33 -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, 17 Jun 2015 08:00:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 16ABCE3C66; Wed, 17 Jun 2015 08:00:33 +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, 17 Jun 2015 08:00:34 -0000 Message-Id: <1baf6253b1de451389acbcf45737e761@git.apache.org> In-Reply-To: <5a69ca8560214a7e9c75816cfb88b1a9@git.apache.org> References: <5a69ca8560214a7e9c75816cfb88b1a9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] 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/017b0425 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/017b0425 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/017b0425 Branch: refs/heads/master Commit: 017b042508f451704a8c1b9c2e1cec6576a86d6c Parents: 24960c9 9d07f3c Author: wang sheng Authored: Wed Jun 17 14:07:33 2015 +0800 Committer: wang sheng Committed: Wed Jun 17 14:07:33 2015 +0800 ---------------------------------------------------------------------- examples/cifar10/cluster.conf | 4 ++-- include/neuralnet/base_layer.h | 26 +++++++++++++------------- include/neuralnet/layer.h | 26 +++++++++++++------------- include/trainer/worker.h | 2 +- src/neuralnet/base_layer.cc | 26 +++++++++++++------------- src/neuralnet/layer.cc | 32 ++++++++++++++++---------------- src/proto/model.proto | 2 ++ src/trainer/trainer.cc | 3 +-- src/trainer/worker.cc | 10 +++++----- 9 files changed, 66 insertions(+), 65 deletions(-) ----------------------------------------------------------------------