Author: wangwei
Date: Tue Apr 18 03:28:16 2017
New Revision: 1791734
URL: http://svn.apache.org/viewvc?rev=1791734&view=rev
Log:
update the docs by jenkins for commit 48820b1
Modified:
incubator/singa/site/trunk/en/_sources/docs/installation.md.txt
incubator/singa/site/trunk/en/_sources/index.rst.txt
incubator/singa/site/trunk/en/docs/installation.html
incubator/singa/site/trunk/en/index.html
incubator/singa/site/trunk/en/searchindex.js
Modified: incubator/singa/site/trunk/en/_sources/docs/installation.md.txt
URL:
http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/_sources/docs/installation.md.txt?rev=1791734&r1=1791733&r2=1791734&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/_sources/docs/installation.md.txt (original)
+++ incubator/singa/site/trunk/en/_sources/docs/installation.md.txt Tue Apr 18
03:28:16 2017
@@ -9,13 +9,13 @@ Currently, SINGA has conda packages (Pyt
1. CPU only
- conda install -c nusdbsystem singa
+ conda install -c nusdbsystem singa
2. GPU via CUDA+cuDNN
- conda install -c nusdbsystem singa-cudax.y-cudnnz
+ conda install -c nusdbsystem singa-cudax.y-cudnnz
- where `x.y,z` is one of <8.0, 5>, <7.5, 5> and <7.5, 4>.
+ where <x,y,z> is one of <8.0, 5>, <7.5, 5> and <7.5, 4>.
Users need to install CUDA and cuDNN before installing SINGA.
If cuDNN is not in system folders (e.g., /usr/local), export the folder of
libcudnn.so to LD_LIBRARY_PATH
@@ -46,23 +46,34 @@ The following Debian packages (on archit
<th>Link</th>
</tr>
<tr>
- <td>Ubuntu16.04</td>
+ <td>Ubuntu14.04</td>
<td>CPU</td>
<td>-</td>
- <td><a
href="http://comp.nus.edu.sg/~dbsystem/singa/assets/file/debian/latest/ubuntu16.04-cpp/python-singa-1.1.0.deb";>latest</a>,
<a
href="http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/debian";>history</a></td>
+ <td><a
href="http://comp.nus.edu.sg/~dbsystem/singa/assets/file/debian/latest/ubuntu14.04-cpp/python-singa.deb";>latest</a>,
<a
href="http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/debian";>history</a></td>
</tr>
<tr>
- <td>Ubuntu16.04</td>
+ <td>Ubuntu14.04</td>
+ <td>GPU</td>
+ <td>CUDA7.5+cuDNN4</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Ubuntu14.04</td>
+ <td>GPU</td>
+ <td>CUDA7.5+cuDNN5</td>
+ <td>coming soon</td>
+ </tr>
+ <tr>
+ <td>Ubuntu14.04</td>
<td>GPU</td>
<td>CUDA8.0+cuDNN5</td>
- <td><a
href="http://comp.nus.edu.sg/~dbsystem/singa/assets/file/debian/latest/ubuntu16.04-cuda/python-singa-cuda-1.1.0.deb";>latest</a>,
<a
href="http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/debian";>history</a></td>
+ <td></td>
</tr>
</table>
Download the deb file and install it via
- dpkg -i <path to the deb file, e.g., ./python-singa-1.1.0.deb>
- apt-get install -f
+ apt-get install <path to the deb file, e.g., ./python-singa.deb>
Note that the path must include `./` if the file in inside the current folder.
Modified: incubator/singa/site/trunk/en/_sources/index.rst.txt
URL:
http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/_sources/index.rst.txt?rev=1791734&r1=1791733&r2=1791734&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/_sources/index.rst.txt (original)
+++ incubator/singa/site/trunk/en/_sources/index.rst.txt Tue Apr 18 03:28:16
2017
@@ -68,27 +68,6 @@ Getting Started
* Refer to the `Jupyter notebooks
<http://nbviewer.jupyter.org/github/apache/incubator-singa/blob/master/doc/en/docs/notebook/index.ipynb>`_
for some basic examples and the `model zoo page
<./docs/model_zoo/index.html>`_ for more examples.
-.. |logo1| image:: _static/github.png
- :scale: 100%
- :align: middle
- :target: https://github.com/apache/incubator-singa
-.. |logo2| image:: _static/awsmp.gif
- :scale: 100%
- :align: middle
- :target:
https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c
-.. |logo3| image:: _static/docker.png
- :scale: 50%
- :align: middle
- :target: https://hub.docker.com/r/nusdbsystem/singa/
-.. |logo4| image:: _static/jupyter.png
- :scale: 25%
- :align: middle
- :target:
http://nbviewer.jupyter.org/github/apache/incubator-singa/blob/master/doc/en/docs/notebook/index.ipynb
-
-+---------+---------+---------+---------+
-| |logo1| | |logo2| | |logo3| | |logo4| |
-+---------+---------+---------+---------+
-
Documentation
-------------
Modified: incubator/singa/site/trunk/en/docs/installation.html
URL:
http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/docs/installation.html?rev=1791734&r1=1791733&r2=1791734&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/docs/installation.html (original)
+++ incubator/singa/site/trunk/en/docs/installation.html Tue Apr 18 03:28:16
2017
@@ -196,15 +196,11 @@ Currently, SINGA has conda packages (Pyt
<span id="linux"></span><h3>Linux<a class="headerlink" href="#linux"
title="Permalink to this headline">¶</a></h3>
<ol>
<li><p class="first">CPU only</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span> <span
class="n">conda</span> <span class="n">install</span> <span
class="o">-</span><span class="n">c</span> <span class="n">nusdbsystem</span>
<span class="n">singa</span>
-</pre></div>
-</div>
+<p>conda install -c nusdbsystem singa</p>
</li>
<li><p class="first">GPU via CUDA+cuDNN</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span> <span
class="n">conda</span> <span class="n">install</span> <span
class="o">-</span><span class="n">c</span> <span class="n">nusdbsystem</span>
<span class="n">singa</span><span class="o">-</span><span
class="n">cudax</span><span class="o">.</span><span class="n">y</span><span
class="o">-</span><span class="n">cudnnz</span>
-</pre></div>
-</div>
-<p>where <code class="docutils literal"><span class="pre">x.y,z</span></code>
is one of <8.0, 5>, <7.5, 5> and <7.5, 4>.
+<p>conda install -c nusdbsystem singa-cudax.y-cudnnz</p>
+<p>where <x,y,z> is one of <8.0, 5>, <7.5, 5> and <7.5,
4>.
Users need to install CUDA and cuDNN before installing SINGA.
If cuDNN is not in system folders (e.g., /usr/local), export the folder of
libcudnn.so to LD_LIBRARY_PATH</p>
</li>
@@ -235,20 +231,31 @@ If cuDNN is not in system folders (e.g.,
<th>Link</th>
</tr>
<tr>
- <td>Ubuntu16.04</td>
+ <td>Ubuntu14.04</td>
<td>CPU</td>
<td>-</td>
- <td><a
href="http://comp.nus.edu.sg/~dbsystem/singa/assets/file/debian/latest/ubuntu16.04-cpp/python-singa-1.1.0.deb";>latest</a>,
<a
href="http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/debian";>history</a></td>
+ <td><a
href="http://comp.nus.edu.sg/~dbsystem/singa/assets/file/debian/latest/ubuntu14.04-cpp/python-singa.deb";>latest</a>,
<a
href="http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/debian";>history</a></td>
+ </tr>
+ <tr>
+ <td>Ubuntu14.04</td>
+ <td>GPU</td>
+ <td>CUDA7.5+cuDNN4</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Ubuntu14.04</td>
+ <td>GPU</td>
+ <td>CUDA7.5+cuDNN5</td>
+ <td>coming soon</td>
</tr>
<tr>
- <td>Ubuntu16.04</td>
+ <td>Ubuntu14.04</td>
<td>GPU</td>
<td>CUDA8.0+cuDNN5</td>
- <td><a
href="http://comp.nus.edu.sg/~dbsystem/singa/assets/file/debian/latest/ubuntu16.04-cuda/python-singa-cuda-1.1.0.deb";>latest</a>,
<a
href="http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/debian";>history</a></td>
+ <td></td>
</tr>
</table><p>Download the deb file and install it via</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span
class="n">dpkg</span> <span class="o">-</span><span class="n">i</span> <span
class="o"><</span><span class="n">path</span> <span class="n">to</span>
<span class="n">the</span> <span class="n">deb</span> <span
class="n">file</span><span class="p">,</span> <span class="n">e</span><span
class="o">.</span><span class="n">g</span><span class="o">.</span><span
class="p">,</span> <span class="o">./</span><span class="n">python</span><span
class="o">-</span><span class="n">singa</span><span class="o">-</span><span
class="mf">1.1</span><span class="o">.</span><span class="mf">0.</span><span
class="n">deb</span><span class="o">></span>
-<span class="n">apt</span><span class="o">-</span><span class="n">get</span>
<span class="n">install</span> <span class="o">-</span><span class="n">f</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span
class="n">apt</span><span class="o">-</span><span class="n">get</span> <span
class="n">install</span> <span class="o"><</span><span class="n">path</span>
<span class="n">to</span> <span class="n">the</span> <span class="n">deb</span>
<span class="n">file</span><span class="p">,</span> <span
class="n">e</span><span class="o">.</span><span class="n">g</span><span
class="o">.</span><span class="p">,</span> <span class="o">./</span><span
class="n">python</span><span class="o">-</span><span
class="n">singa</span><span class="o">.</span><span class="n">deb</span><span
class="o">></span>
</pre></div>
</div>
<p>Note that the path must include <code class="docutils literal"><span
class="pre">./</span></code> if the file in inside the current folder.</p>
Modified: incubator/singa/site/trunk/en/index.html
URL:
http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/index.html?rev=1791734&r1=1791733&r2=1791734&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/index.html (original)
+++ incubator/singa/site/trunk/en/index.html Tue Apr 18 03:28:16 2017
@@ -179,21 +179,6 @@
<li>Install SINGA via <a class="reference external"
href="./docs/installation.html#from-wheel">python wheel files</a>, <a
class="reference external"
href="./docs/installation.html#from-debian-package">Debian packages</a> or from
<a class="reference external"
href="./docs/installation.html#from-source">source</a>.</li>
<li>Refer to the <a class="reference external"
href="http://nbviewer.jupyter.org/github/apache/incubator-singa/blob/master/doc/en/docs/notebook/index.ipynb";>Jupyter
notebooks</a> for some basic examples and the <a class="reference external"
href="./docs/model_zoo/index.html">model zoo page</a> for more examples.</li>
</ul>
-<table border="1" class="docutils">
-<colgroup>
-<col width="25%" />
-<col width="25%" />
-<col width="25%" />
-<col width="25%" />
-</colgroup>
-<tbody valign="top">
-<tr class="row-odd"><td><a class="reference external"
href="https://github.com/apache/incubator-singa";><img alt="logo1"
class="align-middle" src="_static/github.png" style="width: 64.0px; height:
64.0px;" /></a></td>
-<td><a class="reference external"
href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c";><img
alt="logo2" class="align-middle" src="_static/awsmp.gif" style="width:
120.0px; height: 60.0px;" /></a></td>
-<td><a class="reference external"
href="https://hub.docker.com/r/nusdbsystem/singa/";><img alt="logo3"
class="align-middle" src="_static/docker.png" style="width: 166.5px; height:
57.5px;" /></a></td>
-<td><a class="reference external"
href="http://nbviewer.jupyter.org/github/apache/incubator-singa/blob/master/doc/en/docs/notebook/index.ipynb";><img
alt="logo4" class="align-middle" src="_static/jupyter.png" style="width:
100.0px; height: 100.0px;" /></a></td>
-</tr>
-</tbody>
-</table>
</div>
<div class="section" id="documentation">
<h2>Documentation<a class="headerlink" href="#documentation" title="Permalink
to this headline">¶</a></h2>
