Skip to content

Commit 7a6330e

Browse files
committed
SINGA-480 Update documentations
reorganize the pages
1 parent 80948aa commit 7a6330e

File tree

13 files changed

+182
-158
lines changed

13 files changed

+182
-158
lines changed

doc/conf.py

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# limitations under the License.
2121

2222
# Directives for doing spell check only for python comments
23-
# cSpell:includeRegExp #.*
23+
# cSpell:includeRegExp #.*
2424
# cSpell:includeRegExp ("""|''')[^]*
2525

2626
# This file is execfile()d with the current directory set to its
@@ -44,7 +44,6 @@
4444
sys.path.append(os.path.abspath('../python/'))
4545
sys.path.append(os.path.abspath('../build/python/'))
4646

47-
4847
# -- General configuration ------------------------------------------------
4948
from recommonmark.parser import CommonMarkParser
5049

@@ -143,7 +142,6 @@
143142
# If true, `todo` and `todoList` produce output, else they produce nothing.
144143
todo_include_todos = False
145144

146-
147145
# -- Options for HTML output ----------------------------------------------
148146

149147
# The theme to use for HTML and HTML Help pages. See the documentation for
@@ -172,7 +170,7 @@
172170
# The name of an image file (relative to this directory) to place at the top
173171
# of the sidebar.
174172
#
175-
html_logo = '/singa.png'
173+
html_logo = '_static/singa.png'
176174

177175
# The name of an image file (relative to this directory) to use as a favicon of
178176
# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
@@ -268,21 +266,21 @@
268266
# -- Options for LaTeX output ---------------------------------------------
269267

270268
latex_elements = {
271-
# The paper size ('letterpaper' or 'a4paper').
272-
#
273-
# 'papersize': 'letterpaper',
269+
# The paper size ('letterpaper' or 'a4paper').
270+
#
271+
# 'papersize': 'letterpaper',
274272

275-
# The font size ('10pt', '11pt' or '12pt').
276-
#
277-
# 'pointsize': '10pt',
273+
# The font size ('10pt', '11pt' or '12pt').
274+
#
275+
# 'pointsize': '10pt',
278276

279-
# Additional stuff for the LaTeX preamble.
280-
#
281-
# 'preamble': '',
277+
# Additional stuff for the LaTeX preamble.
278+
#
279+
# 'preamble': '',
282280

283-
# Latex figure (float) alignment
284-
#
285-
# 'figure_align': 'htbp',
281+
# Latex figure (float) alignment
282+
#
283+
# 'figure_align': 'htbp',
286284
}
287285

288286
# Grouping the document tree into LaTeX files. List of tuples
@@ -319,30 +317,25 @@
319317
#
320318
# latex_domain_indices = True
321319

322-
323320
# -- Options for manual page output ---------------------------------------
324321

325322
# One entry per manual page. List of tuples
326323
# (source start file, name, description, authors, manual section).
327-
man_pages = [
328-
(master_doc, 'incubator-singa', u'incubator-singa Documentation',
329-
[author], 1)
330-
]
324+
man_pages = [(master_doc, 'incubator-singa', u'incubator-singa Documentation',
325+
[author], 1)]
331326

332327
# If true, show URL addresses after external links.
333328
#
334329
# man_show_urls = False
335330

336-
337331
# -- Options for Texinfo output -------------------------------------------
338332

339333
# Grouping the document tree into Texinfo files. List of tuples
340334
# (source start file, target name, title, author,
341335
# dir menu entry, description, category)
342336
texinfo_documents = [
343-
(master_doc, 'incubator-singa', u'incubator-singa Documentation',
344-
author, 'incubator-singa', 'One line description of project.',
345-
'Miscellaneous'),
337+
(master_doc, 'incubator-singa', u'incubator-singa Documentation', author,
338+
'incubator-singa', 'One line description of project.', 'Miscellaneous'),
346339
]
347340

348341
# Documents to append as an appendix to all manuals.

