Author: jinyang
Date: Wed Sep  2 13:39:42 2015
New Revision: 1700814

URL: http://svn.apache.org/r1700814
Log:
update site structure and index

Modified:
    incubator/singa/site/trunk/content/markdown/develop/schedule.md
    incubator/singa/site/trunk/content/markdown/docs.md
    incubator/singa/site/trunk/content/markdown/docs/neural-net.md
    incubator/singa/site/trunk/content/markdown/docs/neural-net.md~
    incubator/singa/site/trunk/content/markdown/index.md
    incubator/singa/site/trunk/content/site.xml

Modified: incubator/singa/site/trunk/content/markdown/develop/schedule.md
URL: 
http://svn.apache.org/viewvc/incubator/singa/site/trunk/content/markdown/develop/schedule.md?rev=1700814&r1=1700813&r2=1700814&view=diff
==============================================================================
--- incubator/singa/site/trunk/content/markdown/develop/schedule.md (original)
+++ incubator/singa/site/trunk/content/markdown/develop/schedule.md Wed Sep  2 
13:39:42 2015
@@ -1,43 +1,26 @@
-Title: Development Schedule
-Notice:    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.
 
-## Development Schedule
+# Development Schedule
 
 | Release | Module| Feature | Status |
 |---------|---------|-------------|--------|
-| 0.1     | Neural Network |1.1. Feed forward neural network, including CNN, 
MLP | done|
-| -Early July |                |1.2. RBM-like model, including RBM | testing|
+| 0.1 August    | Neural Network |1.1. Feed forward neural network, including 
CNN, MLP | done|
+| |          |1.2. RBM-like model, including RBM | testing|
 |         |                |1.3. Recurrent neural network, including standard 
