Modified: incubator/singa/site/trunk/zh/docs/install_macos1013.html URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/zh/docs/install_macos1013.html?rev=1858059&r1=1858058&r2=1858059&view=diff ============================================================================== --- incubator/singa/site/trunk/zh/docs/install_macos1013.html (original) +++ incubator/singa/site/trunk/zh/docs/install_macos1013.html Wed Apr 24 14:57:35 2019 @@ -1,5 +1,5 @@ - + <!DOCTYPE html> <!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]--> @@ -9,7 +9,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <title>Installing SINGA on macOS 13.10 — incubator-singa 2.0.0 documentation</title> + <title>Installing SINGA on macOS 13.10 — incubator-singa 1.1.0 documentation</title> @@ -36,18 +36,18 @@ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" /> <link rel="index" title="Index" href="../genindex.html" /> <link rel="search" title="Search" href="../search.html" /> - <link href="../_static/style.css" rel="stylesheet" type="text/css"> - <!--link href="../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"--> - <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css"; integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous"> - <style> - .fa:hover { - opacity: 0.7; - } - .fab:hover { - opacity: 0.7; - } - </style> - + <link href="../_static/style.css" rel="stylesheet" type="text/css"> + <!--link href="../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"--> + <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css"; integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous"> + <style> + .fa:hover { + opacity: 0.7; + } + .fab:hover { + opacity: 0.7; + } + </style> + </head> <body class="wy-body-for-nav"> @@ -181,14 +181,14 @@ <div class="section" id="requirements"> <h2>Requirements<a class="headerlink" href="#requirements" title="Permalink to this headline">¶</a></h2> <ul class="simple"> -<li>homebrew被ç¨æ¥å®è£ éè¦çåºãå°è¯å¦ä¸æ令ï¼</li> +<li><p>homebrew被ç¨æ¥å®è£ éè¦çåºãå°è¯å¦ä¸æ令ï¼</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>brew update </pre></div> </div> <p>å¦æä½ çç³»ç»ä¸æ²¡æhomebrewæè ä½ å级äºä¹åçæä½ç³»ç»ï¼ä½ å¯è½ä¼çå°é误信æ¯ï¼è¯·åèFAQã</p> <ul class="simple"> -<li>å®è£ å建SINGAéè¦ç软件:</li> +<li><p>å®è£ å建SINGAéè¦ç软件:</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>brew tap homebrew/science brew tap homebrew/python @@ -211,7 +211,7 @@ brew install wget </pre></div> </div> <ul class="simple"> -<li>åå¤ç¼è¯å¨</li> +<li><p>åå¤ç¼è¯å¨</p></li> </ul> <p>为äºè®©ç¼è¯å¨ï¼åcmakeï¼ç¥éopenblasè·¯å¾ï¼</p> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span><span class="nb">export</span> <span class="nv">CMAKE_INCLUDE_PATH</span><span class="o">=</span>/usr/local/opt/openblas/include:<span class="nv">$CMAKE_INCLUDE_PATH</span> @@ -227,7 +227,7 @@ brew install wget </pre></div> </div> <ul class="simple"> -<li>è·åæºä»£ç 并ç¼è¯å®ï¼</li> +<li><p>è·åæºä»£ç 并ç¼è¯å®ï¼</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>git clone https://github.com/apache/incubator-singa.git @@ -240,14 +240,14 @@ make </pre></div> </div> <ul class="simple"> -<li>å¯éçï¼ å建èæç¯å¢ï¼</li> +<li><p>å¯éçï¼ å建èæç¯å¢ï¼</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>virtualenv ~/venv <span class="nb">source</span> ~/venv/bin/activate </pre></div> </div> <ul class="simple"> -<li>å®è£ python模å</li> +<li><p>å®è£ python模å</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span><span class="nb">cd</span> python pip install . @@ -258,7 +258,7 @@ pip install . </pre></div> </div> <ul class="simple"> -<li>è¿è¡Jupyter notebook</li> +<li><p>è¿è¡Jupyter notebook</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>pip install matplotlib @@ -270,12 +270,12 @@ jupyter notebook <div class="section" id="id1"> <h2>è§é¢æç¨<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2> <p>æ¥ä¸æ¥çæ¥éª¤è¯·åèè§é¢:</p> -<table border="1" class="docutils"> +<table class="docutils align-center"> <colgroup> -<col width="100%" /> +<col style="width: 100%" /> </colgroup> -<tbody valign="top"> -<tr class="row-odd"><td><a class="reference external" href="https://www.youtube.com/watch?v=T8xGTH9vCBs";><img alt="video" class="align-middle" src="https://img.youtube.com/vi/T8xGTH9vCBs/0.jpg"; /></a></td> +<tbody> +<tr class="row-odd"><td><p><a class="reference external" href="https://www.youtube.com/watch?v=T8xGTH9vCBs";><img alt="video" class="align-middle" src="https://img.youtube.com/vi/T8xGTH9vCBs/0.jpg"; /></a></p></td> </tr> </tbody> </table> @@ -283,13 +283,13 @@ jupyter notebook <div class="section" id="faq"> <h2>FAQ<a class="headerlink" href="#faq" title="Permalink to this headline">¶</a></h2> <ul class="simple"> -<li>å¦ä½å®è£ ææ´æ°homebrew:</li> +<li><p>å¦ä½å®è£ ææ´æ°homebrew:</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>/usr/bin/ruby -e <span class="s2">"</span><span class="k">$(</span>curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install<span class="k">)</span><span class="s2">"</span> </pre></div> </div> <ul class="simple"> -<li>protobufæ¥é.</li> +<li><p>protobufæ¥é.</p></li> </ul> <p>å°è¯éåé¾æ¥:</p> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>brew link --overwrite protobuf @@ -336,50 +336,46 @@ jupyter notebook + +<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions"> + <span class="rst-current-version" data-toggle="rst-current-version"> + <span class="fa fa-book"> incubator-singa </span> + v: latest + <span class="fa fa-caret-down"></span> + </span> + <div class="rst-other-versions"> + <dl> + <dt>Languages</dt> + <dd><a href="../../en/index.html">English</a></dd> + <dd><a href="../../zh/index.html">ä¸æ</a></dd> + </dl> + <dl> + <dt>Versions</dt> + <dd><a href="http://singa.apache.org/v0.3.0/";>0.3</a></dd> + <dd><a href="http://singa.apache.org/v1.1.0/";>1.1</a></dd> + </dl> + + </div> + <a href="http://incubator.apache.org/";> <img src= "../_static/apache.png" style="background-color:white;"> </a> + + <a href="https://github.com/apache/incubator-singa"; class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c"; class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://hub.docker.com/r/apache/singa/"; class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://www.linkedin.com/groups/13550034"; class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://twitter.com/ApacheSinga"; class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://www.facebook.com/Apache-SINGA-347284219056544/"; class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://www.researchgate.net/project/Apache-SINGA"; class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + +</div> + + <a href="https://github.com/apache/incubator-singa";> + <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;" + src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"; + alt="Fork me on GitHub"> +</a> + - <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions"> - <span class="rst-current-version" data-toggle="rst-current-version"> - <span class="fa fa-book"> incubator-singa </span> - v: latest - <span class="fa fa-caret-down"></span> - </span> - <div class="rst-other-versions"> - <dl> - <dt>Languages</dt> - <dd><a href="../../index.html">English</a></dd> - <dd><a href=".././index.html">ä¸æ</a></dd> - </dl> - <dl> - <dt>Versions</dt> - <dd><a href="http://singa.apache.org/v0.3.0/";>0.3</a></dd> - <dd><a href="http://singa.apache.org/v1.1.0/";>1.1</a></dd> - </dl> - - </div> - <a href="http://www.apache.org"; style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; text-decoration: none; margin: 5px 2px;">Foundation</a> - <a href="http://www.apache.org/events/current-event"; style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; text-decoration: none; margin: 5px 2px;">Events</a> - <a href="http://www.apache.org/foundation/thanks.html"; style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; text-decoration: none; margin: 5px 2px;">Thanks</a> - <a href="http://www.apache.org/foundation/sponsorship.html"; style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; text-decoration: none; margin: 5px 2px;">Sponsorship</a> - <a href="http://www.apache.org/licenses/"; style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; text-decoration: none; margin: 5px 2px;">License</a> - <br> - <a href="https://github.com/apache/incubator-singa"; class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> - <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c"; class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> - <a href="https://hub.docker.com/r/apache/singa/"; class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> - <a href="https://www.linkedin.com/groups/13550034"; class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> - <a href="https://twitter.com/ApacheSinga"; class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> - <a href="https://www.facebook.com/Apache-SINGA-347284219056544/"; class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> - <a href="https://www.researchgate.net/project/Apache-SINGA"; class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> - - </div> - - <a href="https://github.com/apache/incubator-singa";> - <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;" - src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"; - alt="Fork me on GitHub"> - </a> - - - + </body> </html> \ No newline at end of file
Modified: incubator/singa/site/trunk/zh/docs/install_win.html URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/zh/docs/install_win.html?rev=1858059&r1=1858058&r2=1858059&view=diff ============================================================================== --- incubator/singa/site/trunk/zh/docs/install_win.html (original) +++ incubator/singa/site/trunk/zh/docs/install_win.html Wed Apr 24 14:57:35 2019 @@ -1,5 +1,5 @@ - + <!DOCTYPE html> <!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]--> @@ -9,7 +9,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <title>å¨Windowsä¸å建SINGA — incubator-singa 2.0.0 documentation</title> + <title>å¨Windowsä¸å建SINGA — incubator-singa 1.1.0 documentation</title> @@ -36,18 +36,18 @@ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" /> <link rel="index" title="Index" href="../genindex.html" /> <link rel="search" title="Search" href="../search.html" /> - <link href="../_static/style.css" rel="stylesheet" type="text/css"> - <!--link href="../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"--> - <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css"; integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous"> - <style> - .fa:hover { - opacity: 0.7; - } - .fab:hover { - opacity: 0.7; - } - </style> - + <link href="../_static/style.css" rel="stylesheet" type="text/css"> + <!--link href="../_static/fontawesome-all.min.css" rel="stylesheet" type="text/css"--> + <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css"; integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous"> + <style> + .fa:hover { + opacity: 0.7; + } + .fab:hover { + opacity: 0.7; + } + </style> + </head> <body class="wy-body-for-nav"> @@ -184,71 +184,65 @@ <p>ä½ å¯ä»¥å建ä¸ä¸ªæ件夹æ¥å®è£ ä¾èµåºã</p> <p>ä¾èµåºæä¸é¢è¿äºï¼</p> <ul> -<li><dl class="first docutils"> -<dt>ç¼è¯å¨åIDE</dt> -<dd><ul class="first last simple"> -<li>Visual Studio. 社åºçæ¯å è´¹çï¼å¯ç¨äºæ建SINGAã<a class="reference external" href="https://www.visualstudio.com/";>https://www.visualstudio.com/</a></li> +<li><dl class="simple"> +<dt>ç¼è¯å¨åIDE</dt><dd><ul class="simple"> +<li><p>Visual Studio. 社åºçæ¯å è´¹çï¼å¯ç¨äºæ建SINGAã<a class="reference external" href="https://www.visualstudio.com/";>https://www.visualstudio.com/</a></p></li> </ul> </dd> </dl> </li> -<li><dl class="first docutils"> -<dt>CMake</dt> -<dd><ul class="first last simple"> -<li>å¯ä»¥ä» <a class="reference external" href="http://cmake.org/";>http://cmake.org/</a> ä¸è½½</li> -<li>ç¡®ä¿cmakeå¯æ§è¡è·¯å¾å¨ç³»ç»è·¯å¾ä¸ï¼æè å¨è°ç¨cmakeæ¶ä½¿ç¨å®æ´è·¯å¾ã</li> +<li><dl class="simple"> +<dt>CMake</dt><dd><ul class="simple"> +<li><p>å¯ä»¥ä» <a class="reference external" href="http://cmake.org/";>http://cmake.org/</a> ä¸è½½</p></li> +<li><p>ç¡®ä¿cmakeå¯æ§è¡è·¯å¾å¨ç³»ç»è·¯å¾ä¸ï¼æè å¨è°ç¨cmakeæ¶ä½¿ç¨å®æ´è·¯å¾ã</p></li> </ul> </dd> </dl> </li> -<li><dl class="first docutils"> -<dt>SWIG</dt> -<dd><ul class="first last simple"> -<li>å¯ä»¥ä» <a class="reference external" href="http://swig.org/";>http://swig.org/</a> ä¸è½½</li> -<li>ç¡®ä¿cmakeå¯æ§è¡è·¯å¾å¨ç³»ç»è·¯å¾ä¸ï¼æè å¨è°ç¨swigæ¶ä½¿ç¨å®æ´è·¯å¾ã使ç¨æè¿ççæ¬ï¼æ¯å¦ 3.0.12.</li> +<li><dl class="simple"> +<dt>SWIG</dt><dd><ul class="simple"> +<li><p>å¯ä»¥ä» <a class="reference external" href="http://swig.org/";>http://swig.org/</a> ä¸è½½</p></li> +<li><p>ç¡®ä¿cmakeå¯æ§è¡è·¯å¾å¨ç³»ç»è·¯å¾ä¸ï¼æè å¨è°ç¨swigæ¶ä½¿ç¨å®æ´è·¯å¾ã使ç¨æè¿ççæ¬ï¼æ¯å¦ 3.0.12.</p></li> </ul> </dd> </dl> </li> -<li><dl class="first docutils"> -<dt>Protocol Buffers</dt> -<dd><ul class="first last simple"> -<li>ä¸è½½ä¸ä¸ªåéççæ¬ï¼æ¯å¦ï¼ 2.6.1: <a class="reference external" href="https://github.com/google/protobuf/releases/tag/v2.6.1";>https://github.com/google/protobuf/releases/tag/v2.6.1</a> .</li> -<li>ä¸è½½protobuf-2.6.1.zipåprotoc-2.6.1-win32.zip .</li> -<li>å¨ä¾èµåºæ件夹ä¸è§£åå®ä»¬ãå°protocå¯æ§è¡è·¯å¾å å ¥ç³»ç»è·¯å¾ä¸ï¼æè å¨è°ç¨å®æ¯ä½¿ç¨å®æ´è·¯å¾ã</li> -<li>å¨vsprojectæ件夹ä¸æ¾å°Visual Studio solution并æå¼ã</li> -<li>æ´æ¹å建ç¯å¢ä¸ºReleaseåx64ã</li> -<li>å建libprotobuf项ç®ã</li> +<li><dl class="simple"> +<dt>Protocol Buffers</dt><dd><ul class="simple"> +<li><p>ä¸è½½ä¸ä¸ªåéççæ¬ï¼æ¯å¦ï¼ 2.6.1: <a class="reference external" href="https://github.com/google/protobuf/releases/tag/v2.6.1";>https://github.com/google/protobuf/releases/tag/v2.6.1</a> .</p></li> +<li><p>ä¸è½½protobuf-2.6.1.zipåprotoc-2.6.1-win32.zip .</p></li> +<li><p>å¨ä¾èµåºæ件夹ä¸è§£åå®ä»¬ãå°protocå¯æ§è¡è·¯å¾å å ¥ç³»ç»è·¯å¾ä¸ï¼æè å¨è°ç¨å®æ¯ä½¿ç¨å®æ´è·¯å¾ã</p></li> +<li><p>å¨vsprojectæ件夹ä¸æ¾å°Visual Studio solution并æå¼ã</p></li> +<li><p>æ´æ¹å建ç¯å¢ä¸ºReleaseåx64ã</p></li> +<li><p>å建libprotobuf项ç®ã</p></li> </ul> </dd> </dl> </li> -<li><dl class="first docutils"> -<dt>Openblas</dt> -<dd><ul class="first simple"> -<li>ä¸è½½ä¸ä¸ªåéççæ¬ï¼æ¯å¦ï¼ 0.2.20: <a class="reference external" href="http://www.openblas.net";>http://www.openblas.net</a></li> -<li>å¨ä¾èµæ件夹ä¸æåæºç¨åºã</li> -<li>å¦æä½ æ²¡æå®è£ Perlï¼ä¸è½½ä¸ä¸ªperlç¯å¢æ¯å¦ Strawberry Perl (<a class="reference external" href="http://strawberryperl.com/";>http://strawberryperl.com/</a>)</li> -<li>éè¿å¨æºæ件夹ä¸è¿è¡ä¸é¢æ令æ¥å建Visual Studioç解å³æ¹æ¡ï¼</li> +<li><dl> +<dt>Openblas</dt><dd><ul class="simple"> +<li><p>ä¸è½½ä¸ä¸ªåéççæ¬ï¼æ¯å¦ï¼ 0.2.20: <a class="reference external" href="http://www.openblas.net";>http://www.openblas.net</a></p></li> +<li><p>å¨ä¾èµæ件夹ä¸æåæºç¨åºã</p></li> +<li><p>å¦æä½ æ²¡æå®è£ Perlï¼ä¸è½½ä¸ä¸ªperlç¯å¢æ¯å¦ Strawberry Perl (<a class="reference external" href="http://strawberryperl.com/";>http://strawberryperl.com/</a>)</p></li> +<li><p>éè¿å¨æºæ件夹ä¸è¿è¡ä¸é¢æ令æ¥å建Visual Studioç解å³æ¹æ¡ï¼</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>cmake -G <span class="s2">"Visual Studio 15 2017 Win64"</span> </pre></div> </div> -<ul class="last simple"> -<li>æå¼Visual Studio并æ´æ¹å建ç¯å¢ä¸ºReleaseåx64ã</li> -<li>å建libopenblas项ç®ã</li> +<ul class="simple"> +<li><p>æå¼Visual Studio并æ´æ¹å建ç¯å¢ä¸ºReleaseåx64ã</p></li> +<li><p>å建libopenblas项ç®ã</p></li> </ul> </dd> </dl> </li> -<li><dl class="first docutils"> -<dt>Google glog</dt> -<dd><ul class="first last simple"> -<li>ä¸è½½ä¸ä¸ªåéççæ¬ï¼æ¯å¦ï¼ 0.3.5ï¼ <a class="reference external" href="https://github.com/google/glog/releases";>https://github.com/google/glog/releases</a></li> -<li>å¨ä¾èµæ件夹ä¸æåæºç¨åºã</li> -<li>æå¼Visual Studioã</li> -<li>æ´æ¹å建ç¯å¢ä¸ºReleaseåx64ã</li> -<li>å建libglog项ç®ã</li> +<li><dl class="simple"> +<dt>Google glog</dt><dd><ul class="simple"> +<li><p>ä¸è½½ä¸ä¸ªåéççæ¬ï¼æ¯å¦ï¼ 0.3.5ï¼ <a class="reference external" href="https://github.com/google/glog/releases";>https://github.com/google/glog/releases</a></p></li> +<li><p>å¨ä¾èµæ件夹ä¸æåæºç¨åºã</p></li> +<li><p>æå¼Visual Studioã</p></li> +<li><p>æ´æ¹å建ç¯å¢ä¸ºReleaseåx64ã</p></li> +<li><p>å建libglog项ç®ã</p></li> </ul> </dd> </dl> @@ -258,11 +252,10 @@ <div class="section" id="singa"> <h2>2. å建SINGA<a class="headerlink" href="#singa" title="Permalink to this headline">¶</a></h2> <ul class="simple"> -<li>ä¸è½½SINGAæºä»£ç </li> -<li><dl class="first docutils"> -<dt>ç¼è¯protobufæ件:</dt> -<dd><ul class="first last"> -<li>è¿å ¥ src/proto æ件夹</li> +<li><p>ä¸è½½SINGAæºä»£ç </p></li> +<li><dl class="simple"> +<dt>ç¼è¯protobufæ件:</dt><dd><ul> +<li><p>è¿å ¥ src/proto æ件夹</p></li> </ul> </dd> </dl> @@ -273,9 +266,9 @@ protoc.exe *.proto --python_out python_o </pre></div> </div> <ul class="simple"> -<li><dl class="first docutils"> -<dt>çææ¯æC++åPythonçswigçé¢:</dt> -<dd>è¿å ¥ src/api</dd> +<li><dl class="simple"> +<dt>çææ¯æC++åPythonçswigçé¢:</dt><dd><p>è¿å ¥ src/api</p> +</dd> </dl> </li> </ul> @@ -283,9 +276,9 @@ protoc.exe *.proto --python_out python_o </pre></div> </div> <ul class="simple"> -<li><dl class="first docutils"> -<dt>çææ¯æSINGAçVisual Studio:</dt> -<dd>è¿å ¥SINGAæºä»£ç æå¨çæ ¹æ件夹</dd> +<li><dl class="simple"> +<dt>çææ¯æSINGAçVisual Studio:</dt><dd><p>è¿å ¥SINGAæºä»£ç æå¨çæ ¹æ件夹</p> +</dd> </dl> </li> </ul> @@ -294,7 +287,7 @@ protoc.exe *.proto --python_out python_o </pre></div> </div> <ul class="simple"> -<li>è°ç¨cmake并å°è·¯å¾å å°ç³»ç»è·¯å¾ä¸ï¼ç±»ä¼¼äºå¦ä¸çä¾åï¼</li> +<li><p>è°ç¨cmake并å°è·¯å¾å å°ç³»ç»è·¯å¾ä¸ï¼ç±»ä¼¼äºå¦ä¸çä¾åï¼</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>cmake -G <span class="s2">"Visual Studio 15 2017 Win64"</span> ^ -DGLOG_INCLUDE_DIR<span class="o">=</span><span class="s2">"D:/WinSinga/dependencies/glog-0.3.5/src/windows"</span> ^ @@ -308,37 +301,36 @@ protoc.exe *.proto --python_out python_o </pre></div> </div> <ul class="simple"> -<li>å¨Visual Studioä¸æå¼çæ好ç解å³æ¹æ¡</li> -<li>æ´æ¹å建ç¯å¢ä¸ºReleaseåx64ã</li> -<li>å°src/apiä¸çsinga_wrap.cxxæ件å å ¥singa_objects项ç®ã</li> -<li>å¨singa_objects项ç®ä¸ï¼æå¼Additional Include Directoriesã</li> -<li>æ·»å Python include pathã</li> -<li>æ·»å numpy include pathã</li> -<li>æ·»å protobuf include pathã</li> -<li>å¨singa_objects项ç®çé¢å¤çå¨å®ä¹ä¸ï¼æ·»å USE_GLOGã</li> -<li>å建singa_objects项ç®ã</li> -<li><dl class="first docutils"> -<dt>å¨singa项ç®ä¸:</dt> -<dd><ul class="first last"> -<li>å°singa_wrap.objæ·»å å°å¯¹è±¡åº</li> -<li>å°ç®æ å称æ´æ¹ä¸º_singa_wrap</li> -<li>å°ç®æ æ©å±åæ´æ¹ä¸º.pyd</li> -<li>å°é 置类åæ´æ¹ä¸ºå¨æåºï¼.dllï¼</li> -<li>转å°å ¶ä»åºç®å½å¹¶æ·»å å°Pythonï¼openblasï¼protobufåglogåºçè·¯å¾</li> -<li>转å°éå ä¾èµå ³ç³»å¹¶æ·»å libopenblas.libï¼libglog.libålibprotobuf.lib</li> +<li><p>å¨Visual Studioä¸æå¼çæ好ç解å³æ¹æ¡</p></li> +<li><p>æ´æ¹å建ç¯å¢ä¸ºReleaseåx64ã</p></li> +<li><p>å°src/apiä¸çsinga_wrap.cxxæ件å å ¥singa_objects项ç®ã</p></li> +<li><p>å¨singa_objects项ç®ä¸ï¼æå¼Additional Include Directoriesã</p></li> +<li><p>æ·»å Python include pathã</p></li> +<li><p>æ·»å numpy include pathã</p></li> +<li><p>æ·»å protobuf include pathã</p></li> +<li><p>å¨singa_objects项ç®çé¢å¤çå¨å®ä¹ä¸ï¼æ·»å USE_GLOGã</p></li> +<li><p>å建singa_objects项ç®ã</p></li> +<li><dl class="simple"> +<dt>å¨singa项ç®ä¸:</dt><dd><ul> +<li><p>å°singa_wrap.objæ·»å å°å¯¹è±¡åº</p></li> +<li><p>å°ç®æ å称æ´æ¹ä¸º_singa_wrap</p></li> +<li><p>å°ç®æ æ©å±åæ´æ¹ä¸º.pyd</p></li> +<li><p>å°é 置类åæ´æ¹ä¸ºå¨æåºï¼.dllï¼</p></li> +<li><p>转å°å ¶ä»åºç®å½å¹¶æ·»å å°Pythonï¼openblasï¼protobufåglogåºçè·¯å¾</p></li> +<li><p>转å°éå ä¾èµå ³ç³»å¹¶æ·»å libopenblas.libï¼libglog.libålibprotobuf.lib</p></li> </ul> </dd> </dl> </li> -<li>å建singa项ç®</li> +<li><p>å建singa项ç®</p></li> </ul> </div> <div class="section" id="python"> <h2>3. å®è£ Python模å<a class="headerlink" href="#python" title="Permalink to this headline">¶</a></h2> <ul class="simple"> -<li>å¨build/python/setup.pyä¸ï¼å°Change _singa_wrap.soæ¹ä¸º_singa_wrap.pyd</li> -<li>æ·è´src/proto/python_outä¸çæ件å°build/python/singa/proto</li> -<li>ï¼å¯éæ©çï¼å建并æ¿æ´»ä¸ä¸ªèæç¯å¢ï¼</li> +<li><p>å¨build/python/setup.pyä¸ï¼å°Change _singa_wrap.soæ¹ä¸º_singa_wrap.pyd</p></li> +<li><p>æ·è´src/proto/python_outä¸çæ件å°build/python/singa/proto</p></li> +<li><p>ï¼å¯éæ©çï¼å建并æ¿æ´»ä¸ä¸ªèæç¯å¢ï¼</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>mkdir SingaEnv virtualenv SingaEnv @@ -346,25 +338,25 @@ SingaEnv<span class="se">\S</span>cripts </pre></div> </div> <ul class="simple"> -<li>è¿å ¥build/pythonæ件夹并è¿è¡ï¼</li> +<li><p>è¿å ¥build/pythonæ件夹并è¿è¡ï¼</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>python setup.py install </pre></div> </div> <ul class="simple"> -<li>éè¿å°_singa_wrap.pydï¼libglog.dllålibopenblas.dllæ·»å å°è·¯å¾æéè¿å°å®ä»¬å¤å¶å°pythonç«ç¹å ä¸çsingaå æ件夹ä¸ï¼ä½¿å®ä»¬å¯ç¨ã</li> -<li>éè¿ä¸é¢æ令éªè¯SINGAå·²å®è£ ï¼</li> +<li><p>éè¿å°_singa_wrap.pydï¼libglog.dllålibopenblas.dllæ·»å å°è·¯å¾æéè¿å°å®ä»¬å¤å¶å°pythonç«ç¹å ä¸çsingaå æ件夹ä¸ï¼ä½¿å®ä»¬å¯ç¨ã</p></li> +<li><p>éè¿ä¸é¢æ令éªè¯SINGAå·²å®è£ ï¼</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>python -c <span class="s2">"from singa import tensor"</span> </pre></div> </div> <p>ä½ å¯ä»¥å¨è¿éçå°ä¸ä¸ªå ³äºå建è¿ç¨çè§é¢æç¨ï¼</p> -<table border="1" class="docutils"> +<table class="docutils align-center"> <colgroup> -<col width="100%" /> +<col style="width: 100%" /> </colgroup> -<tbody valign="top"> -<tr class="row-odd"><td><a class="reference external" href="https://www.youtube.com/watch?v=YOjwtrvTPn4";><img alt="video" class="align-middle" src="https://img.youtube.com/vi/YOjwtrvTPn4/0.jpg"; /></a></td> +<tbody> +<tr class="row-odd"><td><p><a class="reference external" href="https://www.youtube.com/watch?v=YOjwtrvTPn4";><img alt="video" class="align-middle" src="https://img.youtube.com/vi/YOjwtrvTPn4/0.jpg"; /></a></p></td> </tr> </tbody> </table> @@ -372,47 +364,41 @@ SingaEnv<span class="se">\S</span>cripts <div class="section" id="id2"> <h2>4. è¿è¡åå æµè¯<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h2> <ul class="simple"> -<li>å¨testæ件夹ä¸ï¼çæVisual Studioç解å³æ¹æ¡:</li> +<li><p>å¨testæ件夹ä¸ï¼çæVisual Studioç解å³æ¹æ¡:</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>cmake -G <span class="s2">"Visual Studio 15 2017 Win64"</span> </pre></div> </div> <ul> -<li><p class="first">å¨Visual Studioä¸æå¼çæ好ç解å³æ¹æ¡ã</p> -</li> -<li><p class="first">æ´æ¹å建ç¯å¢ä¸ºReleaseåx64ã</p> -</li> -<li><p class="first">å建glog项ç®ã</p> -</li> -<li><p class="first">å¨test_singa项ç®ä¸:</p> +<li><p>å¨Visual Studioä¸æå¼çæ好ç解å³æ¹æ¡ã</p></li> +<li><p>æ´æ¹å建ç¯å¢ä¸ºReleaseåx64ã</p></li> +<li><p>å建glog项ç®ã</p></li> +<li><p>å¨test_singa项ç®ä¸:</p> <blockquote> <div><ul class="simple"> -<li>å°USE_GLOGæ·»å å°é¢å¤çå¨å®ä¹ä¸ã</li> -<li>å¨å ¶ä»å å«ç®å½ä¸ï¼æ·»å ä¸è¿°æ¥éª¤2ä¸ä½¿ç¨çGLOG_INCLUDE_DIRï¼CBLAS_INCLUDE_DIRåProtobuf_INCLUDE_DIRçè·¯å¾ã æ·»å ä¹æ建å建ç«/å å«æ件夹ã</li> -<li>转å°å ¶ä»åºç®å½å¹¶æ·»å å°openblasï¼protobufåglogåºçè·¯å¾ã ä¹å¯ä»¥æ·»å build / src / singa_objects.dir / Releaseã</li> -<li>转å°éå ä¾èµé¡¹å¹¶æ·»å libopenblas.libï¼libglog.libålibprotobuf.libã ä¿®å¤ä¸¤ä¸ªåºçå称ï¼gtest.libåsinga_objects.libã</li> +<li><p>å°USE_GLOGæ·»å å°é¢å¤çå¨å®ä¹ä¸ã</p></li> +<li><p>å¨å ¶ä»å å«ç®å½ä¸ï¼æ·»å ä¸è¿°æ¥éª¤2ä¸ä½¿ç¨çGLOG_INCLUDE_DIRï¼CBLAS_INCLUDE_DIRåProtobuf_INCLUDE_DIRçè·¯å¾ã æ·»å ä¹æ建å建ç«/å å«æ件夹ã</p></li> +<li><p>转å°å ¶ä»åºç®å½å¹¶æ·»å å°openblasï¼protobufåglogåºçè·¯å¾ã ä¹å¯ä»¥æ·»å build / src / singa_objects.dir / Releaseã</p></li> +<li><p>转å°éå ä¾èµé¡¹å¹¶æ·»å libopenblas.libï¼libglog.libålibprotobuf.libã ä¿®å¤ä¸¤ä¸ªåºçå称ï¼gtest.libåsinga_objects.libã</p></li> </ul> </div></blockquote> </li> -<li><p class="first">å建test_singa项ç®ã</p> -</li> -<li><p class="first">éè¿æå®ä»¬å å ¥å°ç³»ç»è·¯å¾ææ·è´å°test/releaseæ件夹ä¸ä½¿å¾libglog.dllålibopenblas.dllå¯è¢«è·åå°ã</p> -</li> -<li><p class="first">åå æµè¯æå¦ä¸è¿è¡æ¹å¼ï¼</p> +<li><p>å建test_singa项ç®ã</p></li> +<li><p>éè¿æå®ä»¬å å ¥å°ç³»ç»è·¯å¾ææ·è´å°test/releaseæ件夹ä¸ä½¿å¾libglog.dllålibopenblas.dllå¯è¢«è·åå°ã</p></li> +<li><p>åå æµè¯æå¦ä¸è¿è¡æ¹å¼ï¼</p> <blockquote> <div><ul> -<li><p class="first">ä»å½ä»¤è¡:</p> +<li><p>ä»å½ä»¤è¡:</p> <blockquote> <div><div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>test_singa.exe </pre></div> </div> </div></blockquote> </li> -<li><dl class="first docutils"> -<dt>ä»Visual Studio:</dt> -<dd><ul class="first last simple"> -<li>å³é®åå»test_singa项ç®å¹¶éæ©â设为å¯å¨é¡¹ç®â</li> -<li>ä»âè°è¯âèåä¸éæ©âæ éè°è¯å³å¯å¼å§â</li> +<li><dl class="simple"> +<dt>ä»Visual Studio:</dt><dd><ul class="simple"> +<li><p>å³é®åå»test_singa项ç®å¹¶éæ©â设为å¯å¨é¡¹ç®â</p></li> +<li><p>ä»âè°è¯âèåä¸éæ©âæ éè°è¯å³å¯å¼å§â</p></li> </ul> </dd> </dl> @@ -422,12 +408,12 @@ SingaEnv<span class="se">\S</span>cripts </li> </ul> <p>ä½ å¯ä»¥å¨è¿éçå°ä¸ä¸ªå ³äºè¿è¡åå æµè¯çè§é¢æç¨ï¼</p> -<table border="1" class="docutils"> +<table class="docutils align-center"> <colgroup> -<col width="100%" /> +<col style="width: 100%" /> </colgroup> -<tbody valign="top"> -<tr class="row-odd"><td><a class="reference external" href="https://www.youtube.com/watch?v=YOjwtrvTPn4";><img alt="video" class="align-middle" src="https://img.youtube.com/vi/YOjwtrvTPn4/0.jpg"; /></a></td> +<tbody> +<tr class="row-odd"><td><p><a class="reference external" href="https://www.youtube.com/watch?v=YOjwtrvTPn4";><img alt="video" class="align-middle" src="https://img.youtube.com/vi/YOjwtrvTPn4/0.jpg"; /></a></p></td> </tr> </tbody> </table> @@ -440,34 +426,30 @@ SingaEnv<span class="se">\S</span>cripts <h2>5.1 å®è£ ä¾èµåº<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h2> <p>é¤äº1é¨åçä¾èµåºï¼æ们è¿å°éè¦å¦ä¸åºï¼</p> <ul> -<li><p class="first">CUDA</p> +<li><p>CUDA</p> <blockquote> <div><p>ä»https://developer.nvidia.com/cuda-downloadsä¸è½½åéççæ¬ï¼æ¯å¦9.1ãç¡®ä¿å®è£ Visual Studioéæ模åã</p> </div></blockquote> </li> -<li><p class="first">cuDNN</p> +<li><p>cuDNN</p> <blockquote> <div><p>ä»https://developer.nvidia.com/cudnnä¸è½½åéççæ¬ï¼æ¯å¦7.1ã</p> </div></blockquote> </li> -<li><p class="first">cnmem:</p> +<li><p>cnmem:</p> <blockquote> <div><ul> -<li><p class="first">ä»https://github.com/NVIDIA/cnmemä¸è½½ææ°çæ¬</p> -</li> -<li><p class="first">å建Visual Studioç解å³æ¹æ¡:</p> +<li><p>ä»https://github.com/NVIDIA/cnmemä¸è½½ææ°çæ¬</p></li> +<li><p>å建Visual Studioç解å³æ¹æ¡:</p> <blockquote> <div><div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>cmake -G <span class="s2">"Visual Studio 15 2017 Win64"</span> </pre></div> </div> </div></blockquote> </li> -<li><p class="first">å¨Visual Studioä¸æå¼çæç解å³æ¹æ¡ã</p> -</li> -<li><p class="first">å°å建设置æ´æ¹ä¸ºReleaseåx64ã</p> -</li> -<li><p class="first">å建cnmem项ç®ã</p> -</li> +<li><p>å¨Visual Studioä¸æå¼çæç解å³æ¹æ¡ã</p></li> +<li><p>å°å建设置æ´æ¹ä¸ºReleaseåx64ã</p></li> +<li><p>å建cnmem项ç®ã</p></li> </ul> </div></blockquote> </li> @@ -476,7 +458,7 @@ SingaEnv<span class="se">\S</span>cripts <div class="section" id="id4"> <h2>5.2 å建SINGA<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h2> <ul> -<li><p class="first">è°ç¨cmake并å¨ç³»ç»ä¸æ·»å 类似以ä¸ç¤ºä¾çè·¯å¾ï¼</p> +<li><p>è°ç¨cmake并å¨ç³»ç»ä¸æ·»å 类似以ä¸ç¤ºä¾çè·¯å¾ï¼</p> <blockquote> <div><div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>cmake -G <span class="s2">"Visual Studio 15 2017 Win64"</span> ^ -DGLOG_INCLUDE_DIR<span class="o">=</span><span class="s2">"D:/WinSinga/dependencies/glog-0.3.5/src/windows"</span> ^ @@ -497,83 +479,75 @@ SingaEnv<span class="se">\S</span>cripts </div> </div></blockquote> </li> -<li><dl class="first docutils"> -<dt>为C++åPythonçæswigæ¥å£ï¼</dt> -<dd><p class="first">è¿å ¥ src/api</p> -<div class="last highlight-bash notranslate"><div class="highlight"><pre><span></span>swig -python -c++ singa.i +<li><dl> +<dt>为C++åPythonçæswigæ¥å£ï¼</dt><dd><p>è¿å ¥ src/api</p> +<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>swig -python -c++ singa.i </pre></div> </div> </dd> </dl> </li> -<li><p class="first">å¨Visual Studioä¸æå¼çæç解å³æ¹æ¡</p> -</li> -<li><p class="first">å°çæ¬è®¾ç½®æ´æ¹ä¸ºReleaseåx64</p> -</li> +<li><p>å¨Visual Studioä¸æå¼çæç解å³æ¹æ¡</p></li> +<li><p>å°çæ¬è®¾ç½®æ´æ¹ä¸ºReleaseåx64</p></li> </ul> </div> <div class="section" id="singa-objects"> <h2>5.2.1 å建singa_objects<a class="headerlink" href="#singa-objects" title="Permalink to this headline">¶</a></h2> <ul class="simple"> -<li>å°src/apiä¸çsinga_wrap.cxxæ件添å å°singa_objects项ç®ä¸ã</li> -<li>å¨singa_objects项ç®ä¸ï¼æå¼å ¶ä»å å«ç®å½ã</li> -<li>æ·»å Pythonå å«è·¯å¾ã</li> -<li>æ·»å numpyå å«è·¯å¾ã</li> -<li>æ·»å protobufå å«è·¯å¾ã</li> -<li>为CUDAï¼cuDNNåcnmemæ·»å å å«è·¯å¾ã</li> -<li>å¨singa_objects项ç®çé¢å¤çå¨å®ä¹ä¸ï¼æ·»å USE_GLOGï¼USE_CUDAåUSE_CUDNNãå é¤DISABLE_WARNINGSã</li> -<li>建ç«singa_objects项ç®ã</li> +<li><p>å°src/apiä¸çsinga_wrap.cxxæ件添å å°singa_objects项ç®ä¸ã</p></li> +<li><p>å¨singa_objects项ç®ä¸ï¼æå¼å ¶ä»å å«ç®å½ã</p></li> +<li><p>æ·»å Pythonå å«è·¯å¾ã</p></li> +<li><p>æ·»å numpyå å«è·¯å¾ã</p></li> +<li><p>æ·»å protobufå å«è·¯å¾ã</p></li> +<li><p>为CUDAï¼cuDNNåcnmemæ·»å å å«è·¯å¾ã</p></li> +<li><p>å¨singa_objects项ç®çé¢å¤çå¨å®ä¹ä¸ï¼æ·»å USE_GLOGï¼USE_CUDAåUSE_CUDNNãå é¤DISABLE_WARNINGSã</p></li> +<li><p>建ç«singa_objects项ç®ã</p></li> </ul> </div> <div class="section" id="singa-kernel"> <h2>5.2.2 å建singa-kernel<a class="headerlink" href="#singa-kernel" title="Permalink to this headline">¶</a></h2> <ul> -<li><p class="first">å建ä¸ä¸ªç±»å为âCUDA 9.1 Runtimeâçæ°Visual Studioç¨åºã ç»å®èµ·ä¸ä¸ªååï¼æ¯å¦singa-kernelã</p> -</li> -<li><p class="first">该项ç®å¸¦æä¸ä¸ªå为kernel.cuçåå§æ件ã ä»é¡¹ç®ä¸å é¤æ¤æ件ã</p> -</li> -<li><p class="first">æ·»å æ¤æ件ï¼src / core / tensor / math_kernel.cu</p> -</li> -<li><p class="first">å¨é¡¹ç®è®¾ç½®ä¸ï¼</p> +<li><p>å建ä¸ä¸ªç±»å为âCUDA 9.1 Runtimeâçæ°Visual Studioç¨åºã ç»å®èµ·ä¸ä¸ªååï¼æ¯å¦singa-kernelã</p></li> +<li><p>该项ç®å¸¦æä¸ä¸ªå为kernel.cuçåå§æ件ã ä»é¡¹ç®ä¸å é¤æ¤æ件ã</p></li> +<li><p>æ·»å æ¤æ件ï¼src / core / tensor / math_kernel.cu</p></li> +<li><p>å¨é¡¹ç®è®¾ç½®ä¸ï¼</p> <blockquote> <div><ul class="simple"> -<li>å°Platfromå·¥å ·é设置为âVisual Studio 2015ï¼v140ï¼â</li> -<li>å°é 置类å设置为âéæåºï¼.libï¼â</li> -<li>å¨å å«ç®å½ä¸ï¼æ·»å build/include</li> +<li><p>å°Platfromå·¥å ·é设置为âVisual Studio 2015ï¼v140ï¼â</p></li> +<li><p>å°é 置类å设置为âéæåºï¼.libï¼â</p></li> +<li><p>å¨å å«ç®å½ä¸ï¼æ·»å build/include</p></li> </ul> </div></blockquote> </li> -<li><p class="first">å建singa-kernel项ç®</p> -</li> +<li><p>å建singa-kernel项ç®</p></li> </ul> </div> <div class="section" id="id5"> <h2>5.2.3 å建singa<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h2> <ul> -<li><p class="first">å¨singa项ç®ä¸:</p> +<li><p>å¨singa项ç®ä¸:</p> <blockquote> <div><ul class="simple"> -<li>å°singa_wrap.objæ·»å å°å¯¹è±¡åºã</li> -<li>å°ç®æ å称æ´æ¹ä¸º_singa_wrapã</li> -<li>å°ç®æ æ©å±åæ´æ¹ä¸º.pydã</li> -<li>å°é 置类åæ´æ¹ä¸ºå¨æåºï¼.dllï¼ã</li> -<li>转å°å ¶ä»åºç®å½å¹¶æ·»å å°Pythonï¼openblasï¼protobufåglogåºçè·¯å¾ã</li> -<li>è¿å°åºè·¯å¾æ·»å å°singa-kernelï¼cnmemï¼cudaåcudnnã</li> -<li>转å°éå ä¾èµå ³ç³»å¹¶æ·»å libopenblas.libï¼libglog.libålibprotobuf.libã</li> -<li>æ·»å ï¼singa-kernel.libï¼cnmem.libï¼cudnn.libï¼cuda.libï¼cublas.libï¼curand.libåcudart.libã</li> +<li><p>å°singa_wrap.objæ·»å å°å¯¹è±¡åºã</p></li> +<li><p>å°ç®æ å称æ´æ¹ä¸º_singa_wrapã</p></li> +<li><p>å°ç®æ æ©å±åæ´æ¹ä¸º.pydã</p></li> +<li><p>å°é 置类åæ´æ¹ä¸ºå¨æåºï¼.dllï¼ã</p></li> +<li><p>转å°å ¶ä»åºç®å½å¹¶æ·»å å°Pythonï¼openblasï¼protobufåglogåºçè·¯å¾ã</p></li> +<li><p>è¿å°åºè·¯å¾æ·»å å°singa-kernelï¼cnmemï¼cudaåcudnnã</p></li> +<li><p>转å°éå ä¾èµå ³ç³»å¹¶æ·»å libopenblas.libï¼libglog.libålibprotobuf.libã</p></li> +<li><p>æ·»å ï¼singa-kernel.libï¼cnmem.libï¼cudnn.libï¼cuda.libï¼cublas.libï¼curand.libåcudart.libã</p></li> </ul> </div></blockquote> </li> -<li><p class="first">å建singa项ç®</p> -</li> +<li><p>å建singa项ç®</p></li> </ul> </div> <div class="section" id="id6"> <h2>5.3. å®è£ Python模å<a class="headerlink" href="#id6" title="Permalink to this headline">¶</a></h2> <ul class="simple"> -<li>å¨build/python/setup.pyä¸ï¼å°Change _singa_wrap.soæ¹ä¸º_singa_wrap.pyd</li> -<li>æ·è´src/proto/python_outä¸çæ件å°build/python/singa/proto</li> -<li>ï¼å¯éæ©çï¼å建并æ¿æ´»ä¸ä¸ªèæç¯å¢ï¼</li> +<li><p>å¨build/python/setup.pyä¸ï¼å°Change _singa_wrap.soæ¹ä¸º_singa_wrap.pyd</p></li> +<li><p>æ·è´src/proto/python_outä¸çæ件å°build/python/singa/proto</p></li> +<li><p>ï¼å¯éæ©çï¼å建并æ¿æ´»ä¸ä¸ªèæç¯å¢ï¼</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>mkdir SingaEnv virtualenv SingaEnv @@ -581,25 +555,25 @@ SingaEnv<span class="se">\S</span>cripts </pre></div> </div> <ul class="simple"> -<li>è¿å ¥build/pythonæ件夹并è¿è¡ï¼</li> +<li><p>è¿å ¥build/pythonæ件夹并è¿è¡ï¼</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>python setup.py install </pre></div> </div> <ul class="simple"> -<li>å°_singa_wrap.pydï¼libglog.dllï¼libopenblas.dllï¼cnmem.dllï¼CUDAè¿è¡æ¶ï¼ä¾å¦cudart64_91.dllï¼åcuDNNï¼ä¾å¦cudnn64_7.dllï¼æ·»å å°è·¯å¾æéè¿å°å®ä»¬å¤å¶å°singaå æ件夹 pythonç½ç«å ã</li> -<li>éè¿ä¸é¢æ令éªè¯SINGAå·²å®è£ ï¼</li> +<li><p>å°_singa_wrap.pydï¼libglog.dllï¼libopenblas.dllï¼cnmem.dllï¼CUDAè¿è¡æ¶ï¼ä¾å¦cudart64_91.dllï¼åcuDNNï¼ä¾å¦cudnn64_7.dllï¼æ·»å å°è·¯å¾æéè¿å°å®ä»¬å¤å¶å°singaå æ件夹 pythonç½ç«å ã</p></li> +<li><p>éè¿ä¸é¢æ令éªè¯SINGAå·²å®è£ ï¼</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>python -c <span class="s2">"from singa import device; dev = device.create_cuda_gpu()"</span> </pre></div> </div> <p>å ³äºè¿é¨åçè§é¢æç¨å¯ä»¥å¨ä¸é¢æ¾å°ï¼</p> -<table border="1" class="docutils"> +<table class="docutils align-center"> <colgroup> -<col width="100%" /> +<col style="width: 100%" /> </colgroup> -<tbody valign="top"> -<tr class="row-odd"><td><a class="reference external" href="https://www.youtube.com/watch?v=YOjwtrvTPn4";><img alt="video" class="align-middle" src="https://img.youtube.com/vi/YOjwtrvTPn4/0.jpg"; /></a></td> +<tbody> +<tr class="row-odd"><td><p><a class="reference external" href="https://www.youtube.com/watch?v=YOjwtrvTPn4";><img alt="video" class="align-middle" src="https://img.youtube.com/vi/YOjwtrvTPn4/0.jpg"; /></a></p></td> </tr> </tbody> </table> @@ -607,47 +581,41 @@ SingaEnv<span class="se">\S</span>cripts <div class="section" id="id7"> <h2>5.4. è¿è¡åå æµè¯<a class="headerlink" href="#id7" title="Permalink to this headline">¶</a></h2> <ul class="simple"> -<li>å¨testæ件夹ä¸ï¼çæVisual Studioç解å³æ¹æ¡:</li> +<li><p>å¨testæ件夹ä¸ï¼çæVisual Studioç解å³æ¹æ¡:</p></li> </ul> <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>cmake -G <span class="s2">"Visual Studio 15 2017 Win64"</span> </pre></div> </div> <ul> -<li><p class="first">å¨Visual Studioä¸æå¼çæ好ç解å³æ¹æ¡ã</p> -</li> -<li><p class="first">æ´æ¹å建ç¯å¢ä¸ºReleaseåx64ã</p> -</li> -<li><p class="first">å建glog项ç®ã</p> -</li> -<li><p class="first">å¨test_singa项ç®ä¸:</p> +<li><p>å¨Visual Studioä¸æå¼çæ好ç解å³æ¹æ¡ã</p></li> +<li><p>æ´æ¹å建ç¯å¢ä¸ºReleaseåx64ã</p></li> +<li><p>å建glog项ç®ã</p></li> +<li><p>å¨test_singa项ç®ä¸:</p> <blockquote> <div><ul class="simple"> -<li>å°USE_GLOGæ·»å å°é¢å¤çå¨å®ä¹ä¸ã</li> -<li>å¨å ¶ä»å å«ç®å½ä¸ï¼æ·»å ä¸è¿°æ¥éª¤2ä¸ä½¿ç¨çGLOG_INCLUDE_DIRï¼CBLAS_INCLUDE_DIRåProtobuf_INCLUDE_DIRçè·¯å¾ã æ·»å ä¹æ建å建ç«/å å«æ件夹ã</li> -<li>转å°å ¶ä»åºç®å½å¹¶æ·»å å°openblasï¼protobufåglogåºçè·¯å¾ã ä¹å¯ä»¥æ·»å build / src / singa_objects.dir / Releaseã</li> -<li>转å°éå ä¾èµé¡¹å¹¶æ·»å libopenblas.libï¼libglog.libålibprotobuf.libã ä¿®å¤ä¸¤ä¸ªåºçå称ï¼gtest.libåsinga_objects.libã</li> +<li><p>å°USE_GLOGæ·»å å°é¢å¤çå¨å®ä¹ä¸ã</p></li> +<li><p>å¨å ¶ä»å å«ç®å½ä¸ï¼æ·»å ä¸è¿°æ¥éª¤2ä¸ä½¿ç¨çGLOG_INCLUDE_DIRï¼CBLAS_INCLUDE_DIRåProtobuf_INCLUDE_DIRçè·¯å¾ã æ·»å ä¹æ建å建ç«/å å«æ件夹ã</p></li> +<li><p>转å°å ¶ä»åºç®å½å¹¶æ·»å å°openblasï¼protobufåglogåºçè·¯å¾ã ä¹å¯ä»¥æ·»å build / src / singa_objects.dir / Releaseã</p></li> +<li><p>转å°éå ä¾èµé¡¹å¹¶æ·»å libopenblas.libï¼libglog.libålibprotobuf.libã ä¿®å¤ä¸¤ä¸ªåºçå称ï¼gtest.libåsinga_objects.libã</p></li> </ul> </div></blockquote> </li> -<li><p class="first">å建test_singa项ç®ã</p> -</li> -<li><p class="first">éè¿æå®ä»¬å å ¥å°ç³»ç»è·¯å¾ææ·è´å°test/releaseæ件夹ä¸ä½¿å¾libglog.dllålibopenblas.dllå¯è¢«è·åå°ã</p> -</li> -<li><p class="first">åå æµè¯æå¦ä¸è¿è¡æ¹å¼ï¼</p> +<li><p>å建test_singa项ç®ã</p></li> +<li><p>éè¿æå®ä»¬å å ¥å°ç³»ç»è·¯å¾ææ·è´å°test/releaseæ件夹ä¸ä½¿å¾libglog.dllålibopenblas.dllå¯è¢«è·åå°ã</p></li> +<li><p>åå æµè¯æå¦ä¸è¿è¡æ¹å¼ï¼</p> <blockquote> <div><ul> -<li><p class="first">ä»å½ä»¤è¡:</p> +<li><p>ä»å½ä»¤è¡:</p> <blockquote> <div><div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>test_singa.exe </pre></div> </div> </div></blockquote> </li> -<li><dl class="first docutils"> -<dt>ä»Visual Studio:</dt> -<dd><ul class="first last simple"> -<li>å³é®åå»test_singa项ç®å¹¶éæ©â设为å¯å¨é¡¹ç®â</li> -<li>ä»âè°è¯âèåä¸éæ©âæ éè°è¯å³å¯å¼å§â</li> +<li><dl class="simple"> +<dt>ä»Visual Studio:</dt><dd><ul class="simple"> +<li><p>å³é®åå»test_singa项ç®å¹¶éæ©â设为å¯å¨é¡¹ç®â</p></li> +<li><p>ä»âè°è¯âèåä¸éæ©âæ éè°è¯å³å¯å¼å§â</p></li> </ul> </dd> </dl> @@ -657,12 +625,12 @@ SingaEnv<span class="se">\S</span>cripts </li> </ul> <p>ä½ å¯ä»¥å¨è¿éçå°ä¸ä¸ªå ³äºè¿è¡åå æµè¯çè§é¢æç¨ï¼</p> -<table border="1" class="docutils"> +<table class="docutils align-center"> <colgroup> -<col width="100%" /> +<col style="width: 100%" /> </colgroup> -<tbody valign="top"> -<tr class="row-odd"><td><a class="reference external" href="https://www.youtube.com/watch?v=YOjwtrvTPn4";><img alt="video" class="align-middle" src="https://img.youtube.com/vi/YOjwtrvTPn4/0.jpg"; /></a></td> +<tbody> +<tr class="row-odd"><td><p><a class="reference external" href="https://www.youtube.com/watch?v=YOjwtrvTPn4";><img alt="video" class="align-middle" src="https://img.youtube.com/vi/YOjwtrvTPn4/0.jpg"; /></a></p></td> </tr> </tbody> </table> @@ -707,50 +675,46 @@ SingaEnv<span class="se">\S</span>cripts + +<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions"> + <span class="rst-current-version" data-toggle="rst-current-version"> + <span class="fa fa-book"> incubator-singa </span> + v: latest + <span class="fa fa-caret-down"></span> + </span> + <div class="rst-other-versions"> + <dl> + <dt>Languages</dt> + <dd><a href="../../en/index.html">English</a></dd> + <dd><a href="../../zh/index.html">ä¸æ</a></dd> + </dl> + <dl> + <dt>Versions</dt> + <dd><a href="http://singa.apache.org/v0.3.0/";>0.3</a></dd> + <dd><a href="http://singa.apache.org/v1.1.0/";>1.1</a></dd> + </dl> + + </div> + <a href="http://incubator.apache.org/";> <img src= "../_static/apache.png" style="background-color:white;"> </a> + + <a href="https://github.com/apache/incubator-singa"; class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c"; class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://hub.docker.com/r/apache/singa/"; class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://www.linkedin.com/groups/13550034"; class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://twitter.com/ApacheSinga"; class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://www.facebook.com/Apache-SINGA-347284219056544/"; class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + <a href="https://www.researchgate.net/project/Apache-SINGA"; class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> + +</div> + + <a href="https://github.com/apache/incubator-singa";> + <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;" + src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"; + alt="Fork me on GitHub"> +</a> + - <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions"> - <span class="rst-current-version" data-toggle="rst-current-version"> - <span class="fa fa-book"> incubator-singa </span> - v: latest - <span class="fa fa-caret-down"></span> - </span> - <div class="rst-other-versions"> - <dl> - <dt>Languages</dt> - <dd><a href="../../index.html">English</a></dd> - <dd><a href=".././index.html">ä¸æ</a></dd> - </dl> - <dl> - <dt>Versions</dt> - <dd><a href="http://singa.apache.org/v0.3.0/";>0.3</a></dd> - <dd><a href="http://singa.apache.org/v1.1.0/";>1.1</a></dd> - </dl> - - </div> - <a href="http://www.apache.org"; style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; text-decoration: none; margin: 5px 2px;">Foundation</a> - <a href="http://www.apache.org/events/current-event"; style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; text-decoration: none; margin: 5px 2px;">Events</a> - <a href="http://www.apache.org/foundation/thanks.html"; style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; text-decoration: none; margin: 5px 2px;">Thanks</a> - <a href="http://www.apache.org/foundation/sponsorship.html"; style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; text-decoration: none; margin: 5px 2px;">Sponsorship</a> - <a href="http://www.apache.org/licenses/"; style="color:lightblue;padding: 5px; font-size: 10px; text-align: center; text-decoration: none; margin: 5px 2px;">License</a> - <br> - <a href="https://github.com/apache/incubator-singa"; class="fa fa-github" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> - <a href="https://aws.amazon.com/marketplace/seller-profile?id=5bcac385-12c4-4802-aec7-351e09b77b4c"; class="fab fa-aws" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> - <a href="https://hub.docker.com/r/apache/singa/"; class="fab fa-docker" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> - <a href="https://www.linkedin.com/groups/13550034"; class="fa fa-linkedin" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> - <a href="https://twitter.com/ApacheSinga"; class="fa fa-twitter" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> - <a href="https://www.facebook.com/Apache-SINGA-347284219056544/"; class="fa fa-facebook" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> - <a href="https://www.researchgate.net/project/Apache-SINGA"; class="fab fa-researchgate" style="padding: 10px; font-size: 20px; width: 30px; text-align: center; text-decoration: none; margin: 5px 2px;"></a> - - </div> - - <a href="https://github.com/apache/incubator-singa";> - <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;" - src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"; - alt="Fork me on GitHub"> - </a> - - - + </body> </html> \ No newline at end of file
![https://img.youtube.com/vi/T8xGTH9vCBs/0.jpg"](https://img.youtube.com/vi/T8xGTH9vCBs/0.jpg"){kind=link}
![https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"](https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"){kind=link}
![https://img.youtube.com/vi/YOjwtrvTPn4/0.jpg"](https://img.youtube.com/vi/YOjwtrvTPn4/0.jpg"){kind=link}