doc/en/community/team-list.rst

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ The SINGA community has developers mainly from National University of Singapore,
4646
+--------------------+--------------------------------+-----------------------------------------------+
4747
| Haibo Chen | [email protected] | NetEase |
4848
+--------------------+--------------------------------+-----------------------------------------------+
49-
| Anh Dinh | [email protected] | National University of Singapore |
49+
| Anh Dinh | [email protected] | Singapore University of Technology and Design |
5050
+--------------------+--------------------------------+-----------------------------------------------+
51-
| Jinyang Gao | [email protected] | National University of Singapore |
51+
| Jinyang Gao | [email protected] | DAMO Academy, Alibaba Group |
5252
+--------------------+--------------------------------+-----------------------------------------------+
53-
| Xin Ji | [email protected] | National University of Singapore |
53+
| Xin Ji | [email protected] | Visenze |
5454
+--------------------+--------------------------------+-----------------------------------------------+
5555
| Chonho Lee | [email protected] | Osaka University |
5656
+--------------------+--------------------------------+-----------------------------------------------+
@@ -62,23 +62,34 @@ The SINGA community has developers mainly from National University of Singapore,
6262
+--------------------+--------------------------------+-----------------------------------------------+
6363
| Anthony K. H. Tung | [email protected] | National University of Singapore |
6464
+--------------------+--------------------------------+-----------------------------------------------+
65-
| Ji Wang | [email protected] | National University of Singapore |
65+
| Ji Wang | [email protected] | Hangzhou MZH Technologies |
6666
+--------------------+--------------------------------+-----------------------------------------------+
67-
| Sheng Wang | [email protected] | National University of Singapore |
67+
| Sheng Wang | [email protected] | DAMO Academy, Alibaba Group |
6868
+--------------------+--------------------------------+-----------------------------------------------+
6969
| Wei Wang | [email protected] | National University of Singapore |
7070
+--------------------+--------------------------------+-----------------------------------------------+
7171
| Yuan Wang | [email protected] | NetEase |
7272
+--------------------+--------------------------------+-----------------------------------------------+
7373
| Wenfeng Wu | [email protected] | National University of Singapore |
7474
+--------------------+--------------------------------+-----------------------------------------------+
75-
| Zhongle Xie | [email protected] | National University of Singapore |
75+
| Zhongle Xie | [email protected] | Hangzhou MZH Technologies |
7676
+--------------------+--------------------------------+-----------------------------------------------+
77-
| Meihui Zhang | [email protected] | Singapore University of Technology and Design |
77+
| Meihui Zhang | [email protected] | Beijing Institute of Technology |
7878
+--------------------+--------------------------------+-----------------------------------------------+
7979
| Kaiping Zheng | [email protected] | National University of Singapore |
8080
+--------------------+--------------------------------+-----------------------------------------------+
8181
| Moaz Reyad | [email protected] | University of Genoa |
8282
+--------------------+--------------------------------+-----------------------------------------------+
83-
| Chang Yao | [email protected] | yzBigdata |
83+
| Chang Yao | [email protected] | Hangzhou MZH Technologies |
8484
+--------------------+--------------------------------+-----------------------------------------------+
85+
86+
87+
88+
How to become a SINGA committer
89+
--------------------------------
90+
91+
SINGA committers are members that have write access to SINGA code and documentation repositories. They can contribute by themselves and accept other contributions.
92+
93+
Becoming a SINGA committer requires understanding the Apache Way and being an active member in the SINGA project. An active member participates on mailing lists, answers questions, contributes code, tests and documentation, presents SINGA in talks and seminars, verifies releases and report issues or feature requests.
94+
95+
New committers can be suggested by current committers or PPMC members, and voted upon by the PPMC according to Apache guidelines. You can start by talking to other committers and ask for their advice and guidance.
Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
120
# Build SINGA from Source
221

322

@@ -7,6 +26,7 @@ The source files could be downloaded either as a
726
$ git clone https://github.com/apache/incubator-singa.git
827
$ cd incubator-singa/
928

29+
If you want to contribute code to SINGA, refer to [this page]() for the steps and requirements.
1030

1131
## Use Conda to build SINGA
1232

@@ -59,7 +79,7 @@ Each specific SINGA package is identified by the version and build string. To in
5979

6080
conda install -c <anaconda username> -c conda-forge singa=2.1.0.dev=cpu_py36
6181

62-
To make the installation command simple, we create the following additional packages which depend on the latest CPU and GPU SINGA packages.
82+
To make the installation command simple, you can create the following additional packages which depend on the latest CPU and GPU SINGA packages.
6383

6484
# for singa-cpu
6585
conda build tool/conda/cpu/ --python=3.6
@@ -88,7 +108,7 @@ To build SINGA with GPU, MKLDNN, Python and unit tests, run the following instru
88108
pip install .
89109

90110
The details of the CMake options are explained in the last section of this page.
91-
The last command install the Python package. You can also run `pip install -e .`, which creates symlinks instead of copying files into python the site-package folder.
111+
The last command install the Python package. You can also run `pip install -e .`, which creates symlinks instead of copying the Python files into the site-package folder.
92112

93113
If SINGA is compiled with ENABLE_TEST=ON, you can run the unit tests by
94114

@@ -97,10 +117,13 @@ If SINGA is compiled with ENABLE_TEST=ON, you can run the unit tests by
97117
You can see all the testing cases with testing results. If SINGA passes all
98118
tests, then you have successfully installed SINGA.
99119

120+
100121
## Use native tools to Build SINGA on Centos7
122+
101123
Building from source will be different for Centos7 as package names differ.Follow the instructions given below.
102124

103125
### Installing dependencies
126+
104127
Basic packages/libraries
105128