RNN | working|
 |         | Architecture   |1.4. One worker group on single node (with data 
partition)| done|
-|         |                |1.5. Multi worker groups on single node using 
[Shared Memory 
Hogwild](http://www.eecs.berkeley.edu/~brecht/papers/hogwildTR.pdf)|testing|
-|         |                |1.6. Distributed Hogwild | testing|
-|         |                |1.7. Multi groups across nodes, like 
[Downpour](http://papers.nips.cc/paper/4687-large-scale-distributed-deep-networks)|testing|
-|         |                |1.8  All-Reduce training architecture like 
[DeepImage](http://arxiv.org/abs/1501.02876)| testing|
-|         | Resource Management |1.9. Integration with Mesos | working|
-|         | Failure recovery|1.10. Checkpoint and restore |testing|
+|         |                |1.5. Multi worker groups on single node using 
[Hogwild](http://www.eecs.berkeley.edu/~brecht/papers/hogwildTR.pdf)|done|
+|         |                |1.6. Distributed Hogwild|testing|
+|         |                |1.7. Multi groups across nodes, like 
[Downpour](http://papers.nips.cc/paper/4687-large-scale-distributed-deep-networks)|done|
+|         |                |1.8. All-Reduce training architecture like 
[DeepImage](http://arxiv.org/abs/1501.02876)|done|
+|         | Failure recovery|1.10. Checkpoint and restore |done|
 |         | Tools|1.11. Installation with GNU auto tools| done|
-|0.2      | Neural Network |2.1. Feed forward neural network, including 
auto-encoders, hinge loss layers, HDFS data layers||
-| July-        |                |2.2. RBM-like model, including DBM | |
-| End of August         |                |2.3. Recurrent neural network, 
including LSTM| |
+|0.2 October  | Neural Network |2.1. Feed forward neural network, including 
auto-encoders, hinge loss layers, HDFS data layers||
+| |                |2.2. RBM-like model, including DBM | |
+|         |                |2.3. Recurrent neural network, including LSTM| |
 |         |                |2.4. Model partition ||
 |         | Communication  |2.5. MPI||
 |         | GPU            |2.6. Single GPU ||
 |         |                |2.7. Multiple GPUs on single node||
+|         | Resource Management |1.9. Integration with Mesos ||
 |         | Architecture   |2.8. Update to support GPUs
 |         | Fault Tolerance|2.9. Node failure detection and recovery||
 |         | Binding        |2.9. Python binding ||

Modified: incubator/singa/site/trunk/content/markdown/docs.md
URL: 
http://svn.apache.org/viewvc/incubator/singa/site/trunk/content/markdown/docs.md?rev=1700814&r1=1700813&r2=1700814&view=diff
==============================================================================
--- incubator/singa/site/trunk/content/markdown/docs.md (original)
+++ incubator/singa/site/trunk/content/markdown/docs.md Wed Sep  2 13:39:42 2015
@@ -1,10 +1,21 @@
-## Documentation
+# Documentation
 
-___
-
-* [Installation](docs/installation.html)
-* [Programmer Guide](docs/programmer-guide.html)
-* [System Architecture](docs/architecture.html)
-* [Communication](docs/communication.html)
-* [Training Examples](docs/examples.html)
+* [Introduction](http://singa.incubator.apache.org/docs/overview)
+* [Installation](http://singa.incubator.apache.org/docs/installation)
+* [Quick Start](http://singa.incubator.apache.org/docs/quick-start)
+* [Programming Guide](http://singa.incubator.apache.org/docs/programming-guide)
+  * [NeuralNet](http://singa.incubator.apache.org/docs/neural-net)
+    * [Layer](http://singa.incubator.apache.org/docs/layer)
+    * [Param](http://singa.incubator.apache.org/docs/param)
+  * [TrainOneBatch](http://singa.incubator.apache.org/docs/train-one-batch)
+  * [Updater](http://singa.incubator.apache.org/docs/updater)
+* [Distributed 
Training](http://singa.incubator.apache.org/docs/distributed-training)
+* [Data Preparation](http://singa.incubator.apache.org/docs/data)
+* [Checkpoint and Resume](http://singa.incubator.apache.org/docs/checkpoint)
+* Examples
+  * Feed-forward models
+    * [CNN](http://singa.incubator.apache.org/docs/cnn)
+    * [MLP](http://singa.incubator.apache.org/docs/mlp)
+  * [RBM + Auto-encoder](http://singa.incubator.apache.org/docs/rbm)
+  * [RNN](http://singa.incubator.apache.org/docs/rnn)
 

Modified: incubator/singa/site/trunk/content/markdown/docs/neural-net.md
URL: 
http://svn.apache.org/viewvc/incubator/singa/site/trunk/content/markdown/docs/neural-net.md?rev=1700814&r1=1700813&r2=1700814&view=diff
==============================================================================
--- incubator/singa/site/trunk/content/markdown/docs/neural-net.md (original)
+++ incubator/singa/site/trunk/content/markdown/docs/neural-net.md Wed Sep  2 
13:39:42 2015
@@ -6,7 +6,7 @@ a set of unidirectionally connected [Lay
 This page describes how to convert an user's neural net into
 the configuration of `NeuralNet`.
 
-<img src="http://singa.incubator.apache.org/assets/image/model-category.png"; 
align="center" width="200px"/>
+<img src="http://singa.incubator.apache.org/images/model-category.png"; 
align="center" width="200px"/>
 <span><strong>Figure 1 - Categorization of popular deep learning 
models.</strong></span>
 
 ## Net structure configuration
@@ -19,7 +19,7 @@ category.
 ### Feed-forward models
 
 <div align = "left">
-<img src="http://singa.incubator.apache.org/assets/image/mlp-net.png"; 
align="center" width="200px"/>
+<img src="http://singa.incubator.apache.org/images/mlp-net.png"; align="center" 
width="200px"/>
 <span><strong>Figure 2 - Net structure of a MLP model.</strong></span>
 </div>
 
@@ -57,7 +57,7 @@ configuration for the MLP model shown in
 
 ### Energy models
 
-<img src="http://singa.incubator.apache.org/assets/image/rbm-rnn.png"; 
align="center" width="500px"/>
+<img src="http://singa.incubator.apache.org/images/rbm-rnn.png"; align="center" 
width="500px"/>
 <span><strong>Figure 3 - Convert connections in RBM and RNN.</strong></span>
 
 
@@ -123,7 +123,7 @@ over multiple workers.
 
 ### Batch and feature dimension
 
-<img src="http://singa.incubator.apache.org/assets/image/partition_fc.png"; 
align="center" width="400px"/>
+<img src="http://singa.incubator.apache.org/images/partition_fc.png"; 
align="center" width="400px"/>
 <span><strong>Figure 4 - Partitioning of a fully connected 
layer.</strong></span>
 
 
@@ -325,4 +325,3 @@ parameters.  For example, to implement t
 [DCNN model](http://arxiv.org/abs/1404.5997), we set `partition_dim = 0` for
 lower layers and `partition_dim = 1` for higher layers.
 
-{% endcomment %}

Modified: incubator/singa/site/trunk/content/markdown/docs/neural-net.md~
URL: 
http://svn.apache.org/viewvc/incubator/singa/site/trunk/content/markdown/docs/neural-net.md%7E?rev=1700814&r1=1700813&r2=1700814&view=diff
==============================================================================
--- incubator/singa/site/trunk/content/markdown/docs/neural-net.md~ (original)
+++ incubator/singa/site/trunk/content/markdown/docs/neural-net.md~ Wed Sep  2 
13:39:42 2015
@@ -1,10 +1,4 @@
----
-layout: post
-title: NeuralNet
-category : docs
-tags : [installation, examples]
----
-{% include JB/setup %}
+# Neural Net
 
 `NeuralNet` in SINGA represents an instance of user's neural net model. As the
 neural net typically consists of a set of layers, `NeuralNet` comprises

Modified: incubator/singa/site/trunk/content/markdown/index.md
URL: 
http://svn.apache.org/viewvc/incubator/singa/site/trunk/content/markdown/index.md?rev=1700814&r1=1700813&r2=1700814&view=diff
==============================================================================
--- incubator/singa/site/trunk/content/markdown/index.md (original)
+++ incubator/singa/site/trunk/content/markdown/index.md Wed Sep  2 13:39:42 
2015
@@ -1,35 +1,88 @@
-## Welcome to Apache SINGA
+NOTICE: We are organizing a [workshop on deep 
learning](http://singa.incubator.apache.org/workshop).
 
-___
+### Getting Started
+* The [Introduction](http://singa.incubator.apache.org{% post_url 
/docs/2015-01-01-overview %}) page gives an overview of SINGA.
 
-### Quick Start
-Please follow the [quick start](quick-start.html)
-guide to download, install and run SINGA.
+* The [Installation](http://singa.incubator.apache.org{% post_url 
/docs/2015-01-20-installation %})
+guide describes details on downloading and installing SINGA.
+
+* Please follow the [Quick Start](http://singa.incubator.apache.org{% post_url 
/docs/2015-01-10-quick-start %})
+guide to run simple applications on SINGA.
 
 ### Documentation
-* Documentations are listed [here](docs.html).
-* Code API can be found [here](api/index.html).
+* Documentations are listed 
[here](http://singa.incubator.apache.org/docs.html).
+* Code API can be found 
[here](http://singa.incubator.apache.org/api/index.html).
+* Research publication list is available 
[here](http://singa.incubator.apache.org/research/publication).
 
-### How to Contribute
+### How to contribute
 
-* Please subscribe to our development mailing list 
[email protected].
+* Please subscribe to our development mailing list 
[email protected].
 * If you find any issues using SINGA, please report it to the
-[Issue Tracker](community/issue-tracking.html).
+[Issue Tracker](https://issues.apache.org/jira/browse/singa).
+* You can also contact with [SINGA 
committers](http://singa.incubator.apache.org/dev/community) directly.
+
+More details on contributing to SINGA is described [here](dev/contribute).
+
+
+### Recent News
+* SINGA will be presented at [BOSS](http://boss.dima.tu-berlin.de/) of
+[VLDB 2015](http://www.vldb.org/2015/) at Hawai'i, 1 Sep, 2015.
+
+* We will present SINGA at [ADSC/I2R Deep Learning 
Workshop](http://adsc.illinois.edu/contact-us), 25 Aug, 2015.
+
+* We will give a talk on SINGA at VLDB summer school at Tsinghua University,
+ 25-31 July, 2015.
+
+* We will give a tutorial on SINGA at I2R, 29 June, 2015.
 
-More details on contributing to SINGA is described 
[here](develop/how-contribute.html).
+* SINGA will go to [DanaC](http://danac.org/) of
+[SIGMOD 2015](http://www.sigmod2015.org/index.shtml) at Melbourne, 31 May - 4
+June, 2015.
+
+* SINGA has been accepted by [Apache Incubator](http://incubator.apache.org/),
+ 17 March, 2015.
+
+
+### Citing SINGA
+
+Please cite the following two papers if you use SINGA in your research:
+
+* B. C. Ooi, K.-L. Tan, S. Wang, W. Wang, Q. Cai, G. Chen, J. Gao, Z. Luo,
+A. K. H. Tung, Y. Wang, Z. Xie, M. Zhang, and K. Zheng. [SINGA: A distributed
+deep learning platform](http://www.comp.nus.edu.sg/~ooibc/singaopen-mm15.pdf). 
ACM Multimedia
+ (Open Source Software Competition) 2015 
([BibTex](http://singa.incubator.apache.org/assets/file/bib-oss.txt)).
+
+* W. Wang, G. Chen, T. T. A. Dinh, B. C. Ooi, K.-L.Tan, J. Gao, and S. Wang.
+[SINGA:putting deep learning in the hands of multimedia 
users](http://www.comp.nus.edu.sg/~ooibc/singa-mm15.pdf).
+ACM Multimedia 2015 
([BibTex](http://singa.incubator.apache.org/assets/file/bib-singa.txt)).
 
 ### License
 SINGA is released under [Apache License Version 
2.0](http://www.apache.org/licenses/LICENSE-2.0).
 
-### Recent News
-* SINGA will be presented at [BOSS](http://boss.dima.tu-berlin.de/) of [VLDB 
2015](http://www.vldb.org/2015/) at Hawai'i, 1 Sep, 2015.                 
-                                                                               
 
-* We will give a talk on SINGA at VLDB summer school at Tsinghua University, 
25-31 July, 2015.                                                              
-                                                                               
 
-* We will give a tutorial on SINGA at I2R Singapore, 29 June, 2015.            
           
-                                                                               
 
-* SINGA will go to [DanaC](http://danac.org/) of [SIGMOD 
2015](http://www.sigmod2015.org/index.shtml) at Melbourne, 31 May - 4 June, 
2015.                                                                       
-                                                                               
   
-* SINGA has been accepted by [Apache Incubator](http://incubator.apache.org/), 
17 March, 2015.       
 
+### Co-Sponsors
+
+<div >
+<img src="http://singa.incubator.apache.org/iamges/nus.png"; width="170px"/>
+&nbsp;&nbsp;
+<img src="http://singa.incubator.apache.org/iamges/astar.jpg"; width="200px"/>
+&nbsp;&nbsp;
+<img src="http://singa.incubator.apache.org/iamges/nrf_logo.png"; 
width="270px"/>
+&nbsp;&nbsp;<br/><br/>
+<img src="http://singa.incubator.apache.org/iamges/netease.png"; width="200px"/>
+&nbsp;&nbsp;
+<img src="http://singa.incubator.apache.org/iamges/sutd.png"; width="160px"/>
+&nbsp;&nbsp; &nbsp;&nbsp;
+<img src="http://singa.incubator.apache.org/iamges/zheda.png"; width="100px"/>
+</div>
+
+
+<!--
+### Other Pages
+<ul class="posts">
+  {% for post in site.posts %}
+    <li> <a href="http://singa.incubator.apache.org{{ post.url }}">{{ 
post.title }}</a></li>
+  {% endfor %}
+</ul>
+-->
 

Modified: incubator/singa/site/trunk/content/site.xml
URL: 
http://svn.apache.org/viewvc/incubator/singa/site/trunk/content/site.xml?rev=1700814&r1=1700813&r2=1700814&view=diff
==============================================================================
--- incubator/singa/site/trunk/content/site.xml (original)
+++ incubator/singa/site/trunk/content/site.xml Wed Sep  2 13:39:42 2015
@@ -54,12 +54,16 @@
     </menu>
 
     <menu name="Documentaion">
+      <item name="Introduction" href="docs/overview.html"/>
       <item name="Installation" href="docs/installation.html"/>
+      <item name="Quick Start" href="docs/quick-start.html"/>
       <item name="Programmer Guide" href="docs/programmer-guide.html">
         <item name ="Model Configuration" href="docs/model-config.html"/>
-        <item name="Neural Network" href="docs/neuralnet.html"/>
+        <item name="Neural Network" href="docs/neural-net.html"/>
         <item name="Layer" href="docs/layer.html"/>
         <item name="Param" href="docs/param.html"/>
+        <item name="TrainOneBatch" href="docs/train-one-batch.html"/>
+        <item name="Updater" href="docs/updater.html"/>
       </item>
       <item name="Distributed Training" href="docs/distributed-training.html">
         <item name="System Architecture" href="docs/architecture.html"/>
@@ -68,7 +72,12 @@
       </item>
       <item name="Data Preparation" href="docs/data.html"/>
       <item name="Checkpoint" href="docs/checkpoint.html"/>
-      <item name="Examples" href="docs/examples.html"/>
+      <item name="Examples" href="docs/examples.html">
+        <item name="CNN" href="docs/cnn.html"/>
+        <item name="MLP" href="docs/mlp.html"/>
+        <item name="RBM + Auto-encoder" href="docs/rbm.html"/>
+        <item name="RNN" href="docs/rnn.html"/>
+      </item>
       <item name="Debug" href="docs/debug.html"/>
     </menu>
 


Reply via email to