Author: edwardyoon
Date: Mon Jul 6 01:35:25 2015
New Revision: 1689304
URL: http://svn.apache.org/r1689304
Log:
Update website
Modified:
hama/site/trunk/css/site.css
hama/site/trunk/index.html
Modified: hama/site/trunk/css/site.css
URL:
http://svn.apache.org/viewvc/hama/site/trunk/css/site.css?rev=1689304&r1=1689303&r2=1689304&view=diff
==============================================================================
--- hama/site/trunk/css/site.css (original)
+++ hama/site/trunk/css/site.css Mon Jul 6 01:35:25 2015
@@ -16,11 +16,11 @@
*/
#breadcrumbs { display:none; }
-#bannerRight { margin-right: 350px; }
+#bannerRight { margin-right: 365px; }
#bodyColumn { margin-top: 40px; }
body {
- font: large/1.35 "Linux Libertine", Palatino, "Palatino Linotype", "Book
Antiqua", Georgia, "Times New Roman", serif; word-spacing: 0.13em;
+ font: large/1 "Linux Libertine", Palatino, "Palatino Linotype", "Book
Antiqua", Georgia, "Times New Roman", serif; word-spacing: 0.12em;
}
body a:link {
color: #74240f; text-decoration: underline;
@@ -51,6 +51,8 @@ h3 {
pre {
width: 95%;
margin: 20px 20px 20px 20px;
+ font-family: Consolas, monospace;
+ word-spacing: 0em;
}
.green {
Modified: hama/site/trunk/index.html
URL:
http://svn.apache.org/viewvc/hama/site/trunk/index.html?rev=1689304&r1=1689303&r2=1689304&view=diff
==============================================================================
--- hama/site/trunk/index.html (original)
+++ hama/site/trunk/index.html Mon Jul 6 01:35:25 2015
@@ -188,11 +188,31 @@
<p>
-<div style="float:left;margin-right:15px;margin-bottom:5px;"><img
src="./images/hama_art_arthur_300x220.png" style="width:250px" alt="" /></div>
Apache Hama<sup>TM</sup> is a general BSP computing engine on top of Hadoop,
which was established in 2012 as a Top-Level Project of The Apache Software
Foundation.
- <br /><br />It provides High-Performance computing engine for performing
massive scientific and iterative algorithms on existing open source or
enterprise Hadoop cluster,
- such as Matrix, Graph, and Machine Learning.<br />
+<div style="float:left;margin-right:15px;margin-top:25px;"><img
src="./images/hama_art_arthur_300x220.png" style="width:260px" alt="" /></div>
+ Apache Hama<sup>TM</sup> is a framework for Big Data analytics which uses
the Bulk Synchronous Parallel (BSP) computing model,
+ which was established in 2012 as a Top-Level Project of The Apache
Software Foundation.
+ <br /><br />It provides not only pure BSP programming model
+ but also vertex and neuron centric programming models, inspired by
Google's Pregel and DistBelief.
+ <br />
</p>
+
+<div align="right">
+
+<div>
+<pre style="width: 625px;">
++---------------------+-------------------------+----------------------------+
+| BSP | Graph | Deep learning |
+| (pure BSP) | (Google's Pregel) | (Google's DistBelief) |
++---------------------+-------------------------+----------------------------+
+| Apache Hama |
+| +--------------------------------------+
+| | YARN |
++-------------------------------------+--------------------------------------+
+| Hadoop HDFS |
++----------------------------------------------------------------------------+</pre></div>
+</div>
+
<div class="green">
@@ -224,9 +244,15 @@
<li><a href="hama_on_clouds.html">Launch a Hama cluster</a> on Clouds.</li>
-<li>Hama <a href="hama_bsp_tutorial.html">BSP Tutorial.</a></li>
-
-<li>Hama <a href="hama_graph_tutorial.html">Graph Tutorial.</a></li>
+<li>Programming Tutorials
+<ul>
+
+<li><a href="hama_bsp_tutorial.html">BSP Programming.</a></li>
+
+<li><a href="hama_graph_tutorial.html">Vertex-centric Programming.</a></li>
+
+<li><a href="#a">Neuron-centric Programming.</a></li>
+ </ul></li>
<li><a class="externalLink" href="http://wiki.apache.org/hama";>Learn about</a>
Hama and BSP by reading the documentation.</li>
</ul>