106129
sudo yum install freetype-devel libXft-devel ncurses-devel openblas-devel blas-devel lapack devel atlas-devel kernel-headers unzip wget pkgconfig zip zlib-devel libcurl-devel cmake curl unzip dh-autoreconf git python-devel glog-devel protobuf-devel
@@ -142,7 +165,7 @@ Instructions for building on Windows with Python support can be found [here](ins
142165

143166
## More details about the compilation options
144167

145-
### USE_MODULES
168+
### USE_MODULES (deprecated)
146169

147170
If protobuf and openblas are not installed, you can compile SINGA together with them
148171

@@ -164,7 +187,7 @@ the following environment variables
164187

165188
### USE_PYTHON
166189

167-
Similar to compile CPP code, PySINGA is compiled by
190+
Option for compiling the Python wrapper for SINGA,
168191

169192
$ cmake -DUSE_PYTHON=ON ..
170193
$ make
@@ -178,7 +201,7 @@ Users are encouraged to install the CUDA and
178201
[cuDNN](https://developer.nvidia.com/cudnn) for running SINGA on GPUs to
179202
get better performance.
180203

181-
SINGA has been tested over CUDA 9, and cuDNN 7. If cuDNN is
204+
SINGA has been tested over CUDA 9/10, and cuDNN 7. If cuDNN is
182205
installed into non-system folder, e.g. /home/bob/local/cudnn/, the following
183206
commands should be executed for cmake and the runtime to find it
184207

@@ -249,19 +272,14 @@ This setting is used to build the Debian package. Set PACKAGE=ON and build the p
249272

250273
## FAQ
251274

252-
* Q: Error from 'import singa' using PySINGA installed from wheel.
275+
* Q: Error from 'import singa'
253276

254-
A: Please check the detailed error from `python -c "from singa import _singa_wrap"`. Sometimes it is
255-
caused by the dependent libraries, e.g. there are multiple versions of protobuf, missing of cudnn, numpy version mismatch. Following
256-
steps show the solutions for different cases
257-
1. Check the cudnn and cuda and gcc versions, cudnn5 and cuda7.5 and gcc4.8/4.9 are preferred. if gcc is 5.0, then downgrade it.
258-
If cudnn is missing or not match with the wheel version, you can download the correct version of cudnn into ~/local/cudnn/ and
277+
A: Please check the detailed error from `python -c "from singa import _singa_wrap"`. Sometimes it is caused by the dependent libraries, e.g. there are multiple versions of protobuf, missing of cudnn, numpy version mismatch. Following steps show the solutions for different cases
278+
1. Check the cudnn and cuda. If cudnn is missing or not match with the wheel version, you can download the correct version of cudnn into ~/local/cudnn/ and
259279

260280
$ echo "export LD_LIBRARY_PATH=/home/<yourname>/local/cudnn/lib64:$LD_LIBRARY_PATH" >> ~/.bashrc
261281

262-
2. If it is the problem related to protobuf, then download the newest whl files which have [compiled protobuf and openblas into the whl](https://issues.apache.org/jira/browse/SINGA-255) file of PySINGA.
263-
Or you can install protobuf from source into a local folder, say ~/local/;
264-
Decompress the tar file, and then
282+
2. If it is the problem related to protobuf. You can install protobuf (3.6.1) from source into a local folder, say ~/local/; Decompress the tar file, and then
265283

266284
$ ./configure --prefix=/home/<yourname>local
267285
$ make && make install
@@ -366,7 +384,7 @@ This setting is used to build the Debian package. Set PACKAGE=ON and build the p
366384

367385
After this, you can build glog again.
368386

369-
* Q: When using virtual environment, everytime I run pip install, it would reinstall numpy. However, the numpy would not be used when I `import numpy`
387+
* Q: When using virtual environment, every time I run pip install, it would reinstall numpy. However, the numpy would not be used when I `import numpy`
370388

371389
A: It could be caused by the `PYTHONPATH` which should be set to empty when you are using virtual environment to avoid the conflicts with the path of
372390
the virtual environment.
@@ -377,7 +395,7 @@ This setting is used to build the Debian package. Set PACKAGE=ON and build the p
377395

378396
$ export CPLUS_INCLUDE_PATH=`python -c "import numpy; print numpy.get_include()"`:$CPLUS_INCLUDE_PATH
379397

380-
* Q: When I run PySINGA in Mac OS X, I got the error "Fatal Python error: PyThreadState_Get: no current thread Abort trap: 6"
398+
* Q: When I run SINGA in Mac OS X, I got the error "Fatal Python error: PyThreadState_Get: no current thread Abort trap: 6"
381399

382400
A: This error happens typically when you have multiple version of Python on your system and you installed SINGA via pip (this problem is resolved for installation via conda),
383401
e.g, the one comes with the OS and the one installed by Homebrew. The Python linked by PySINGA must be the same as the Python interpreter.
@@ -387,4 +405,4 @@ This setting is used to build the Debian package. Set PACKAGE=ON and build the p
387405

388406
$ cmake -DPYTHON_LIBRARY=`python-config --prefix`/lib/libpython2.7.dylib -DPYTHON_INCLUDE_DIR=`python-config --prefix`/include/python2.7/ ..
389407

390-
If installed PySINGA from binary packages, e.g. debian or wheel, then you need to change the python interpreter, e.g., reset the $PATH to put the correct path of Python at the front position.
408+
If installed PySINGA from binary packages, e.g. debian or wheel, then you need to change the python interpreter, e.g., reset the $PATH to put the correct path of Python at the front position.

0 commit comments

Comments
 (0)