Author: wangwei
Date: Thu Sep 1 09:11:07 2016
New Revision: 1758742
URL: http://svn.apache.org/viewvc?rev=1758742&view=rev
Log:
add link to whl files for mac osx
Modified:
incubator/singa/site/trunk/en/docs/installation.html
Modified: incubator/singa/site/trunk/en/docs/installation.html
URL:
http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/docs/installation.html?rev=1758742&r1=1758741&r2=1758742&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/docs/installation.html (original)
+++ incubator/singa/site/trunk/en/docs/installation.html Thu Sep 1 09:11:07
2016
@@ -291,6 +291,12 @@ $ export SINGA_WHEEL_URL=http://comp.nus
# Ubuntu/Linux 64-bit, CPU only, Python 2.7, Protobuf 2.6
$ export
SINGA_WHEEL_URL=http://comp.nus.edu.sg/~dbsystem/singa/assets/file/pb2.6/singa-1.0.0-cp27-none-linux_x86_64.whl
+# Mac OSX (10.11), CPU only, Python 2.7, Protobuf 2.5
+$ export
SINGA_WHEEL_URL=http://comp.nus.edu.sg/~dbsystem/singa/assets/file/pb2.5/singa-1.0.0-cp27-none-macosx_10_11_intel.whl
+
+# Mac OSX (10.11), CPU only, Python 2.7, Protobuf 2.6
+$ export
SINGA_WHEEL_URL=http://comp.nus.edu.sg/~dbsystem/singa/assets/file/pb2.6/singa-1.0.0-cp27-none-macosx_10_11_intel.whl
+
# Ubuntu/Linux 64-bit, GPU enabled, Python 2.7, Protobuf 2.5, CUDA toolkit 7.5
and CuDNN v5
$ export
SINGA_WHEEL_URL=http://comp.nus.edu.sg/~dbsystem/singa/assets/file/pb2.5-cuda7.5-cudnn5/singa-1.0.0-cp27-none-linux_x86_64.whl
@@ -329,12 +335,11 @@ To build cnmem into the wheel file, plea
</div>
<div class="section" id="build-singa-from-source">
<span id="build-singa-from-source"></span><h2>Build SINGA from source<a
class="headerlink" href="#build-singa-from-source" title="Permalink to this
headline">¶</a></h2>
-<p>The source files could be downloaded either as a <a class="reference
external"
href="https://dist.apache.org/repos/dist/dev/incubator/singa/1.0.0/apache-singa-incubating-1.0.0-RC2.tar.gz";>tar.gz
file</a>,
-or as a git repo</p>
+<p>The source files could be downloaded either as a <a class="reference
external"
href="https://dist.apache.org/repos/dist/dev/incubator/singa/1.0.0/apache-singa-incubating-1.0.0-RC2.tar.gz";>tar.gz
file</a>, or as a git repo</p>
<div class="highlight-default"><div class="highlight"><pre>$ git clone
https://github.com/apache/incubator-singa.git
$ cd incubator-singa/
-# If you use CUDA, then [CNMeM](https://github.com/NVIDIA/cnmem) is necessary,
+# If you use CUDA, then CNMeM is necessary
$ git submodule init
$ git submodule update
</pre></div>
@@ -357,8 +362,12 @@ $ export CMAKE_LIBRARY_PATH=<path to
</pre></div>
</div>
<p>You can use <code class="docutils literal"><span class="pre">ccmake</span>
<span class="pre">..</span></code> to configure the compilation options
including using
-generating python binding and changing the installation folder.
-If the dependent libraries are not in the system default paths, you need to
export
+generating python binding and changing the installation folder. Alternatively,
+the options could be switched on by</p>
+<div class="highlight-default"><div class="highlight"><pre>$ cmake
-DUSE_CUDA=ON -DUSE_PYTHON=ON ..
+</pre></div>
+</div>
+<p>If the dependent libraries are not in the system default paths, you need to
export
the following environment variables</p>
<div class="highlight-default"><div class="highlight"><pre><span
class="n">export</span> <span class="n">CMAKE_INCLUDE_PATH</span><span
class="o">=<</span><span class="n">path</span> <span class="n">to</span>
<span class="n">your</span> <span class="n">header</span> <span
class="n">file</span> <span class="n">folder</span><span class="o">></span>
<span class="n">export</span> <span class="n">CMAKE_LIBRARY_PATH</span><span
class="o">=<</span><span class="n">path</span> <span class="n">to</span>
<span class="n">your</span> <span class="n">lib</span> <span
class="n">file</span> <span class="n">folder</span><span class="o">></span>
