Repository: incubator-singa Updated Branches: refs/heads/master 336ef5500 -> fefcab993
SINGA-319 Fix link errors on the index page Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/fefcab99 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/fefcab99 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/fefcab99 Branch: refs/heads/master Commit: fefcab9930d7775a9243e1ebca17408df234c352 Parents: 336ef55 Author: Meihui Zhang <[email protected]> Authored: Sat May 27 10:37:50 2017 +0800 Committer: Meihui Zhang <[email protected]> Committed: Sat May 27 10:37:50 2017 +0800 ---------------------------------------------------------------------- doc/en/docs/installation.md | 4 ++-- doc/zh/index.rst | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/fefcab99/doc/en/docs/installation.md ---------------------------------------------------------------------- diff --git a/doc/en/docs/installation.md b/doc/en/docs/installation.md index 3a596d6..7772cc0 100755 --- a/doc/en/docs/installation.md +++ b/doc/en/docs/installation.md @@ -9,11 +9,11 @@ Currently, SINGA has conda packages (Python2.7) for Linux and MacOSX. 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>. Users need to install CUDA and cuDNN before installing SINGA. http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/fefcab99/doc/zh/index.rst ---------------------------------------------------------------------- diff --git a/doc/zh/index.rst b/doc/zh/index.rst index d7c06d6..e564440 100644 --- a/doc/zh/index.rst +++ b/doc/zh/index.rst @@ -23,33 +23,33 @@ SINGA ä¸æææ¡£ ææ°å¨æ ----------- -* **çæ¬ 1.1** äº2017å¹´2æ12æ¥åå¸. `请ç¹å»ä¸è½½ v1.1.0 <../en/downloads.html>`_ +* **çæ¬ 1.1.0** äº2017å¹´2æ12æ¥åå¸. `ä¸è½½é¡µé¢ <../en/downloads.html>`_ * å ³äºSINGA V1çè®²åº§å¨ `SGInnovate <https://www.eventbrite.sg/e/ai-eveningssginnovate-apache-singa-tickets-31505061487>`_ 举è¡, æ¶é´ï¼2017å¹´3æ23æ¥ -* **çæ¬ 1** äº2016å¹´9æ9æ¥åå¸. `请ç¹å»ä¸è½½SINGA v1.0.0 <../en/downloads.html>`_ +* **çæ¬ 1.0.0** äº2016å¹´9æ9æ¥åå¸. `ä¸è½½é¡µé¢ <../en/downloads.html>`_ * æä»¬å¨ `REWORK <https://www.re-work.co/events/deep-learning-singapore/schedule>`_ æ¥åäºSINGAçææ°è¿å±, æ¶é´ï¼2016å¹´10æ21æ¥. -* å ³äºSINGAç讲座å¨`PyDataSG <http://www.meetup.com/PyData-SG/events/229691286/>`_举å, æ¶é´ï¼2016å¹´8æ16æ¥. +* å ³äºSINGAçè®²åº§å¨ `PyDataSG <http://www.meetup.com/PyData-SG/events/229691286/>`_ 举å, æ¶é´ï¼2016å¹´8æ16æ¥. -* **çæ¬ 0.3** äº2016å¹´4æ20æ¥åå¸. `请ç¹å»ä¸è½½ SINGA v0.3.0 <../en/downloads.html>`_ +* **çæ¬ 0.3.0** äº2016å¹´4æ20æ¥åå¸. `ä¸è½½é¡µé¢ <../en/downloads.html>`_ -* **çæ¬ 0.2** äº2016å¹´1æ14æ¥åå¸. `请ç¹å»ä¸è½½ SINGA v0.2.0 <../en/downloads.html>`_. +* **çæ¬ 0.2.0** äº2016å¹´1æ14æ¥åå¸. `ä¸è½½é¡µé¢ <../en/downloads.html>`_. -* æ们å¨`Strata+Hadoop <http://strataconf.com/big-data-conference-sg-2015/public/schedule/detail/45123>`_ åäºå ³äºSINGAçæ¥å, æ¶é´ï¼2015å¹´12æ2æ¥ +* æä»¬å¨ `Strata+Hadoop<http://strataconf.com/big-data-conference-sg-2015/public/schedule/detail/45123>`_ åäºå ³äºSINGAçæ¥å, æ¶é´ï¼2015å¹´12æ2æ¥ -* æ们å¨å¤åªä½å½é ä¼è®®(`ACM Multimedia <http://www.acmmm.org/2015/at-a-glance/>`_ ) çæ佳论æåå¼æºç«èµç¯èæ¥åäºå ³äºSINGAçå·¥ä½. æ¶é´2015å¹´10æ26-30(`èµæ <http://www.comp.nus.edu.sg/~dbsystem/singa//assets/file/mm2015.ppt>`_) +* æ们å¨å¤åªä½å½é ä¼è®®(`ACM Multimedia<http://www.acmmm.org/2015/at-a-glance/>`_ ) çæ佳论æåå¼æºç«èµç¯èæ¥åäºå ³äºSINGAçå·¥ä½. æ¶é´2015å¹´10æ26-30(`èµæ <http://www.comp.nus.edu.sg/~dbsystem/singa//assets/file/mm2015.ppt>`_) -* **çæ¬ 0.1** äº2015å¹´10æ8æ¥åå¸.. `请ç¹å»ä¸è½½ SINGA v0.1.0 <../en/downloads.html>`_. +* **çæ¬ 0.1** äº2015å¹´10æ8æ¥åå¸. `ä¸è½½é¡µé¢ SINGA v0.1.0 <../en/downloads.html>`_. -* æ们举åäºä¸å±å ³äº`深度å¦ä¹ çç 讨ä¼<http://www.comp.nus.edu.sg/~dbsystem/singa/workshop>`_ï¼å¹¶æ¥åäºSINGA.æ¶é´ï¼2015å¹´9æ16 +* æ们举åäºä¸å±å ³äº `深度å¦ä¹ çç 讨ä¼<http://www.comp.nus.edu.sg/~dbsystem/singa/workshop>`_ ï¼å¹¶æ¥åäºSINGA.æ¶é´ï¼2015å¹´9æ16 -* SINGAåå±äºVLDB2015æé´ä¸¾åçå¼æºé¡¹ç®ç 讨ä¼`BOSS <http://boss.dima.tu-berlin.de/>`_ æ¶é´2015å¹´9æ4æ¥. (`ç®ä» <http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/singa-vldb-boss.pptx>`_, `åºç¡ <http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/basic-user-guide.pptx>`_, `é«çº§ <http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/advanced-user-guide.pptx>`_) +* SINGAåå±äºVLDB2015æé´ä¸¾åçå¼æºé¡¹ç®ç è®¨ä¼ `BOSS <http://boss.dima.tu-berlin.de/>`_ æ¶é´2015å¹´9æ4æ¥. (`ç®ä» <http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/singa-vldb-boss.pptx>`_, `åºç¡ <http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/basic-user-guide.pptx>`_ , `é«çº§ <http://www.comp.nus.edu.sg/~dbsystem/singa/assets/file/advanced-user-guide.pptx>`_ ) * æä»¬å¨ VLDB ææå¦æ ¡åäºå ³äºSINGAçæå¦. æ¶é´ï¼2015å¹´7æ; å°ç¹ï¼æ¸ å大å¦. -* æ们`SIGMOD 2015 <http://www.sigmod2015.org/index.shtml>`_çç 讨ä¼`DanaC <http://danac.org/>`_ ä¸é¢æ¥åäºSINGA. æ¶é´ï¼2015å¹´5æ31æ¥-6æ4æ¥;å°ç¹ï¼å¢¨å°æ¬ +* æ们 `SIGMOD 2015<http://www.sigmod2015.org/index.shtml>`_ çç è®¨ä¼ `DanaC<http://danac.org/>`_ ä¸é¢æ¥åäºSINGA. æ¶é´ï¼2015å¹´5æ31æ¥-6æ4æ¥;å°ç¹ï¼å¢¨å°æ¬ * SINGA å å ¥ `Apache Incubator <http://incubator.apache.org/>`_, 2015å¹´3æ17æ¥. @@ -57,9 +57,9 @@ SINGA å ¥é¨ --------------- * æ éå®è£ ï¼ç´æ¥ä½¿ç¨ `AWS <https://aws.amazon.com/marketplace/pp/B01NAUAWZW>`_ or via `Docker <https://hub.docker.com/r/nusdbsystem/singa/>`_. -* å®è£ SINGAï¼éè¿ `conda<../en/docs/installation.html#from-conda`_, `Debian packages <../en/docs/installation.html#from-debian-package>`_ or from `source <../en/docs/installation.html#from-source>`_. +* å®è£ SINGAï¼éè¿ `conda<../en/docs/installation.html#from-conda`_, `Debian packages <../en/docs/installation.html#from-debian-package>`_ æè `æºç <../en/docs/installation.html#from-source>`_. -* æ´å¤æä½åå®ä¾ï¼åè`Jupyter notebooks <http://nbviewer.jupyter.org/github/apache/incubator-singa/blob/master/doc/en/docs/notebook/index.ipynb>`_ +* æ´å¤æä½åå®ä¾ï¼åè `Jupyter notebooks <http://nbviewer.jupyter.org/github/apache/incubator-singa/blob/master/doc/en/docs/notebook/index.ipynb>`_ .. |logo1| image:: _static/github.png :scale: 100%
