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 15FBF18399 for ; Fri, 24 Jul 2015 12:14:24 +0000 (UTC) Received: (qmail 59360 invoked by uid 500); 24 Jul 2015 12:14:24 -0000 Delivered-To: apmail-singa-commits-archive@singa.apache.org Received: (qmail 59343 invoked by uid 500); 24 Jul 2015 12:14:24 -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 59334 invoked by uid 99); 24 Jul 2015 12:14:24 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jul 2015 12:14:23 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 9527618E592 for ; Fri, 24 Jul 2015 12:14:23 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id h7BiOLwWGfw6 for ; Fri, 24 Jul 2015 12:14:08 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 9292226405 for ; Fri, 24 Jul 2015 12:14:08 +0000 (UTC) Received: (qmail 59117 invoked by uid 99); 24 Jul 2015 12:14:08 -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; Fri, 24 Jul 2015 12:14:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3A1B9E0427; Fri, 24 Jul 2015 12:14:08 +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: Fri, 24 Jul 2015 12:14:10 -0000 Message-Id: <0686c5aba4424972965c031ae4b430de@git.apache.org> In-Reply-To: <34c1aaaad7484c899686d04adf8a9225@git.apache.org> References: <34c1aaaad7484c899686d04adf8a9225@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] incubator-singa git commit: Merge branch 'rbm' Merge branch 'rbm' Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/4c289744 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/4c289744 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/4c289744 Branch: refs/heads/master Commit: 4c289744d1216508cc7ee2dbed1fb489ae2ea5bc Parents: e8e592f 1b03a9b Author: Wei Wang Authored: Fri Jul 24 20:11:31 2015 +0800 Committer: Wei Wang Committed: Fri Jul 24 20:11:31 2015 +0800 ---------------------------------------------------------------------- examples/mnist/rbm_job.conf | 94 ++++++++++++++++++++ include/mshadow/tensor_random.h | 34 ++++++++ include/neuralnet/base_layer.h | 26 +++--- include/neuralnet/layer.h | 103 ++++++++++++++++++++++ include/trainer/worker.h | 13 +++ src/neuralnet/base_layer.cc | 8 +- src/neuralnet/layer.cc | 161 +++++++++++++++++++++++++++++++++++ src/neuralnet/neuralnet.cc | 3 + src/proto/job.proto | 19 +++++ src/trainer/trainer.cc | 2 +- src/trainer/worker.cc | 60 +++++++++++++ src/utils/graph.cc | 31 +++++-- src/utils/param.cc | 3 +- 13 files changed, 535 insertions(+), 22 deletions(-) ----------------------------------------------------------------------