Modified: incubator/singa/site/trunk/_static/singa.png URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/_static/singa.png?rev=1862313&r1=1862312&r2=1862313&view=diff ============================================================================== Binary files - no diff available.
Modified: incubator/singa/site/trunk/community/issue-tracking.html URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/community/issue-tracking.html?rev=1862313&r1=1862312&r2=1862313&view=diff ============================================================================== --- incubator/singa/site/trunk/community/issue-tracking.html (original) +++ incubator/singa/site/trunk/community/issue-tracking.html Sat Jun 29 14:42:24 2019 @@ -205,7 +205,7 @@ <p>SINGA uses <a class="reference external" href="https://www.atlassian.com/software/jira";>JIRA</a> a J2EE-based, issue tracking and project management application.</p> <p>Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.</p> <ul class="simple"> -<li>https://issues.apache.org/jira/browse/singa</li> +<li><p>https://issues.apache.org/jira/browse/singa</p></li> </ul> </div> Modified: incubator/singa/site/trunk/community/mail-lists.html URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/community/mail-lists.html?rev=1862313&r1=1862312&r2=1862313&view=diff ============================================================================== --- incubator/singa/site/trunk/community/mail-lists.html (original) +++ incubator/singa/site/trunk/community/mail-lists.html Sat Jun 29 14:42:24 2019 @@ -185,41 +185,41 @@ <div class="section" id="project-mailing-lists"> <h1>Project Mailing Lists<a class="headerlink" href="#project-mailing-lists" title="Permalink to this headline">¶</a></h1> <p>These are the mailing lists that have been established for this project. For each list, there is a subscribe, unsubscribe, and an archive link.</p> -<table border="1" class="docutils" id="id4"> +<table class="docutils align-center" id="id4"> <caption><span class="caption-text">Mailing Lists</span><a class="headerlink" href="#id4" title="Permalink to this table">¶</a></caption> <colgroup> -<col width="20%" /> -<col width="20%" /> -<col width="20%" /> -<col width="20%" /> -<col width="20%" /> +<col style="width: 20%" /> +<col style="width: 20%" /> +<col style="width: 20%" /> +<col style="width: 20%" /> +<col style="width: 20%" /> </colgroup> -<thead valign="bottom"> -<tr class="row-odd"><th class="head">Name</th> -<th class="head">Post</th> -<th class="head">Subscribe</th> -<th class="head">Unsubscribe</th> -<th class="head">Archive</th> +<thead> +<tr class="row-odd"><th class="head"><p>Name</p></th> +<th class="head"><p>Post</p></th> +<th class="head"><p>Subscribe</p></th> +<th class="head"><p>Unsubscribe</p></th> +<th class="head"><p>Archive</p></th> </tr> </thead> -<tbody valign="top"> -<tr class="row-even"><td>Development</td> -<td><a class="reference external" href="mailto:dev%40singa.incubator.apache.org";>dev<span>@</span>singa<span>.</span>incubator<span>.</span>apache<span>.</span>org</a></td> -<td><a class="reference external" href="mailto:dev-subscribe%40singa.incubator.apache.org";>Subscribe</a></td> -<td><a class="reference external" href="mailto:dev-unsubscribe%40singa.incubator.apache.org.";>Unsubscribe</a></td> -<td><a class="reference external" href="http://mail-archives.apache.org/mod_mbox/singa-dev/";>mail-archives.apache.org</a></td> +<tbody> +<tr class="row-even"><td><p>Development</p></td> +<td><p><a class="reference external" href="mailto:dev%40singa.incubator.apache.org";>dev<span>@</span>singa<span>.</span>incubator<span>.</span>apache<span>.</span>org</a></p></td> +<td><p><a class="reference external" href="mailto:dev-subscribe%40singa.incubator.apache.org";>Subscribe</a></p></td> +<td><p><a class="reference external" href="mailto:dev-unsubscribe%40singa.incubator.apache.org.";>Unsubscribe</a></p></td> +<td><p><a class="reference external" href="http://mail-archives.apache.org/mod_mbox/singa-dev/";>mail-archives.apache.org</a></p></td> </tr> -<tr class="row-odd"><td>Commits</td> -<td><a class="reference external" href="mailto:commits%40singa.incubator.apache.org";>commits<span>@</span>singa<span>.</span>incubator<span>.</span>apache<span>.</span>org</a></td> -<td><a class="reference external" href="mailto:commits-subscribe%40singa.incubator.apache.org";>Subscribe</a></td> -<td><a class="reference external" href="mailto:commits-unsubscribe%40singa.incubator.apache.org";>Unsubscribe</a></td> -<td><a class="reference external" href="http://mail-archives.apache.org/mod_mbox/singa-commits/";>mail-archives.apache.org</a></td> +<tr class="row-odd"><td><p>Commits</p></td> +<td><p><a class="reference external" href="mailto:commits%40singa.incubator.apache.org";>commits<span>@</span>singa<span>.</span>incubator<span>.</span>apache<span>.</span>org</a></p></td> +<td><p><a class="reference external" href="mailto:commits-subscribe%40singa.incubator.apache.org";>Subscribe</a></p></td> +<td><p><a class="reference external" href="mailto:commits-unsubscribe%40singa.incubator.apache.org";>Unsubscribe</a></p></td> +<td><p><a class="reference external" href="http://mail-archives.apache.org/mod_mbox/singa-commits/";>mail-archives.apache.org</a></p></td> </tr> -<tr class="row-even"><td>Security</td> -<td><a class="reference external" href="mailto:security%40singa.apache.org";>security<span>@</span>singa<span>.</span>apache<span>.</span>org</a></td> -<td>private</td> -<td>private</td> -<td>private</td> +<tr class="row-even"><td><p>Security</p></td> +<td><p><a class="reference external" href="mailto:security%40singa.apache.org";>security<span>@</span>singa<span>.</span>apache<span>.</span>org</a></p></td> +<td><p>private</p></td> +<td><p>private</p></td> +<td><p>private</p></td> </tr> </tbody> </table> Modified: incubator/singa/site/trunk/community/source-repository.html URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/community/source-repository.html?rev=1862313&r1=1862312&r2=1862313&view=diff ============================================================================== --- incubator/singa/site/trunk/community/source-repository.html (original) +++ incubator/singa/site/trunk/community/source-repository.html Sat Jun 29 14:42:24 2019 @@ -194,7 +194,7 @@ <h2>Web Access<a class="headerlink" href="#web-access" title="Permalink to this headline">¶</a></h2> <p>The following is a link to the online source repository.</p> <ul class="simple"> -<li><a class="reference external" href="https://gitbox.apache.org/repos/asf?p=incubator-singa.git";>https://gitbox.apache.org/repos/asf?p=incubator-singa.git</a></li> +<li><p><a class="reference external" href="https://gitbox.apache.org/repos/asf?p=incubator-singa.git";>https://gitbox.apache.org/repos/asf?p=incubator-singa.git</a></p></li> </ul> </div> <div class="section" id="contributors"> @@ -210,7 +210,7 @@ git rebase master <div class="section" id="committers"> <h2>Committers<a class="headerlink" href="#committers" title="Permalink to this headline">¶</a></h2> <ul class="simple"> -<li>To connect your Apache account with your Github account, Please follow the instructions on: <a class="reference external" href="https://gitbox.apache.org/setup/";>https://gitbox.apache.org/setup/</a>. After that you can directly merge PRs using GitHubâs UI.</li> +<li><p>To connect your Apache account with your Github account, Please follow the instructions on: <a class="reference external" href="https://gitbox.apache.org/setup/";>https://gitbox.apache.org/setup/</a>. After that you can directly merge PRs using GitHubâs UI.</p></li> </ul> <p>To merge pull request <a class="reference external" href="https://github.com/apache/incubator-singa/pull/xxx";>https://github.com/apache/incubator-singa/pull/xxx</a>, the following instructions should be executed,</p> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>git clone https://github.com/apache/incubator-singa.git @@ -223,7 +223,7 @@ git push asf master:master </pre></div> </div> <ul class="simple"> -<li>To migrate from git-wip-us.apache.org to Gitbox: If you already cloned the SINGA repository from the old repo <a class="reference external" href="https://git-wip-us.apache.org/repos/asf/incubator-singa.git";>https://git-wip-us.apache.org/repos/asf/incubator-singa.git</a>, you can update the master by:</li> +<li><p>To migrate from git-wip-us.apache.org to Gitbox: If you already cloned the SINGA repository from the old repo <a class="reference external" href="https://git-wip-us.apache.org/repos/asf/incubator-singa.git";>https://git-wip-us.apache.org/repos/asf/incubator-singa.git</a>, you can update the master by:</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>git remote set-url origin [email protected]/apache/singa.git </pre></div> Modified: incubator/singa/site/trunk/community/team-list.html URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/community/team-list.html?rev=1862313&r1=1862312&r2=1862313&view=diff ============================================================================== --- incubator/singa/site/trunk/community/team-list.html (original) +++ incubator/singa/site/trunk/community/team-list.html Sat Jun 29 14:42:24 2019 @@ -190,28 +190,28 @@ <p>A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.</p> <div class="section" id="mentors"> <h2>Mentors<a class="headerlink" href="#mentors" title="Permalink to this headline">¶</a></h2> -<table border="1" class="docutils"> +<table class="docutils align-center"> <colgroup> -<col width="49%" /> -<col width="51%" /> +<col style="width: 49%" /> +<col style="width: 51%" /> </colgroup> -<thead valign="bottom"> -<tr class="row-odd"><th class="head">Name</th> -<th class="head">Email</th> +<thead> +<tr class="row-odd"><th class="head"><p>Name</p></th> +<th class="head"><p>Email</p></th> </tr> </thead> -<tbody valign="top"> -<tr class="row-even"><td>Daniel Dai</td> -<td><a class="reference external" href="mailto:daijy%40apache.org";>daijy<span>@</span>apache<span>.</span>org</a></td> +<tbody> +<tr class="row-even"><td><p>Daniel Dai</p></td> +<td><p><a class="reference external" href="mailto:daijy%40apache.org";>daijy<span>@</span>apache<span>.</span>org</a></p></td> </tr> -<tr class="row-odd"><td>Ted Dunning</td> -<td><a class="reference external" href="mailto:tdunning%40apache.org";>tdunning<span>@</span>apache<span>.</span>org</a></td> +<tr class="row-odd"><td><p>Ted Dunning</p></td> +<td><p><a class="reference external" href="mailto:tdunning%40apache.org";>tdunning<span>@</span>apache<span>.</span>org</a></p></td> </tr> -<tr class="row-even"><td>Alan Gates</td> -<td><a class="reference external" href="mailto:gates%40apache.org";>gates<span>@</span>apache<span>.</span>org</a></td> +<tr class="row-even"><td><p>Alan Gates</p></td> +<td><p><a class="reference external" href="mailto:gates%40apache.org";>gates<span>@</span>apache<span>.</span>org</a></p></td> </tr> -<tr class="row-odd"><td>Thejas Nair</td> -<td><a class="reference external" href="mailto:thejas%40apache.org";>thejas<span>@</span>apache<span>.</span>org</a></td> +<tr class="row-odd"><td><p>Thejas Nair</p></td> +<td><p><a class="reference external" href="mailto:thejas%40apache.org";>thejas<span>@</span>apache<span>.</span>org</a></p></td> </tr> </tbody> </table> @@ -219,98 +219,98 @@ <div class="section" id="developers"> <h2>Developers<a class="headerlink" href="#developers" title="Permalink to this headline">¶</a></h2> <p>The SINGA community has developers mainly from National University of Singapore, Zhejiang University, NetEase, Osaka University, yzBigData, etc.</p> -<table border="1" class="docutils"> +<table class="docutils align-center"> <colgroup> -<col width="20%" /> -<col width="32%" /> -<col width="47%" /> +<col style="width: 20%" /> +<col style="width: 32%" /> +<col style="width: 47%" /> </colgroup> -<thead valign="bottom"> -<tr class="row-odd"><th class="head">Name</th> -<th class="head">Email</th> -<th class="head">Organization</th> +<thead> +<tr class="row-odd"><th class="head"><p>Name</p></th> +<th class="head"><p>Email</p></th> +<th class="head"><p>Organization</p></th> </tr> </thead> -<tbody valign="top"> -<tr class="row-even"><td>Gang Chen</td> -<td><a class="reference external" href="mailto:cg%40zju.edu.cn";>cg<span>@</span>zju<span>.</span>edu<span>.</span>cn</a></td> -<td>Zhejiang University</td> -</tr> -<tr class="row-odd"><td>Haibo Chen</td> -<td><a class="reference external" href="mailto:hzchenhaibo%40corp.netease.com";>hzchenhaibo<span>@</span>corp<span>.</span>netease<span>.</span>com</a></td> -<td>NetEase</td> -</tr> -<tr class="row-even"><td>Anh Dinh</td> -<td><a class="reference external" href="mailto:dinhtta%40apache.org";>dinhtta<span>@</span>apache<span>.</span>org</a></td> -<td>National University of Singapore</td> -</tr> -<tr class="row-odd"><td>Jinyang Gao</td> -<td><a class="reference external" href="mailto:jinyang%40apache.org";>jinyang<span>@</span>apache<span>.</span>org</a></td> -<td>National University of Singapore</td> -</tr> -<tr class="row-even"><td>Xin Ji</td> -<td><a class="reference external" href="mailto:jixin%40comp.nus.edu.sg";>jixin<span>@</span>comp<span>.</span>nus<span>.</span>edu<span>.</span>sg</a></td> -<td>National University of Singapore</td> -</tr> -<tr class="row-odd"><td>Chonho Lee</td> -<td><a class="reference external" href="mailto:chonho%40gmail.com";>chonho<span>@</span>gmail<span>.</span>com</a></td> -<td>Osaka University</td> -</tr> -<tr class="row-even"><td>Zhaojing Luo</td> -<td><a class="reference external" href="mailto:zhaojing%40apache.org";>zhaojing<span>@</span>apache<span>.</span>org</a></td> -<td>National University of Singapore</td> -</tr> -<tr class="row-odd"><td>Beng Chin Ooi</td> -<td><a class="reference external" href="mailto:ooibc%40comp.nus.edu.sg";>ooibc<span>@</span>comp<span>.</span>nus<span>.</span>edu<span>.</span>sg</a></td> -<td>National University of Singapore</td> -</tr> -<tr class="row-even"><td>Kian-Lee Tan</td> -<td><a class="reference external" href="mailto:tankl%40apache.org";>tankl<span>@</span>apache<span>.</span>org</a></td> -<td>National University of Singapore</td> -</tr> -<tr class="row-odd"><td>Anthony K. H. Tung</td> -<td><a class="reference external" href="mailto:atung%40comp.nus.edu.sg";>atung<span>@</span>comp<span>.</span>nus<span>.</span>edu<span>.</span>sg</a></td> -<td>National University of Singapore</td> -</tr> -<tr class="row-even"><td>Ji Wang</td> -<td><a class="reference external" href="mailto:wangji%40comp.nus.edu.sg";>wangji<span>@</span>comp<span>.</span>nus<span>.</span>edu<span>.</span>sg</a></td> -<td>National University of Singapore</td> -</tr> -<tr class="row-odd"><td>Sheng Wang</td> -<td><a class="reference external" href="mailto:wangsh%40apache.org";>wangsh<span>@</span>apache<span>.</span>org</a></td> -<td>National University of Singapore</td> -</tr> -<tr class="row-even"><td>Wei Wang</td> -<td><a class="reference external" href="mailto:wangwei%40apache.org";>wangwei<span>@</span>apache<span>.</span>org</a></td> -<td>National University of Singapore</td> -</tr> -<tr class="row-odd"><td>Yuan Wang</td> -<td><a class="reference external" href="mailto:wangyuan%40corp.netease.com";>wangyuan<span>@</span>corp<span>.</span>netease<span>.</span>com</a></td> -<td>NetEase</td> -</tr> -<tr class="row-even"><td>Wenfeng Wu</td> -<td><a class="reference external" href="mailto:wuwf%40comp.nus.edu.sg";>wuwf<span>@</span>comp<span>.</span>nus<span>.</span>edu<span>.</span>sg</a></td> -<td>National University of Singapore</td> -</tr> -<tr class="row-odd"><td>Zhongle Xie</td> -<td><a class="reference external" href="mailto:zhongle%40apache.org";>zhongle<span>@</span>apache<span>.</span>org</a></td> -<td>National University of Singapore</td> -</tr> -<tr class="row-even"><td>Meihui Zhang</td> -<td><a class="reference external" href="mailto:meihui_zhang%40sutd.edu.sg";>meihui_zhang<span>@</span>sutd<span>.</span>edu<span>.</span>sg</a></td> -<td>Singapore University of Technology and Design</td> -</tr> -<tr class="row-odd"><td>Kaiping Zheng</td> -<td><a class="reference external" href="mailto:kaiping%40apache.org";>kaiping<span>@</span>apache<span>.</span>org</a></td> -<td>National University of Singapore</td> -</tr> -<tr class="row-even"><td>Moaz Reyad</td> -<td><a class="reference external" href="mailto:moaz%40apache.org";>moaz<span>@</span>apache<span>.</span>org</a></td> -<td>University of Genoa</td> -</tr> -<tr class="row-odd"><td>Chang Yao</td> -<td><a class="reference external" href="mailto:yaochang2009%40gmail.com";>yaochang2009<span>@</span>gmail<span>.</span>com</a></td> -<td>yzBigdata</td> +<tbody> +<tr class="row-even"><td><p>Gang Chen</p></td> +<td><p><a class="reference external" href="mailto:cg%40zju.edu.cn";>cg<span>@</span>zju<span>.</span>edu<span>.</span>cn</a></p></td> +<td><p>Zhejiang University</p></td> +</tr> +<tr class="row-odd"><td><p>Haibo Chen</p></td> +<td><p><a class="reference external" href="mailto:hzchenhaibo%40corp.netease.com";>hzchenhaibo<span>@</span>corp<span>.</span>netease<span>.</span>com</a></p></td> +<td><p>NetEase</p></td> +</tr> +<tr class="row-even"><td><p>Anh Dinh</p></td> +<td><p><a class="reference external" href="mailto:dinhtta%40apache.org";>dinhtta<span>@</span>apache<span>.</span>org</a></p></td> +<td><p>National University of Singapore</p></td> +</tr> +<tr class="row-odd"><td><p>Jinyang Gao</p></td> +<td><p><a class="reference external" href="mailto:jinyang%40apache.org";>jinyang<span>@</span>apache<span>.</span>org</a></p></td> +<td><p>National University of Singapore</p></td> +</tr> +<tr class="row-even"><td><p>Xin Ji</p></td> +<td><p><a class="reference external" href="mailto:jixin%40comp.nus.edu.sg";>jixin<span>@</span>comp<span>.</span>nus<span>.</span>edu<span>.</span>sg</a></p></td> +<td><p>National University of Singapore</p></td> +</tr> +<tr class="row-odd"><td><p>Chonho Lee</p></td> +<td><p><a class="reference external" href="mailto:chonho%40gmail.com";>chonho<span>@</span>gmail<span>.</span>com</a></p></td> +<td><p>Osaka University</p></td> +</tr> +<tr class="row-even"><td><p>Zhaojing Luo</p></td> +<td><p><a class="reference external" href="mailto:zhaojing%40apache.org";>zhaojing<span>@</span>apache<span>.</span>org</a></p></td> +<td><p>National University of Singapore</p></td> +</tr> +<tr class="row-odd"><td><p>Beng Chin Ooi</p></td> +<td><p><a class="reference external" href="mailto:ooibc%40comp.nus.edu.sg";>ooibc<span>@</span>comp<span>.</span>nus<span>.</span>edu<span>.</span>sg</a></p></td> +<td><p>National University of Singapore</p></td> +</tr> +<tr class="row-even"><td><p>Kian-Lee Tan</p></td> +<td><p><a class="reference external" href="mailto:tankl%40apache.org";>tankl<span>@</span>apache<span>.</span>org</a></p></td> +<td><p>National University of Singapore</p></td> +</tr> +<tr class="row-odd"><td><p>Anthony K. H. Tung</p></td> +<td><p><a class="reference external" href="mailto:atung%40comp.nus.edu.sg";>atung<span>@</span>comp<span>.</span>nus<span>.</span>edu<span>.</span>sg</a></p></td> +<td><p>National University of Singapore</p></td> +</tr> +<tr class="row-even"><td><p>Ji Wang</p></td> +<td><p><a class="reference external" href="mailto:wangji%40comp.nus.edu.sg";>wangji<span>@</span>comp<span>.</span>nus<span>.</span>edu<span>.</span>sg</a></p></td> +<td><p>National University of Singapore</p></td> +</tr> +<tr class="row-odd"><td><p>Sheng Wang</p></td> +<td><p><a class="reference external" href="mailto:wangsh%40apache.org";>wangsh<span>@</span>apache<span>.</span>org</a></p></td> +<td><p>National University of Singapore</p></td> +</tr> +<tr class="row-even"><td><p>Wei Wang</p></td> +<td><p><a class="reference external" href="mailto:wangwei%40apache.org";>wangwei<span>@</span>apache<span>.</span>org</a></p></td> +<td><p>National University of Singapore</p></td> +</tr> +<tr class="row-odd"><td><p>Yuan Wang</p></td> +<td><p><a class="reference external" href="mailto:wangyuan%40corp.netease.com";>wangyuan<span>@</span>corp<span>.</span>netease<span>.</span>com</a></p></td> +<td><p>NetEase</p></td> +</tr> +<tr class="row-even"><td><p>Wenfeng Wu</p></td> +<td><p><a class="reference external" href="mailto:wuwf%40comp.nus.edu.sg";>wuwf<span>@</span>comp<span>.</span>nus<span>.</span>edu<span>.</span>sg</a></p></td> +<td><p>National University of Singapore</p></td> +</tr> +<tr class="row-odd"><td><p>Zhongle Xie</p></td> +<td><p><a class="reference external" href="mailto:zhongle%40apache.org";>zhongle<span>@</span>apache<span>.</span>org</a></p></td> +<td><p>National University of Singapore</p></td> +</tr> +<tr class="row-even"><td><p>Meihui Zhang</p></td> +<td><p><a class="reference external" href="mailto:meihui_zhang%40sutd.edu.sg";>meihui_zhang<span>@</span>sutd<span>.</span>edu<span>.</span>sg</a></p></td> +<td><p>Singapore University of Technology and Design</p></td> +</tr> +<tr class="row-odd"><td><p>Kaiping Zheng</p></td> +<td><p><a class="reference external" href="mailto:kaiping%40apache.org";>kaiping<span>@</span>apache<span>.</span>org</a></p></td> +<td><p>National University of Singapore</p></td> +</tr> +<tr class="row-even"><td><p>Moaz Reyad</p></td> +<td><p><a class="reference external" href="mailto:moaz%40apache.org";>moaz<span>@</span>apache<span>.</span>org</a></p></td> +<td><p>University of Genoa</p></td> +</tr> +<tr class="row-odd"><td><p>Chang Yao</p></td> +<td><p><a class="reference external" href="mailto:yaochang2009%40gmail.com";>yaochang2009<span>@</span>gmail<span>.</span>com</a></p></td> +<td><p>yzBigdata</p></td> </tr> </tbody> </table> Modified: incubator/singa/site/trunk/develop/contribute-code.html URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/develop/contribute-code.html?rev=1862313&r1=1862312&r2=1862313&view=diff ============================================================================== --- incubator/singa/site/trunk/develop/contribute-code.html (original) +++ incubator/singa/site/trunk/develop/contribute-code.html Sat Jun 29 14:42:24 2019 @@ -220,25 +220,25 @@ other high-level discussions (e.g., system design and features). Github pull requests are used for implementation discussions, e.g., code review and code merge.</p> <ul class="simple"> -<li>Provide a descriptive Title.</li> -<li>Write a detailed Description. For bug reports, this should ideally include a +<li><p>Provide a descriptive Title.</p></li> +<li><p>Write a detailed Description. For bug reports, this should ideally include a short reproduction of the problem. For new features, it may include a design -document.</li> -<li>Set <a class="reference external" href="https://cwiki.apache.org/confluence/display/SPARK/Contributing+to+Spark#ContributingtoSpark-JIRA";>required fields</a></li> +document.</p></li> +<li><p>Set <a class="reference external" href="https://cwiki.apache.org/confluence/display/SPARK/Contributing+to+Spark#ContributingtoSpark-JIRA";>required fields</a></p></li> </ul> </div> <div class="section" id="pull-request"> <h2>Pull Request<a class="headerlink" href="#pull-request" title="Permalink to this headline">¶</a></h2> <p>The work flow is</p> <ul class="simple"> -<li>Fork the <a class="reference external" href="https://github.com/apache/incubator-singa";>SINGA Github repository</a> to -your own Github account.</li> -<li>Clone your fork, create a new branch (e.g., feature-foo or fixbug-foo), +<li><p>Fork the <a class="reference external" href="https://github.com/apache/incubator-singa";>SINGA Github repository</a> to +your own Github account.</p></li> +<li><p>Clone your fork, create a new branch (e.g., feature-foo or fixbug-foo), work on it. After finishing your job, <a class="reference external" href="https://git-scm.com/book/en/v2/Git-Branching-Rebasing";>rebase</a> it to the current latest master and push commits to your own Github account (the new -branch).</li> -<li>Open a pull request against the master branch of apache/incubator-singa. +branch).</p></li> +<li><p>Open a pull request against the master branch of apache/incubator-singa. The PR title should be of the form SINGA-xxxx Title, where SINGA-xxxx is the relevant JIRA number, and Title may be the JIRAâs title or a more specific title describing the PR itself, for example, âSINGA-6 Implement thread-safe singletonâ. Detailed description can be copied from the JIRA. @@ -248,16 +248,16 @@ line-by-line annotation of who changed t the PR description to ping them immediately. Please state that the contribution is your original work and that you license the work to the project under the projectâs open source license. Further commits (e.g., bug fix) -to your new branch will be added to this pull request automatically by Github.</li> -<li>Wait for one committer to review the patch. If no conflicts, the committers will merge it with +to your new branch will be added to this pull request automatically by Github.</p></li> +<li><p>Wait for one committer to review the patch. If no conflicts, the committers will merge it with the master branch. The merge should a) not use rebase b) disable fast forward merge c) check the -commit message format and test the code/feature.</li> -<li>If there are too many small commit messages, you will be told to squash your commits into fewer meaningful +commit message format and test the code/feature.</p></li> +<li><p>If there are too many small commit messages, you will be told to squash your commits into fewer meaningful commits. If your commit message does not follow the format (i.e., SINGA-xxxx), you will be told to reword your commit message. Both changes can be done using interactive git rebase. Once you get the commits corrected, push them to you own github again. Your pull request will be automatically updated. For details, please refer to -<a class="reference external" href="https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request";>Rebase Pull Requests</a>.</li> +<a class="reference external" href="https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request";>Rebase Pull Requests</a>.</p></li> </ul> </div> </div> Modified: incubator/singa/site/trunk/develop/how-contribute.html URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/develop/how-contribute.html?rev=1862313&r1=1862312&r2=1862313&view=diff ============================================================================== --- incubator/singa/site/trunk/develop/how-contribute.html (original) +++ incubator/singa/site/trunk/develop/how-contribute.html Sat Jun 29 14:42:24 2019 @@ -203,11 +203,11 @@ <h1>How to Contribute to SINGA<a class="headerlink" href="#how-to-contribute-to-singa" title="Permalink to this headline">¶</a></h1> <p>As with any open source project, there are several ways you can help:</p> <ul class="simple"> -<li>Join the <a class="reference external" href="http://singa.apache.org/en/community/mail-lists.html";>mailing list</a> and answer other userâs questions.</li> -<li><a class="reference external" href="http://singa.apache.org/en/docs/installation.html";>Build SINGA</a> by yourself.</li> -<li>Report bugs, feature requests and other issues in the <a class="reference external" href="http://singa.apache.org/en/community/issue-tracking.html";>issue tracking</a> application.</li> -<li>Check SINGAâs <a class="reference external" href="http://singa.apache.org/en/develop/schedule.html";>development schedule</a> and <a class="reference external" href="http://singa.apache.org/en/develop/contribute-code.html";>contribute code</a> by providing patches.</li> -<li><a class="reference external" href="http://singa.apache.org/en/develop/contribute-docs.html";>Help with the documentation</a> by updating webpages that are lacking or unclear.</li> +<li><p>Join the <a class="reference external" href="http://singa.apache.org/en/community/mail-lists.html";>mailing list</a> and answer other userâs questions.</p></li> +<li><p><a class="reference external" href="http://singa.apache.org/en/docs/installation.html";>Build SINGA</a> by yourself.</p></li> +<li><p>Report bugs, feature requests and other issues in the <a class="reference external" href="http://singa.apache.org/en/community/issue-tracking.html";>issue tracking</a> application.</p></li> +<li><p>Check SINGAâs <a class="reference external" href="http://singa.apache.org/en/develop/schedule.html";>development schedule</a> and <a class="reference external" href="http://singa.apache.org/en/develop/contribute-code.html";>contribute code</a> by providing patches.</p></li> +<li><p><a class="reference external" href="http://singa.apache.org/en/develop/contribute-docs.html";>Help with the documentation</a> by updating webpages that are lacking or unclear.</p></li> </ul> </div> <div class="section" id="how-to-become-a-singa-committer"> Modified: incubator/singa/site/trunk/develop/how-to-release.html URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/develop/how-to-release.html?rev=1862313&r1=1862312&r2=1862313&view=diff ============================================================================== --- incubator/singa/site/trunk/develop/how-to-release.html (original) +++ incubator/singa/site/trunk/develop/how-to-release.html Sat Jun 29 14:42:24 2019 @@ -206,16 +206,15 @@ <div class="section" id="select-a-release-manager"> <h2>Select a release manager<a class="headerlink" href="#select-a-release-manager" title="Permalink to this headline">¶</a></h2> <p>The release manager (RM) is the coordinator for the release process. It is the RMâs signature (.asc) that is uploaded together with the release. The RM generates KEY (RSA 4096-bit) and uploads it to a public key server. The RM needs to get his key endorsed (signed) by other Apache user, to be connected to the web of trust. He should first ask the mentor to help signing his key. <a class="reference external" href="http://www.apache.org/dev/release-signing.html";>http://www.apache.org/dev/release-signing.html</a></p> -<dl class="docutils"> -<dt>Check:</dt> -<dd><ul class="first last simple"> -<li>The codebase does not include third-party code which is not compatible to APL</li> -<li>The dependencies are compatible with APL. GNU-like licenses are NOT compatible</li> -<li>All source files written by us MUST include the Apache license header: <a class="reference external" href="http://www.apache.org/legal/src-headers.html";>http://www.apache.org/legal/src-headers.html</a>. Thereâs a script in there which helps propagating the header to all files.</li> -<li>The build process is error-free.</li> -<li>Unit tests are included (as much as possible)</li> -<li>The Jupyter notebooks are working with the new release</li> -<li>The online documentation on the Apache website is up to date.</li> +<dl class="simple"> +<dt>Check:</dt><dd><ul class="simple"> +<li><p>The codebase does not include third-party code which is not compatible to APL</p></li> +<li><p>The dependencies are compatible with APL. GNU-like licenses are NOT compatible</p></li> +<li><p>All source files written by us MUST include the Apache license header: <a class="reference external" href="http://www.apache.org/legal/src-headers.html";>http://www.apache.org/legal/src-headers.html</a>. Thereâs a script in there which helps propagating the header to all files.</p></li> +<li><p>The build process is error-free.</p></li> +<li><p>Unit tests are included (as much as possible)</p></li> +<li><p>The Jupyter notebooks are working with the new release</p></li> +<li><p>The online documentation on the Apache website is up to date.</p></li> </ul> </dd> </dl> @@ -228,9 +227,9 @@ <h2>Prepare NOTICE file<a class="headerlink" href="#prepare-notice-file" title="Permalink to this headline">¶</a></h2> <blockquote> <div><ul class="simple"> -<li>Use this template: <a class="reference external" href="http://apache.org/legal/src-headers.html#notice";>http://apache.org/legal/src-headers.html#notice</a></li> -<li>If we include any third party code in the release package which is not APL, must state it at the end of the NOTICE file.</li> -<li>Example: <a class="reference external" href="http://apache.org/licenses/example-NOTICE.txt";>http://apache.org/licenses/example-NOTICE.txt</a></li> +<li><p>Use this template: <a class="reference external" href="http://apache.org/legal/src-headers.html#notice";>http://apache.org/legal/src-headers.html#notice</a></p></li> +<li><p>If we include any third party code in the release package which is not APL, must state it at the end of the NOTICE file.</p></li> +<li><p>Example: <a class="reference external" href="http://apache.org/licenses/example-NOTICE.txt";>http://apache.org/licenses/example-NOTICE.txt</a></p></li> </ul> </div></blockquote> </div> @@ -238,8 +237,8 @@ <h2>Prepare RELEASE_NOTES file<a class="headerlink" href="#prepare-release-notes-file" title="Permalink to this headline">¶</a></h2> <blockquote> <div><ul class="simple"> -<li>Introduction, Features, Bugs (link to JIRA), Changes (N/A for first erlease), Dependency list, Incompatibility issues.</li> -<li>Follow this example: <a class="reference external" href="http://commons.apache.org/proper/commons-digester/commons-digester-3.0/RELEASE-NOTES.txt";>http://commons.apache.org/proper/commons-digester/commons-digester-3.0/RELEASE-NOTES.txt</a></li> +<li><p>Introduction, Features, Bugs (link to JIRA), Changes (N/A for first erlease), Dependency list, Incompatibility issues.</p></li> +<li><p>Follow this example: <a class="reference external" href="http://commons.apache.org/proper/commons-digester/commons-digester-3.0/RELEASE-NOTES.txt";>http://commons.apache.org/proper/commons-digester/commons-digester-3.0/RELEASE-NOTES.txt</a></p></li> </ul> </div></blockquote> </div> @@ -247,9 +246,9 @@ <h2>Prepare README file<a class="headerlink" href="#prepare-readme-file" title="Permalink to this headline">¶</a></h2> <blockquote> <div><ul class="simple"> -<li>How to build, run test, run examples</li> -<li>List of dependencies.</li> -<li>Mail list, website, etc. Any information useful for user to start.</li> +<li><p>How to build, run test, run examples</p></li> +<li><p>List of dependencies.</p></li> +<li><p>Mail list, website, etc. Any information useful for user to start.</p></li> </ul> </div></blockquote> </div> @@ -257,35 +256,33 @@ <h2>Prepare DISCLAIMER file<a class="headerlink" href="#prepare-disclaimer-file" title="Permalink to this headline">¶</a></h2> <blockquote> <div><ul class="simple"> -<li>modify from <a class="reference external" href="http://incubator.apache.org/guides/branding.html#disclaimers";>http://incubator.apache.org/guides/branding.html#disclaimers</a></li> +<li><p>modify from <a class="reference external" href="http://incubator.apache.org/guides/branding.html#disclaimers";>http://incubator.apache.org/guides/branding.html#disclaimers</a></p></li> </ul> </div></blockquote> </div> <div class="section" id="package-the-release"> <h2>Package the release<a class="headerlink" href="#package-the-release" title="Permalink to this headline">¶</a></h2> -<dl class="docutils"> -<dt>The release should be packaged into <span class="classifier-delimiter">:</span> <span class="classifier">apache-singa-incubating-xx.xx.xx.tar.gz</span></dt> -<dd><ul class="first last simple"> -<li>src/</li> -<li>README</li> -<li>LICENSE</li> -<li>NOTICE</li> -<li>RELEASE_NOTES</li> -<li>DISCLAIMER</li> -<li>â¦</li> +<dl class="simple"> +<dt>The release should be packaged into<span class="classifier">apache-singa-incubating-xx.xx.xx.tar.gz</span></dt><dd><ul class="simple"> +<li><p>src/</p></li> +<li><p>README</p></li> +<li><p>LICENSE</p></li> +<li><p>NOTICE</p></li> +<li><p>RELEASE_NOTES</p></li> +<li><p>DISCLAIMER</p></li> +<li><p>â¦</p></li> </ul> </dd> </dl> </div> <div class="section" id="upload-the-release"> <h2>Upload the release<a class="headerlink" href="#upload-the-release" title="Permalink to this headline">¶</a></h2> -<dl class="docutils"> -<dt>The release is uploaded to the RMâs Apache page: people.apache.org/~ID/â¦</dt> -<dd><ul class="first last simple"> -<li>apache-singa-incubating-xx.xx.xx.tar.gz</li> -<li>KEY</li> -<li>XX.acs</li> -<li>XX.md5</li> +<dl class="simple"> +<dt>The release is uploaded to the RMâs Apache page: people.apache.org/~ID/â¦</dt><dd><ul class="simple"> +<li><p>apache-singa-incubating-xx.xx.xx.tar.gz</p></li> +<li><p>KEY</p></li> +<li><p>XX.acs</p></li> +<li><p>XX.md5</p></li> </ul> </dd> </dl> Modified: incubator/singa/site/trunk/develop/schedule.html URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/develop/schedule.html?rev=1862313&r1=1862312&r2=1862313&view=diff ============================================================================== --- incubator/singa/site/trunk/develop/schedule.html (original) +++ incubator/singa/site/trunk/develop/schedule.html Sat Jun 29 14:42:24 2019 @@ -184,182 +184,182 @@ <div class="section" id="development-schedule"> <h1>Development Schedule<a class="headerlink" href="#development-schedule" title="Permalink to this headline">¶</a></h1> -<table border="1" class="docutils"> +<table class="docutils align-center"> <colgroup> -<col width="33%" /> -<col width="33%" /> -<col width="33%" /> +<col style="width: 33%" /> +<col style="width: 33%" /> +<col style="width: 33%" /> </colgroup> -<thead valign="bottom"> -<tr class="row-odd"><th class="head">Release</th> -<th class="head">Module</th> -<th class="head">Feature</th> +<thead> +<tr class="row-odd"><th class="head"><p>Release</p></th> +<th class="head"><p>Module</p></th> +<th class="head"><p>Feature</p></th> </tr> </thead> -<tbody valign="top"> -<tr class="row-even"><td>v0.1 Sep 2015</td> -<td>Neural Network</td> -<td>Feed forward neural network, including CNN, MLP</td> -</tr> -<tr class="row-odd"><td> </td> -<td> </td> -<td>RBM-like model, including RBM</td> -</tr> -<tr class="row-even"><td> </td> -<td> </td> -<td>Recurrent neural network, including standard RNN</td> -</tr> -<tr class="row-odd"><td> </td> -<td>Architecture</td> -<td>One worker group on single node (with data partition)</td> -</tr> -<tr class="row-even"><td> </td> -<td> </td> -<td>Multi worker groups on single node using <a class="reference external" href="http://www.eecs.berkeley.edu/~brecht/papers/hogwildTR.pdf";>Hogwild</a></td> -</tr> -<tr class="row-odd"><td> </td> -<td> </td> -<td>Distributed Hogwild</td> -</tr> -<tr class="row-even"><td> </td> -<td> </td> -<td>Multi groups across nodes, like <a class="reference external" href="http://papers.nips.cc/paper/4687-large-scale-distributed-deep-networks";>Downpour</a></td> -</tr> -<tr class="row-odd"><td> </td> -<td> </td> -<td>All-Reduce training architecture like <a class="reference external" href="http://arxiv.org/abs/1501.02876";>DeepImage</a></td> -</tr> -<tr class="row-even"><td> </td> -<td> </td> -<td>Load-balance among servers</td> -</tr> -<tr class="row-odd"><td> </td> -<td>Failure recovery</td> -<td>Checkpoint and restore</td> -</tr> -<tr class="row-even"><td> </td> -<td>Tools</td> -<td>Installation with GNU auto Tools</td> -</tr> -<tr class="row-odd"><td>v0.2 Jan 2016</td> -<td>Neural Network</td> -<td>Feed forward neural network, including AlexNet, cuDNN layers,Tools</td> -</tr> -<tr class="row-even"><td> </td> -<td> </td> -<td>Recurrent neural network, including GRULayer and BPTT</td> -</tr> -<tr class="row-odd"><td> </td> -<td> </td> -<td>Model partition and hybrid partition</td> -</tr> -<tr class="row-even"><td> </td> -<td>Tools</td> -<td>Integration with Mesos for resource management</td> -</tr> -<tr class="row-odd"><td> </td> -<td> </td> -<td>Prepare Docker images for deployment</td> -</tr> -<tr class="row-even"><td> </td> -<td> </td> -<td>Visualization of neural net and debug information</td> -</tr> -<tr class="row-odd"><td> </td> -<td>Binding</td> -<td>Python binding for major components</td> -</tr> -<tr class="row-even"><td> </td> -<td>GPU</td> -<td>Single node with multiple GPUs</td> -</tr> -<tr class="row-odd"><td>v0.3 April 2016</td> -<td>GPU</td> -<td>Multiple nodes, each with multiple GPUs</td> -</tr> -<tr class="row-even"><td> </td> -<td> </td> -<td>Heterogeneous training using both GPU and CPU <a class="reference external" href="http://arxiv.org/abs/1504.04343";>CcT</a></td> -</tr> -<tr class="row-odd"><td> </td> -<td> </td> -<td>Support cuDNN v4</td> -</tr> -<tr class="row-even"><td> </td> -<td>Installation</td> -<td>Remove dependency on ZeroMQ, CZMQ, Zookeeper for single node training</td> -</tr> -<tr class="row-odd"><td> </td> -<td>Updater</td> -<td>Add new SGD updaters including Adam, AdamMax and AdaDelta</td> -</tr> -<tr class="row-even"><td> </td> -<td>Binding</td> -<td>Enhance Python binding for training</td> -</tr> -<tr class="row-odd"><td>v1.0 Sep 2016</td> -<td>Programming abstraction</td> -<td>Tensor with linear algebra, neural net and random operations</td> -</tr> -<tr class="row-even"><td> </td> -<td> </td> -<td>Updater for distributed parameter updating</td> -</tr> -<tr class="row-odd"><td> </td> -<td>Hardware</td> -<td>Use Cuda and Cudnn for Nvidia GPU</td> -</tr> -<tr class="row-even"><td> </td> -<td> </td> -<td>Use OpenCL for AMD GPU or other devices</td> -</tr> -<tr class="row-odd"><td> </td> -<td>Cross-platform</td> -<td>To extend from Linux to MacOS</td> -</tr> -<tr class="row-even"><td> </td> -<td> </td> -<td>Large image models, e.g., <a class="reference external" href="https://arxiv.org/pdf/1409.1556.pdf";>VGG</a> and <a class="reference external" href="http://arxiv.org/abs/1512.03385";>Residual Net</a></td> -</tr> -<tr class="row-odd"><td>v1.1 Jan 2017</td> -<td>Model Zoo</td> -<td>GoogleNet; Health-care models</td> -</tr> -<tr class="row-even"><td> </td> -<td>Caffe converter</td> -<td>Use SINGA to train models configured in caffe proto files</td> -</tr> -<tr class="row-odd"><td> </td> -<td>Model components</td> -<td>Add concat and slice layers; accept multiple inputs to the net</td> -</tr> -<tr class="row-even"><td> </td> -<td>Compilation and installation</td> -<td>Windows suppport</td> -</tr> -<tr class="row-odd"><td> </td> -<td> </td> -<td>Simplify the installation by compiling protobuf and openblas together with SINGA</td> -</tr> -<tr class="row-even"><td> </td> -<td> </td> -<td>Build python wheel automatically using Jenkins</td> -</tr> -<tr class="row-odd"><td> </td> -<td> </td> -<td>Install SINGA from Debian packages</td> -</tr> -<tr class="row-even"><td>v1.2 June 2018</td> -<td>AutoGrad</td> -<td>AutoGrad for BP</td> -</tr> -<tr class="row-odd"><td> </td> -<td>Python 3</td> -<td>Support Python 3 for PySinga</td> -</tr> -<tr class="row-even"><td> </td> -<td>Models</td> -<td>Add popular models, including VGG, ResNet, DenseNet, InceptionNet</td> +<tbody> +<tr class="row-even"><td><p>v0.1 Sep 2015</p></td> +<td><p>Neural Network</p></td> +<td><p>Feed forward neural network, including CNN, MLP</p></td> +</tr> +<tr class="row-odd"><td></td> +<td></td> +<td><p>RBM-like model, including RBM</p></td> +</tr> +<tr class="row-even"><td></td> +<td></td> +<td><p>Recurrent neural network, including standard RNN</p></td> +</tr> +<tr class="row-odd"><td></td> +<td><p>Architecture</p></td> +<td><p>One worker group on single node (with data partition)</p></td> +</tr> +<tr class="row-even"><td></td> +<td></td> +<td><p>Multi worker groups on single node using <a class="reference external" href="http://www.eecs.berkeley.edu/~brecht/papers/hogwildTR.pdf";>Hogwild</a></p></td> +</tr> +<tr class="row-odd"><td></td> +<td></td> +<td><p>Distributed Hogwild</p></td> +</tr> +<tr class="row-even"><td></td> +<td></td> +<td><p>Multi groups across nodes, like <a class="reference external" href="http://papers.nips.cc/paper/4687-large-scale-distributed-deep-networks";>Downpour</a></p></td> +</tr> +<tr class="row-odd"><td></td> +<td></td> +<td><p>All-Reduce training architecture like <a class="reference external" href="http://arxiv.org/abs/1501.02876";>DeepImage</a></p></td> +</tr> +<tr class="row-even"><td></td> +<td></td> +<td><p>Load-balance among servers</p></td> +</tr> +<tr class="row-odd"><td></td> +<td><p>Failure recovery</p></td> +<td><p>Checkpoint and restore</p></td> +</tr> +<tr class="row-even"><td></td> +<td><p>Tools</p></td> +<td><p>Installation with GNU auto Tools</p></td> +</tr> +<tr class="row-odd"><td><p>v0.2 Jan 2016</p></td> +<td><p>Neural Network</p></td> +<td><p>Feed forward neural network, including AlexNet, cuDNN layers,Tools</p></td> +</tr> +<tr class="row-even"><td></td> +<td></td> +<td><p>Recurrent neural network, including GRULayer and BPTT</p></td> +</tr> +<tr class="row-odd"><td></td> +<td></td> +<td><p>Model partition and hybrid partition</p></td> +</tr> +<tr class="row-even"><td></td> +<td><p>Tools</p></td> +<td><p>Integration with Mesos for resource management</p></td> +</tr> +<tr class="row-odd"><td></td> +<td></td> +<td><p>Prepare Docker images for deployment</p></td> +</tr> +<tr class="row-even"><td></td> +<td></td> +<td><p>Visualization of neural net and debug information</p></td> +</tr> +<tr class="row-odd"><td></td> +<td><p>Binding</p></td> +<td><p>Python binding for major components</p></td> +</tr> +<tr class="row-even"><td></td> +<td><p>GPU</p></td> +<td><p>Single node with multiple GPUs</p></td> +</tr> +<tr class="row-odd"><td><p>v0.3 April 2016</p></td> +<td><p>GPU</p></td> +<td><p>Multiple nodes, each with multiple GPUs</p></td> +</tr> +<tr class="row-even"><td></td> +<td></td> +<td><p>Heterogeneous training using both GPU and CPU <a class="reference external" href="http://arxiv.org/abs/1504.04343";>CcT</a></p></td> +</tr> +<tr class="row-odd"><td></td> +<td></td> +<td><p>Support cuDNN v4</p></td> +</tr> +<tr class="row-even"><td></td> +<td><p>Installation</p></td> +<td><p>Remove dependency on ZeroMQ, CZMQ, Zookeeper for single node training</p></td> +</tr> +<tr class="row-odd"><td></td> +<td><p>Updater</p></td> +<td><p>Add new SGD updaters including Adam, AdamMax and AdaDelta</p></td> +</tr> +<tr class="row-even"><td></td> +<td><p>Binding</p></td> +<td><p>Enhance Python binding for training</p></td> +</tr> +<tr class="row-odd"><td><p>v1.0 Sep 2016</p></td> +<td><p>Programming abstraction</p></td> +<td><p>Tensor with linear algebra, neural net and random operations</p></td> +</tr> +<tr class="row-even"><td></td> +<td></td> +<td><p>Updater for distributed parameter updating</p></td> +</tr> +<tr class="row-odd"><td></td> +<td><p>Hardware</p></td> +<td><p>Use Cuda and Cudnn for Nvidia GPU</p></td> +</tr> +<tr class="row-even"><td></td> +<td></td> +<td><p>Use OpenCL for AMD GPU or other devices</p></td> +</tr> +<tr class="row-odd"><td></td> +<td><p>Cross-platform</p></td> +<td><p>To extend from Linux to MacOS</p></td> +</tr> +<tr class="row-even"><td></td> +<td></td> +<td><p>Large image models, e.g., <a class="reference external" href="https://arxiv.org/pdf/1409.1556.pdf";>VGG</a> and <a class="reference external" href="http://arxiv.org/abs/1512.03385";>Residual Net</a></p></td> +</tr> +<tr class="row-odd"><td><p>v1.1 Jan 2017</p></td> +<td><p>Model Zoo</p></td> +<td><p>GoogleNet; Health-care models</p></td> +</tr> +<tr class="row-even"><td></td> +<td><p>Caffe converter</p></td> +<td><p>Use SINGA to train models configured in caffe proto files</p></td> +</tr> +<tr class="row-odd"><td></td> +<td><p>Model components</p></td> +<td><p>Add concat and slice layers; accept multiple inputs to the net</p></td> +</tr> +<tr class="row-even"><td></td> +<td><p>Compilation and installation</p></td> +<td><p>Windows suppport</p></td> +</tr> +<tr class="row-odd"><td></td> +<td></td> +<td><p>Simplify the installation by compiling protobuf and openblas together with SINGA</p></td> +</tr> +<tr class="row-even"><td></td> +<td></td> +<td><p>Build python wheel automatically using Jenkins</p></td> +</tr> +<tr class="row-odd"><td></td> +<td></td> +<td><p>Install SINGA from Debian packages</p></td> +</tr> +<tr class="row-even"><td><p>v1.2 June 2018</p></td> +<td><p>AutoGrad</p></td> +<td><p>AutoGrad for BP</p></td> +</tr> +<tr class="row-odd"><td></td> +<td><p>Python 3</p></td> +<td><p>Support Python 3 for PySinga</p></td> +</tr> +<tr class="row-even"><td></td> +<td><p>Models</p></td> +<td><p>Add popular models, including VGG, ResNet, DenseNet, InceptionNet</p></td> </tr> </tbody> </table> Modified: incubator/singa/site/trunk/docs.html URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/docs.html?rev=1862313&r1=1862312&r2=1862313&view=diff ============================================================================== --- incubator/singa/site/trunk/docs.html (original) +++ incubator/singa/site/trunk/docs.html Sat Jun 29 14:42:24 2019 @@ -211,26 +211,27 @@ <li class="toctree-l3"><a class="reference internal" href="docs/software_stack.html#io">IO</a></li> </ul> </li> +<li class="toctree-l2"><a class="reference internal" href="docs/benchmark.html">Benchmark for Distributed training</a></li> <li class="toctree-l2"><a class="reference internal" href="docs/device.html">Device</a><ul> <li class="toctree-l3"><a class="reference internal" href="docs/device.html#specific-devices">Specific devices</a></li> -<li class="toctree-l3"><a class="reference internal" href="docs/device.html#python-api">Python API</a></li> +<li class="toctree-l3"><a class="reference internal" href="docs/device.html#module-singa.device">Python API</a></li> <li class="toctree-l3"><a class="reference internal" href="docs/device.html#cpp-api">CPP API</a></li> </ul> </li> <li class="toctree-l2"><a class="reference internal" href="docs/tensor.html">Tensor</a><ul> <li class="toctree-l3"><a class="reference internal" href="docs/tensor.html#tensor-implementation">Tensor implementation</a></li> -<li class="toctree-l3"><a class="reference internal" href="docs/tensor.html#python-api">Python API</a></li> +<li class="toctree-l3"><a class="reference internal" href="docs/tensor.html#module-singa.tensor">Python API</a></li> <li class="toctree-l3"><a class="reference internal" href="docs/tensor.html#cpp-api">CPP API</a></li> </ul> </li> <li class="toctree-l2"><a class="reference internal" href="docs/layer.html">Layer</a><ul> -<li class="toctree-l3"><a class="reference internal" href="docs/layer.html#python-api">Python API</a></li> +<li class="toctree-l3"><a class="reference internal" href="docs/layer.html#module-singa.layer">Python API</a></li> <li class="toctree-l3"><a class="reference internal" href="docs/layer.html#cpp-api">CPP API</a></li> </ul> </li> <li class="toctree-l2"><a class="reference internal" href="docs/net.html">FeedForward Net</a></li> <li class="toctree-l2"><a class="reference internal" href="docs/initializer.html">Initializer</a><ul> -<li class="toctree-l3"><a class="reference internal" href="docs/initializer.html#python-api">Python API</a></li> +<li class="toctree-l3"><a class="reference internal" href="docs/initializer.html#module-singa.initializer">Python API</a></li> <li class="toctree-l3"><a class="reference internal" href="docs/initializer.html#cpp-api">CPP API</a></li> </ul> </li> @@ -281,10 +282,6 @@ <li class="toctree-l4"><a class="reference internal" href="docs/model_zoo/char-rnn/README.html#instructions">Instructions</a></li> </ul> </li> -<li class="toctree-l3"><a class="reference internal" href="docs/model_zoo/mnist/README.html">Train a RBM model against MNIST dataset</a><ul> -<li class="toctree-l4"><a class="reference internal" href="docs/model_zoo/mnist/README.html#running-instructions">Running instructions</a></li> -</ul> -</li> <li class="toctree-l3"><a class="reference internal" href="docs/model_zoo/imagenet/alexnet/README.html">Train AlexNet over ImageNet</a><ul> <li class="toctree-l4"><a class="reference internal" href="docs/model_zoo/imagenet/alexnet/README.html#instructions">Instructions</a><ul> <li class="toctree-l5"><a class="reference internal" href="docs/model_zoo/imagenet/alexnet/README.html#compile-singa">Compile SINGA</a></li> @@ -295,15 +292,6 @@ </li> </ul> </li> -<li class="toctree-l3"><a class="reference internal" href="docs/model_zoo/imagenet/densenet/README.html">name: DenseNet models on ImageNet -SINGA version: 1.1.1 -SINGA commit: -license: https://github.com/pytorch/vision/blob/master/torchvision/models/densenet.py</a></li> -<li class="toctree-l3"><a class="reference internal" href="docs/model_zoo/imagenet/densenet/README.html#image-classification-using-densenet">Image Classification using DenseNet</a><ul> -<li class="toctree-l4"><a class="reference internal" href="docs/model_zoo/imagenet/densenet/README.html#instructions">Instructions</a></li> -<li class="toctree-l4"><a class="reference internal" href="docs/model_zoo/imagenet/densenet/README.html#details">Details</a></li> -</ul> -</li> <li class="toctree-l3"><a class="reference internal" href="docs/model_zoo/imagenet/googlenet/README.html">name: GoogleNet on ImageNet SINGA version: 1.0.1 SINGA commit: 8c990f7da2de220e8a012c6a8ecc897dc7532744 @@ -315,36 +303,6 @@ license: unrestricted https://github.com <li class="toctree-l4"><a class="reference internal" href="docs/model_zoo/imagenet/googlenet/README.html#details">Details</a></li> </ul> </li> -<li class="toctree-l3"><a class="reference internal" href="docs/model_zoo/imagenet/inception/README.html">name: Inception V4 on ImageNet -SINGA version: 1.1.1 -SINGA commit: -parameter_url: https://s3-ap-southeast-1.amazonaws.com/dlfile/inception_v4.tar.gz -parameter_sha1: 5fdd6f5d8af8fd10e7321d9b38bb87ef14e80d56 -license: https://github.com/tensorflow/models/tree/master/slim</a></li> -<li class="toctree-l3"><a class="reference internal" href="docs/model_zoo/imagenet/inception/README.html#image-classification-using-inception-v4">Image Classification using Inception V4</a><ul> -<li class="toctree-l4"><a class="reference internal" href="docs/model_zoo/imagenet/inception/README.html#instructions">Instructions</a></li> -<li class="toctree-l4"><a class="reference internal" href="docs/model_zoo/imagenet/inception/README.html#details">Details</a></li> -</ul> -</li> -<li class="toctree-l3"><a class="reference internal" href="docs/model_zoo/imagenet/resnet/README.html">name: Resnets on ImageNet -SINGA version: 1.1 -SINGA commit: 45ec92d8ffc1fa1385a9307fdf07e21da939ee2f -parameter_url: https://s3-ap-southeast-1.amazonaws.com/dlfile/resnet/resnet-18.tar.gz -license: Apache V2, https://github.com/facebook/fb.resnet.torch/blob/master/LICENSE</a></li> -<li class="toctree-l3"><a class="reference internal" href="docs/model_zoo/imagenet/resnet/README.html#image-classification-using-residual-networks">Image Classification using Residual Networks</a><ul> -<li class="toctree-l4"><a class="reference internal" href="docs/model_zoo/imagenet/resnet/README.html#instructions">Instructions</a></li> -<li class="toctree-l4"><a class="reference internal" href="docs/model_zoo/imagenet/resnet/README.html#details">Details</a></li> -</ul> -</li> -<li class="toctree-l3"><a class="reference internal" href="docs/model_zoo/imagenet/vgg/README.html">name: VGG models on ImageNet -SINGA version: 1.1.1 -SINGA commit: -license: https://github.com/pytorch/vision/blob/master/torchvision/models/vgg.py</a></li> -<li class="toctree-l3"><a class="reference internal" href="docs/model_zoo/imagenet/vgg/README.html#image-classification-using-vgg">Image Classification using VGG</a><ul> -<li class="toctree-l4"><a class="reference internal" href="docs/model_zoo/imagenet/vgg/README.html#instructions">Instructions</a></li> -<li class="toctree-l4"><a class="reference internal" href="docs/model_zoo/imagenet/vgg/README.html#details">Details</a></li> -</ul> -</li> </ul> </li> </ul> Modified: incubator/singa/site/trunk/docs/autograd.html URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/docs/autograd.html?rev=1862313&r1=1862312&r2=1862313&view=diff ============================================================================== --- incubator/singa/site/trunk/docs/autograd.html (original) +++ incubator/singa/site/trunk/docs/autograd.html Sat Jun 29 14:42:24 2019 @@ -104,6 +104,7 @@ <li class="toctree-l1 current"><a class="reference internal" href="index.html">Documentation</a><ul class="current"> <li class="toctree-l2"><a class="reference internal" href="installation.html">Installation</a></li> <li class="toctree-l2"><a class="reference internal" href="software_stack.html">Software Stack</a></li> +<li class="toctree-l2"><a class="reference internal" href="benchmark.html">Benchmark for Distributed training</a></li> <li class="toctree-l2"><a class="reference internal" href="device.html">Device</a></li> <li class="toctree-l2"><a class="reference internal" href="tensor.html">Tensor</a></li> <li class="toctree-l2"><a class="reference internal" href="layer.html">Layer</a></li> @@ -243,9 +244,9 @@ <h3>Tensor<a class="headerlink" href="#tensor" title="Permalink to this headline">¶</a></h3> <p>Three attributes of Tensor are used by autograd,</p> <ul class="simple"> -<li><code class="docutils literal notranslate"><span class="pre">.creator</span></code> is an <code class="docutils literal notranslate"><span class="pre">Operation</span></code> instance. It records the operation that generates the Tensor instance.</li> -<li><code class="docutils literal notranslate"><span class="pre">.requires_grad</span></code> is a boolean variable. It is used to indicate that the autograd algorithm needs to compute the gradient of the tensor (i.e., the owner). For example, during backpropagation, the gradients of the tensors for the weight matrix of a linear layer and the feature maps of a convolution layer (not the bottom layer) should be computed.</li> -<li><code class="docutils literal notranslate"><span class="pre">.stores_grad</span></code> is a boolean variable. It is used to indicate that the gradient of the owner tensor should be stored and output by the backward function. For example, the gradient of the feature maps is computed during backpropagation, but is not included in the output of the backward function.</li> +<li><p><code class="docutils literal notranslate"><span class="pre">.creator</span></code> is an <code class="docutils literal notranslate"><span class="pre">Operation</span></code> instance. It records the operation that generates the Tensor instance.</p></li> +<li><p><code class="docutils literal notranslate"><span class="pre">.requires_grad</span></code> is a boolean variable. It is used to indicate that the autograd algorithm needs to compute the gradient of the tensor (i.e., the owner). For example, during backpropagation, the gradients of the tensors for the weight matrix of a linear layer and the feature maps of a convolution layer (not the bottom layer) should be computed.</p></li> +<li><p><code class="docutils literal notranslate"><span class="pre">.stores_grad</span></code> is a boolean variable. It is used to indicate that the gradient of the owner tensor should be stored and output by the backward function. For example, the gradient of the feature maps is computed during backpropagation, but is not included in the output of the backward function.</p></li> </ul> <p>Programmers can change <code class="docutils literal notranslate"><span class="pre">requires_grad</span></code> and <code class="docutils literal notranslate"><span class="pre">stores_grad</span></code> of a Tensor instance. For example, if later is set to True, the corresponding gradient is included in the output of the backward function. It should be noted that if <code class="docutils literal notranslate"><span class="pre">stores_grad</span></code> is True, then <code class="docutils literal notranslate"><span class="pre">requires_grad</span></code> must be true, not vice versa.</p> </div> @@ -253,7 +254,7 @@ <h3>Operation<a class="headerlink" href="#operation" title="Permalink to this headline">¶</a></h3> <p>It takes one or more <code class="docutils literal notranslate"><span class="pre">Tensor</span></code> instances as input, and then outputs one or more <code class="docutils literal notranslate"><span class="pre">Tensor</span></code> instances. For example, ReLU can be implemented as a specific Operation subclass. When an <code class="docutils literal notranslate"><span class="pre">Operation</span></code> instance is called (after instantiation), the following two steps are executed:</p> <ol class="simple"> -<li>record the source operations, i.e., the <code class="docutils literal notranslate"><span class="pre">creator</span></code>s of the input tensors. 2. do calculation by calling member function <code class="docutils literal notranslate"><span class="pre">.forward()</span></code></li> +<li><p>record the source operations, i.e., the <code class="docutils literal notranslate"><span class="pre">creator</span></code>s of the input tensors. 2. do calculation by calling member function <code class="docutils literal notranslate"><span class="pre">.forward()</span></code></p></li> </ol> <p>There are two member functions for forwarding and backwarding, i.e., <code class="docutils literal notranslate"><span class="pre">.forward()</span></code> and <code class="docutils literal notranslate"><span class="pre">.backward()</span></code>. They take <code class="docutils literal notranslate"><span class="pre">Tensor.data</span></code> as inputs (the type is <code class="docutils literal notranslate"><span class="pre">CTensor</span></code>), and output <code class="docutils literal notranslate"><span class="pre">Ctensor</span></code>s. To add a specific operation, subclass <code class="docutils literal notranslate"><span class="pre">operation</span></code> should implement their own <code class="docutils literal notranslate"><span class="pre">.forward()</span></code> and <code class="docutils literal notranslate"><span class="pre">.backward()</span></code>. The <code class="docutils literal notranslate"><span class="pre">backward()</span></code> function is called by the <c ode class="docutils literal notranslate"><span class="pre">backward()</span></code> function of autograd automatically during backward propogation to compute the gradients of inputs (according to the <code class="docutils literal notranslate"><span class="pre">require_grad</span></code> field).</p> </div> Added: incubator/singa/site/trunk/docs/benchmark.html URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/docs/benchmark.html?rev=1862313&view=auto ============================================================================== --- incubator/singa/site/trunk/docs/benchmark.html (added) +++ incubator/singa/site/trunk/docs/benchmark.html Sat Jun 29 14:42:24 2019 @@ -0,0 +1,328 @@ + + + +<!DOCTYPE html> +<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]--> +<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]--> +<head> + <meta charset="utf-8"> + + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + + <title>Benchmark for Distributed training — incubator-singa 2.0.0 documentation</title> + + + + + + + + + <script type="text/javascript" src="../_static/js/modernizr.min.js"></script> + + + <script type="text/javascript" id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script> + <script type="text/javascript" src="../_static/jquery.js"></script> + <script type="text/javascript" src="../_static/underscore.js"></script> + <script type="text/javascript" src="../_static/doctools.js"></script> + <script type="text/javascript" src="../_static/language_data.js"></script> + + <script type="text/javascript" src="../_static/js/theme.js"></script> + + + + + <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" /> + <link rel="stylesheet" href="../_static/pygments.css" type="text/css" /> + <link rel="index" title="Index" href="../genindex.html" /> + <link rel="search" title="Search" href="../search.html" /> + <link rel="next" title="Device" href="device.html" /> + <link rel="prev" title="Software Stack" href="software_stack.html" /> + <link href="../_static/style.css" rel="stylesheet" type="text/css"> + <!--link href="../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"--> + <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css"; integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous"> + <style> + .fa:hover { + opacity: 0.7; + } + .fab:hover { + opacity: 0.7; + } + </style> + +</head> + +<body class="wy-body-for-nav"> + + + <div class="wy-grid-for-nav"> + + <nav data-toggle="wy-nav-shift" class="wy-nav-side"> + <div class="wy-side-scroll"> + <div class="wy-side-nav-search" > + + + + <a href="../index.html" class="icon icon-home"> incubator-singa + + + + + <img src="../_static/singa.png" class="logo" alt="Logo"/> + + </a> + + + + + <div class="version"> + latest + </div> + + + + +<div role="search"> + <form id="rtd-search-form" class="wy-form" action="../search.html" method="get"> + <input type="text" name="q" placeholder="Search docs" /> + <input type="hidden" name="check_keywords" value="yes" /> + <input type="hidden" name="area" value="default" /> + </form> +</div> + + + </div> + + <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation"> + + + + + + + <ul class="current"> +<li class="toctree-l1 current"><a class="reference internal" href="index.html">Documentation</a><ul class="current"> +<li class="toctree-l2"><a class="reference internal" href="installation.html">Installation</a></li> +<li class="toctree-l2"><a class="reference internal" href="software_stack.html">Software Stack</a></li> +<li class="toctree-l2 current"><a class="current reference internal" href="#">Benchmark for Distributed training</a></li> +<li class="toctree-l2"><a class="reference internal" href="device.html">Device</a></li> +<li class="toctree-l2"><a class="reference internal" href="tensor.html">Tensor</a></li> +<li class="toctree-l2"><a class="reference internal" href="layer.html">Layer</a></li> +<li class="toctree-l2"><a class="reference internal" href="net.html">FeedForward Net</a></li> +<li class="toctree-l2"><a class="reference internal" href="initializer.html">Initializer</a></li> +<li class="toctree-l2"><a class="reference internal" href="loss.html">Loss</a></li> +<li class="toctree-l2"><a class="reference internal" href="metric.html">Metric</a></li> +<li class="toctree-l2"><a class="reference internal" href="optimizer.html">Optimizer</a></li> +<li class="toctree-l2"><a class="reference internal" href="autograd.html">Autograd in Singa</a></li> +<li class="toctree-l2"><a class="reference internal" href="data.html">Data</a></li> +<li class="toctree-l2"><a class="reference internal" href="image_tool.html">Image Tool</a></li> +<li class="toctree-l2"><a class="reference internal" href="snapshot.html">Snapshot</a></li> +<li class="toctree-l2"><a class="reference internal" href="converter.html">Caffe Converter</a></li> +<li class="toctree-l2"><a class="reference internal" href="utils.html">Utils</a></li> +<li class="toctree-l2"><a class="reference internal" href="model_zoo/index.html">Model Zoo</a></li> +</ul> +</li> +<li class="toctree-l1"><a class="reference internal" href="../downloads.html">Download SINGA</a></li> +<li class="toctree-l1"><a class="reference internal" href="../security.html">Security</a></li> +</ul> +<p class="caption"><span class="caption-text">Development</span></p> +<ul> +<li class="toctree-l1"><a class="reference internal" href="../develop/schedule.html">Development Schedule</a></li> +<li class="toctree-l1"><a class="reference internal" href="../develop/how-contribute.html">How to Contribute to SINGA</a></li> +<li class="toctree-l1"><a class="reference internal" href="../develop/how-contribute.html#how-to-become-a-singa-committer">How to become a SINGA committer</a></li> +<li class="toctree-l1"><a class="reference internal" href="../develop/contribute-code.html">How to Contribute Code</a></li> +<li class="toctree-l1"><a class="reference internal" href="../develop/contribute-docs.html">How to Contribute to Documentation</a></li> +<li class="toctree-l1"><a class="reference internal" href="../develop/how-to-release.html">How to prepare a release</a></li> +</ul> +<p class="caption"><span class="caption-text">Community</span></p> +<ul> +<li class="toctree-l1"><a class="reference internal" href="../community/source-repository.html">Source Repository</a></li> +<li class="toctree-l1"><a class="reference internal" href="../community/mail-lists.html">Project Mailing Lists</a></li> +<li class="toctree-l1"><a class="reference internal" href="../community/issue-tracking.html">Issue Tracking</a></li> +<li class="toctree-l1"><a class="reference internal" href="../community/team-list.html">The SINGA Team</a></li> +</ul> + + + + </div> + </div> + </nav> + + <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap"> + + + <nav class="wy-nav-top" aria-label="top navigation"> + + <i data-toggle="wy-nav-top" class="fa fa-bars"></i> + <a href="../index.html">incubator-singa</a> + + </nav> + + + <div class="wy-nav-content"> + + <div class="rst-content"> + + + + + + + + + + + + + + + + + +<div role="navigation" aria-label="breadcrumbs navigation"> + + <ul class="wy-breadcrumbs"> + + <li><a href="../index.html">Docs</a> »</li> + + <li><a href="index.html">Documentation</a> »</li> + + <li>Benchmark for Distributed training</li> + + + <li class="wy-breadcrumbs-aside"> + + + + </li> + + </ul> + + + <hr/> +</div> + <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article";> + <div itemprop="articleBody"> + + <!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--><div class="section" id="benchmark-for-distributed-training"> +<h1>Benchmark for Distributed training<a class="headerlink" href="#benchmark-for-distributed-training" title="Permalink to this headline">¶</a></h1> +<p>Workload: we use a deep convolutional neural network, <a class="reference external" href="https://github.com/apache/incubator-singa/blob/master/examples/autograd/resnet.py";>ResNet-50</a> as the application. ResNet-50 is has 50 convolution layers for image classification. It requires 3.8 GFLOPs to pass a single image (of size 224x224) through the network. The input image size is 224x224.</p> +<p>Hardware: we use p2.8xlarge instances from AWS, each of which has 8 Nvidia Tesla K80 GPUs, 96 GB GPU memory in total, 32 vCPU, 488 GB main memory, 10 Gbps network bandwidth.</p> +<p>Metric: we measure the time per iteration for different number of workers to evaluate the scalability of SINGA. The batch size is fixed to be 32 per GPU. Synchronous training scheme is applied. As a result, the effective batch size is $32N$, where N is the number of GPUs. We compare with a popular open source system which uses the parameter server topology. The first GPU is selected as the server.</p> +<img src="../_static/images/benchmark.png" align="center" width="500px"/> +<br/> +<span><strong>Scalability test. Bars are for the throughput; lines are for the communication cost.</strong></span></div> + + + </div> + + </div> + <footer> + + <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation"> + + <a href="device.html" class="btn btn-neutral float-right" title="Device" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right"></span></a> + + + <a href="software_stack.html" class="btn btn-neutral float-left" title="Software Stack" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a> + + </div> + + + <hr/> + + <div role="contentinfo"> + <p> + © Copyright 2019 The Apache Software Foundation. All rights reserved. Apache SINGA, Apache, the Apache feather logo, and the Apache SINGA project logos are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. + + </p> + </div> + Built with <a href="http://sphinx-doc.org/";>Sphinx</a> using a <a href="https://github.com/rtfd/sphinx_rtd_theme";>theme</a> provided by <a href="https://readthedocs.org";>Read the Docs</a>. + +</footer> + + </div> + </div> + + </section> + + </div> + + + + <script type="text/javascript"> + jQuery(function () { + SphinxRtdTheme.Navigation.enable(true); + }); + </script> + + + + + + +<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions"> + <span class="rst-current-version" data-toggle="rst-current-version"> + <span class="fa fa-book"> incubator-singa </span> + v: latest + <span class="fa fa-caret-down"></span> + </span> + <div class="rst-other-versions"> + <dl> + <dt>Languages</dt> + <dd><a href=".././index.html">English</a></dd> + <dd><a href=".././zh/index.html">ä¸æ</a></dd> + </dl> + <dl> + <dt>Versions</dt> + <dd><a href="http://singa.apache.org/v0.3.0/";>0.3</a></dd> + <dd><a href="http://singa.apache.org/v1.1.0/";>1.1</a></dd> + </dl> + + </div> + <a href="http://incubator.apache.org/";> <img src= "../_static/apache.png" style="background-color:white;"> </a> + + <a href="http://www.apache.org"; style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; text-decoration: none; margin: 5px 2px;">Foundation</a> + <a href="http://www.apache.org/events/current-event"; style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; text-decoration: none; margin: 5px 2px;">Events</a> + <a href="http://www.apache.org/foundation/thanks.html"; style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; text-decoration: none; margin: 5px 2px;">Thanks</a> + <a href="http://www.apache.org/foundation/sponsorship.html"; style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; text-decoration: none; margin: 5px 2px;">Sponsorship</a> + <a href="http://www.apache.org/licenses/"; style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; text-decoration: none; margin: 5px 2px;">License</a> + <br> + <a href="https://github.com/apache/incubator-singa"; class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c"; class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://hub.docker.com/r/apache/singa/"; class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://www.linkedin.com/groups/13550034"; class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://twitter.com/ApacheSinga"; class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://www.facebook.com/Apache-SINGA-347284219056544/"; class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://www.researchgate.net/project/Apache-SINGA"; class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + +</div> + + <a href="https://github.com/apache/incubator-singa";> + <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;" + src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"; + alt="Fork me on GitHub"> +</a> + + + + +</body> +</html> \ No newline at end of file Modified: incubator/singa/site/trunk/docs/converter.html URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/docs/converter.html?rev=1862313&r1=1862312&r2=1862313&view=diff ============================================================================== --- incubator/singa/site/trunk/docs/converter.html (original) +++ incubator/singa/site/trunk/docs/converter.html Sat Jun 29 14:42:24 2019 @@ -104,6 +104,7 @@ <li class="toctree-l1 current"><a class="reference internal" href="index.html">Documentation</a><ul class="current"> <li class="toctree-l2"><a class="reference internal" href="installation.html">Installation</a></li> <li class="toctree-l2"><a class="reference internal" href="software_stack.html">Software Stack</a></li> +<li class="toctree-l2"><a class="reference internal" href="benchmark.html">Benchmark for Distributed training</a></li> <li class="toctree-l2"><a class="reference internal" href="device.html">Device</a></li> <li class="toctree-l2"><a class="reference internal" href="tensor.html">Tensor</a></li> <li class="toctree-l2"><a class="reference internal" href="layer.html">Layer</a></li> @@ -203,8 +204,8 @@ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article";> <div itemprop="articleBody"> - <div class="section" id="caffe-converter"> -<h1>Caffe Converter<a class="headerlink" href="#caffe-converter" title="Permalink to this headline">¶</a></h1> + <div class="section" id="module-singa.converter"> +<span id="caffe-converter"></span><h1>Caffe Converter<a class="headerlink" href="#module-singa.converter" title="Permalink to this headline">¶</a></h1> </div> Modified: incubator/singa/site/trunk/docs/data.html URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/docs/data.html?rev=1862313&r1=1862312&r2=1862313&view=diff ============================================================================== --- incubator/singa/site/trunk/docs/data.html (original) +++ incubator/singa/site/trunk/docs/data.html Sat Jun 29 14:42:24 2019 @@ -104,6 +104,7 @@ <li class="toctree-l1 current"><a class="reference internal" href="index.html">Documentation</a><ul class="current"> <li class="toctree-l2"><a class="reference internal" href="installation.html">Installation</a></li> <li class="toctree-l2"><a class="reference internal" href="software_stack.html">Software Stack</a></li> +<li class="toctree-l2"><a class="reference internal" href="benchmark.html">Benchmark for Distributed training</a></li> <li class="toctree-l2"><a class="reference internal" href="device.html">Device</a></li> <li class="toctree-l2"><a class="reference internal" href="tensor.html">Tensor</a></li> <li class="toctree-l2"><a class="reference internal" href="layer.html">Layer</a></li> @@ -203,8 +204,66 @@ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article";> <div itemprop="articleBody"> - <div class="section" id="data"> -<h1>Data<a class="headerlink" href="#data" title="Permalink to this headline">¶</a></h1> + <div class="section" id="module-singa.data"> +<span id="data"></span><h1>Data<a class="headerlink" href="#module-singa.data" title="Permalink to this headline">¶</a></h1> +<p>This module includes classes for loading and prefetching data batches.</p> +<p>Example usage:</p> +<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">image_tool</span> +<span class="kn">from</span> <span class="nn">PIL</span> <span class="k">import</span> <span class="n">Image</span> + +<span class="n">tool</span> <span class="o">=</span> <span class="n">image_tool</span><span class="o">.</span><span class="n">ImageTool</span><span class="p">()</span> + +<span class="k">def</span> <span class="nf">image_transform</span><span class="p">(</span><span class="n">img_path</span><span class="p">):</span> + <span class="k">global</span> <span class="n">tool</span> + <span class="k">return</span> <span class="n">tool</span><span class="o">.</span><span class="n">load</span><span class="p">(</span><span class="n">img_path</span><span class="p">)</span><span class="o">.</span><span class="n">resize_by_range</span><span class="p">(</span> + <span class="p">(</span><span class="mi">112</span><span class="p">,</span> <span class="mi">128</span><span class="p">))</span><span class="o">.</span><span class="n">random_crop</span><span class="p">(</span> + <span class="p">(</span><span class="mi">96</span><span class="p">,</span> <span class="mi">96</span><span class="p">))</span><span class="o">.</span><span class="n">flip</span><span class="p">()</span><span class="o">.</span><span class="n">get</span><span class="p">()</span> + +<span class="n">data</span> <span class="o">=</span> <span class="n">ImageBatchIter</span><span class="p">(</span><span class="s1">'train.txt'</span><span class="p">,</span> <span class="mi">3</span><span class="p">,</span> + <span class="n">image_transform</span><span class="p">,</span> <span class="n">shuffle</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="n">delimiter</span><span class="o">=</span><span class="s1">','</span><span class="p">,</span> + <span class="n">image_folder</span><span class="o">=</span><span class="s1">'images/'</span><span class="p">,</span> + <span class="n">capacity</span><span class="o">=</span><span class="mi">10</span><span class="p">)</span> +<span class="n">data</span><span class="o">.</span><span class="n">start</span><span class="p">()</span> +<span class="c1"># imgs is a numpy array for a batch of images,</span> +<span class="c1"># shape: batch_size, 3 (RGB), height, width</span> +<span class="n">imgs</span><span class="p">,</span> <span class="n">labels</span> <span class="o">=</span> <span class="n">data</span><span class="o">.</span><span class="n">next</span><span class="p">()</span> + +<span class="c1"># convert numpy array back into images</span> +<span class="k">for</span> <span class="n">idx</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">imgs</span><span class="o">.</span><span class="n">shape</span><span class="p">[</span><span class="mi">0</span><span class="p">]):</span> + <span class="n">img</span> <span class="o">=</span> <span class="n">Image</span><span class="o">.</span><span class="n">fromarray</span><span class="p">(</span><span class="n">imgs</span><span class="p">[</span><span class="n">idx</span><span class="p">]</span><span class="o">.</span><span class="n">astype</span><span class="p">(</span><span class="n">np</span><span class="o">.</span><span class="n">uint8</span><span class="p">)</span><span class="o">.</span><span class="n">transpose</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="mi">2</span><span class="p">,</span> <span class="mi">0</span><span class="p">),</span> + <span class="s1">'RGB'</span><span class="p">)</span> + <span class="n">img</span><span class="o">.</span><span class="n">save</span><span class="p">(</span><span class="s1">'img</span><span class="si">%d</span><span class="s1">.png'</span> <span class="o">%</span> <span class="n">idx</span><span class="p">)</span> +<span class="n">data</span><span class="o">.</span><span class="n">end</span><span class="p">()</span> +</pre></div> +</div> +<dl class="class"> +<dt id="singa.data.ImageBatchIter"> +<em class="property">class </em><code class="descclassname">singa.data.</code><code class="descname">ImageBatchIter</code><span class="sig-paren">(</span><em>img_list_file</em>, <em>batch_size</em>, <em>image_transform</em>, <em>shuffle=True</em>, <em>delimiter=' '</em>, <em>image_folder=None</em>, <em>capacity=10</em><span class="sig-paren">)</span><a class="headerlink" href="#singa.data.ImageBatchIter" title="Permalink to this definition">¶</a></dt> +<dd><p>Utility for iterating over an image dataset to get mini-batches.</p> +<dl class="field-list simple"> +<dt class="field-odd">Parameters</dt> +<dd class="field-odd"><ul class="simple"> +<li><p><strong>img_list_file</strong> (<em>str</em>) â name of the file containing image meta data; each +line consists of image_path_suffix delimiter meta_info, +where meta info could be label index or label strings, etc. +meta_info should not contain the delimiter. If the meta_info +of each image is just the label index, then we will parse the +label index into a numpy array with length=batchsize +(for compatibility); otherwise, we return a list of meta_info; +if meta info is available, we return a list of None.</p></li> +<li><p><strong>batch_size</strong> (<em>int</em>) â num of samples in one mini-batch</p></li> +<li><p><strong>image_transform</strong> â a function for image augmentation; it accepts the full +image path and outputs a list of augmented images.</p></li> +<li><p><strong>shuffle</strong> (<em>boolean</em>) â True for shuffling images in the list</p></li> +<li><p><strong>delimiter</strong> (<em>char</em>) â delimiter between image_path_suffix and label, e.g., +space or comma</p></li> +<li><p><strong>image_folder</strong> (<em>boolean</em>) â prefix of the image path</p></li> +<li><p><strong>capacity</strong> (<em>int</em>) â the max num of mini-batches in the internal queue.</p></li> +</ul> +</dd> +</dl> +</dd></dl> + </div>
![https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"](https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"){kind=link}