Author: wangsh
Date: Wed May 13 04:27:08 2015
New Revision: 1679136
URL: http://svn.apache.org/r1679136
Log:
adjust image size and add copyright in footer
Modified:
incubator/singa/site/trunk/content/markdown/docs/architecture.md
incubator/singa/site/trunk/content/markdown/docs/code-structure.md
incubator/singa/site/trunk/content/markdown/docs/neuralnet-partition.md
incubator/singa/site/trunk/content/markdown/index.md
incubator/singa/site/trunk/content/markdown/introduction.md
incubator/singa/site/trunk/content/resources/css/site.css
incubator/singa/site/trunk/content/site.xml
Modified: incubator/singa/site/trunk/content/markdown/docs/architecture.md
URL:
http://svn.apache.org/viewvc/incubator/singa/site/trunk/content/markdown/docs/architecture.md?rev=1679136&r1=1679135&r2=1679136&view=diff
==============================================================================
--- incubator/singa/site/trunk/content/markdown/docs/architecture.md (original)
+++ incubator/singa/site/trunk/content/markdown/docs/architecture.md Wed May 13
04:27:08 2015
@@ -63,8 +63,8 @@ We put automatic optimization of the con
#### No Partition of ParamShard
<img src="../images/arch/arch1.png" align="center" width="550px"/>
-<p><strong> Fig.2 - Physical system architecture without partitioning
-ParamShard</strong></p>
+<p><strong> Fig.2 - Physical system architecture without
+partitioning ParamShard</strong></p>
Fig.2 shows the architecture by configuring three threads per worker group, two
threads per server group, two worker groups and one server group per process.
Modified: incubator/singa/site/trunk/content/markdown/docs/code-structure.md
URL:
http://svn.apache.org/viewvc/incubator/singa/site/trunk/content/markdown/docs/code-structure.md?rev=1679136&r1=1679135&r2=1679136&view=diff
==============================================================================
--- incubator/singa/site/trunk/content/markdown/docs/code-structure.md
(original)
+++ incubator/singa/site/trunk/content/markdown/docs/code-structure.md Wed May
13 04:27:08 2015
@@ -6,7 +6,7 @@ ___
#### Main Classes
-<img src="../images/code-structure/main.jpg" style="width:70%;"
align="center"/>
+<img src="../images/code-structure/main.jpg" width="550px"/>
* **Worker**: start the solver to conduct training or resume from previous
training snapshots.
* **Solver**: construct the neural network and run training algorithms over
it. Validation and testing is also done by the solver along the training.
@@ -19,7 +19,7 @@ ___
#### Data types
-<img src="../images/code-structure/layer.jpg" style="width:90%;"
align="center"/>
+<img src="../images/code-structure/layer.jpg" width="700px"/>
* **ComputeFeature**: read data (neurons) from in-coming layers, and compute
the data
of itself according to layer type. This function can be overrided to
implement different
@@ -30,7 +30,7 @@ ___
We adpat the implementation for **PoolingLayer**, **Im2colLayer** and
**LRNLayer** from [Caffe](http://caffe.berkeleyvision.org/).
-<img src="../images/code-structure/darray.jpg" style="width:55%;"
align="center"/>
+<img src="../images/code-structure/darray.jpg" width="400px"/>
* **DArray**: provide the abstraction of distributed array on multiple nodes,
supporting array/matrix operations and element-wise operations. Users can
use it as a local structure.
@@ -48,7 +48,7 @@ We adpat the implementation for **Poolin
#### Main classes
-<img src="../images/code-structure/uml.jpg" style="width:90%;" align="center"/>
+<img src="../images/code-structure/uml.jpg" width="750px"/>
* **NetworkService**: provide access to the network (sending and receiving
messages). It maintains a queue for received messages, implemented by
NetworkQueue.
* **RequestDispatcher**: pick up next message (request) from the queue, and
invoked a method (callback) to process them.
@@ -57,19 +57,16 @@ We adpat the implementation for **Poolin
#### Data types
-<img src="../images/code-structure/type.jpg" style="width:400px;"
align="middle"/>
+<img src="../images/code-structure/type.jpg" width="400px"/>
Table related messages are either of type **RequestBase** which contains
different types of request, or of type **TableData** containing a key-value
tuple.
#### Control flow and thread model
-
+<img src="../images/code-structure/threads.jpg" alt="uml" width="1000px"/>
The figure above shows how a GET request sent from a worker is processed by the
table server. The control flow for other types of requests is similar. At
the server side, there are at least 3 threads running at any time: two by
NetworkService for sending and receiving message, and at least one by the
RequestDispatcher for dispatching requests.
-
-
-
Modified:
incubator/singa/site/trunk/content/markdown/docs/neuralnet-partition.md
URL:
http://svn.apache.org/viewvc/incubator/singa/site/trunk/content/markdown/docs/neuralnet-partition.md?rev=1679136&r1=1679135&r2=1679136&view=diff
==============================================================================
--- incubator/singa/site/trunk/content/markdown/docs/neuralnet-partition.md
(original)
+++ incubator/singa/site/trunk/content/markdown/docs/neuralnet-partition.md Wed
May 13 04:27:08 2015
@@ -16,7 +16,7 @@ for each layer. Secondly, for one layer,
the instances (e.g, images). They are called layer partition and data partition
respectively. We illustrate the two types of partitions using an simple
convolutional neural network.
-<img src="../images/conv-mnist.png" align="center" width="200px"/>
+<img src="../images/conv-mnist.png" align="center" width="220px"/>
The above figure shows a convolutional neural network without any partition. It
has 8 layers in total (one rectangular represents one layer). The first layer
is
@@ -29,7 +29,7 @@ sub-samples the images. The fc1 layer is
mulitplies each image with a weight matrix to generate a 10 dimension hidden
feature which
is then normalized by a SoftmaxLossLayer to get the prediction.
-<img src="../images/conv-mnist-datap.png" align="center" width="400px"/>
+<img src="../images/conv-mnist-datap.png" align="center" width="1000px"/>
The above figure shows the convolutional neural network after partitioning all
layers
except the DataLayer and ParserLayers, into 3 partitions using data partition.
@@ -40,7 +40,7 @@ Layers of the same color resident in the
across different workers at the boundary layers (i.e., BridgeSrcLayer and
BridgeDstLayer),
e.g., between s-slice-mnist-conv1 and d-slice-mnist-conv1.
-<img src="../images/conv-mnist-layerp.png" align="center" width="400px"/>
+<img src="../images/conv-mnist-layerp.png" align="center" width="1000px"/>
The above figure shows the convolutional neural network after partitioning all
layers
except the DataLayer and ParserLayers, into 2 partitions using layer
partition. We can
Modified: incubator/singa/site/trunk/content/markdown/index.md
URL:
http://svn.apache.org/viewvc/incubator/singa/site/trunk/content/markdown/index.md?rev=1679136&r1=1679135&r2=1679136&view=diff
==============================================================================
--- incubator/singa/site/trunk/content/markdown/index.md (original)
+++ incubator/singa/site/trunk/content/markdown/index.md Wed May 13 04:27:08
2015
@@ -1,4 +1,4 @@
-## Welcome to SINGA
+## Welcome to Apache SINGA
___
Modified: incubator/singa/site/trunk/content/markdown/introduction.md
URL:
http://svn.apache.org/viewvc/incubator/singa/site/trunk/content/markdown/introduction.md?rev=1679136&r1=1679135&r2=1679136&view=diff
==============================================================================
--- incubator/singa/site/trunk/content/markdown/introduction.md (original)
+++ incubator/singa/site/trunk/content/markdown/introduction.md Wed May 13
04:27:08 2015
@@ -55,7 +55,8 @@ Considering extensibility, we make our c
for programmers to override.
### System Overview
-
+
+<img src="images/software_stack.jpg" alt="SINGA software stack" width="700px"/>
Three goals are considered in designing SINGA, namely ease of use, scalability
and extensibility.
We will introduce them together with the software stack as shown in the above
figure.
Modified: incubator/singa/site/trunk/content/resources/css/site.css
URL:
http://svn.apache.org/viewvc/incubator/singa/site/trunk/content/resources/css/site.css?rev=1679136&r1=1679135&r2=1679136&view=diff
==============================================================================
--- incubator/singa/site/trunk/content/resources/css/site.css (original)
+++ incubator/singa/site/trunk/content/resources/css/site.css Wed May 13
04:27:08 2015
@@ -0,0 +1,6 @@
+.centered{
+ text-align:center;
+ margin-top:0px;
+ margin-bottom:0px;
+ padding:0px;
+}
Modified: incubator/singa/site/trunk/content/site.xml
URL:
http://svn.apache.org/viewvc/incubator/singa/site/trunk/content/site.xml?rev=1679136&r1=1679135&r2=1679136&view=diff
==============================================================================
--- incubator/singa/site/trunk/content/site.xml (original)
+++ incubator/singa/site/trunk/content/site.xml Wed May 13 04:27:08 2015
@@ -34,7 +34,7 @@
<version position="none"/>
<poweredBy>
- <logo name="apache-incubator" alt="Apache Incubator"
img="http://incubator.apache.org/images/egg-logo.png";
href="http://incubator.apache.org"/>
+ <logo name="apache-incubator" alt="Apache Incubator"
img="http://incubator.apache.org/images/egg-logo.png";
href="http://incubator.apache.org"; width="180"/>
</poweredBy>
<skin>
@@ -64,10 +64,17 @@
<item name="Programming Model" href="docs/programming-model.html"/>
</menu>
+ <menu name="Community">
+ </menu>
+
<menu name="External Links">
<item name="Apache Software Foundation" href="http://www.apache.org/"/>
</menu>
+ <footer>
+ <p>Copyright © 2015 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>
+ </footer>
+
</body>
<custom>
![http://incubator.apache.org/images/egg-logo.png"](http://incubator.apache.org/images/egg-logo.png"){kind=link}