You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@singa.apache.org by wa...@apache.org on 2016/10/25 11:42:45 UTC
svn commit: r1766516 [1/3] - in /incubator/singa/site/trunk/en: ./
_sources/docs/ _sources/docs/examples/cifar10/ docs/ docs/examples/
docs/examples/char-rnn/ docs/examples/cifar10/ docs/examples/imagenet/
Author: wangwei
Date: Tue Oct 25 11:42:44 2016
New Revision: 1766516
URL: http://svn.apache.org/viewvc?rev=1766516&view=rev
Log:
reorganize installation doc
Added:
incubator/singa/site/trunk/en/_sources/docs/converter.txt
incubator/singa/site/trunk/en/_sources/docs/dependencies.txt
incubator/singa/site/trunk/en/_sources/docs/net.txt
incubator/singa/site/trunk/en/_sources/docs/snapshot.txt
incubator/singa/site/trunk/en/docs/converter.html
incubator/singa/site/trunk/en/docs/dependencies.html
incubator/singa/site/trunk/en/docs/net.html
incubator/singa/site/trunk/en/docs/snapshot.html
Modified:
incubator/singa/site/trunk/en/_sources/docs/examples/cifar10/README.txt
incubator/singa/site/trunk/en/_sources/docs/index.txt
incubator/singa/site/trunk/en/_sources/docs/installation.txt
incubator/singa/site/trunk/en/_sources/docs/utils.txt
incubator/singa/site/trunk/en/docs.html
incubator/singa/site/trunk/en/docs/data.html
incubator/singa/site/trunk/en/docs/device.html
incubator/singa/site/trunk/en/docs/examples/char-rnn/README.html
incubator/singa/site/trunk/en/docs/examples/cifar10/README.html
incubator/singa/site/trunk/en/docs/examples/imagenet/README.html
incubator/singa/site/trunk/en/docs/examples/index.html
incubator/singa/site/trunk/en/docs/image_tool.html
incubator/singa/site/trunk/en/docs/index.html
incubator/singa/site/trunk/en/docs/initializer.html
incubator/singa/site/trunk/en/docs/installation.html
incubator/singa/site/trunk/en/docs/layer.html
incubator/singa/site/trunk/en/docs/loss.html
incubator/singa/site/trunk/en/docs/metric.html
incubator/singa/site/trunk/en/docs/optimizer.html
incubator/singa/site/trunk/en/docs/software_stack.html
incubator/singa/site/trunk/en/docs/tensor.html
incubator/singa/site/trunk/en/docs/utils.html
incubator/singa/site/trunk/en/genindex.html
incubator/singa/site/trunk/en/objects.inv
incubator/singa/site/trunk/en/py-modindex.html
incubator/singa/site/trunk/en/searchindex.js
Added: incubator/singa/site/trunk/en/_sources/docs/converter.txt
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/_sources/docs/converter.txt?rev=1766516&view=auto
==============================================================================
--- incubator/singa/site/trunk/en/_sources/docs/converter.txt (added)
+++ incubator/singa/site/trunk/en/_sources/docs/converter.txt Tue Oct 25 11:42:44 2016
@@ -0,0 +1,23 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+
+Caffe Converter
+================
+
+.. automodule:: singa.converter
+ :members:
Added: incubator/singa/site/trunk/en/_sources/docs/dependencies.txt
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/_sources/docs/dependencies.txt?rev=1766516&view=auto
==============================================================================
--- incubator/singa/site/trunk/en/_sources/docs/dependencies.txt (added)
+++ incubator/singa/site/trunk/en/_sources/docs/dependencies.txt Tue Oct 25 11:42:44 2016
@@ -0,0 +1,92 @@
+# Dependent library installation
+
+## Windows
+
+This section is used to compile and install the dependent libraries under
+windows system from source codes. The following instructions ONLY work for Visual Studio 2015 as
+previous VS does not support [C++11 features](https://msdn.microsoft.com/en-us/library/hh567368.aspx) well (including generic lambdas, auto, non-static
+data member initializers). If you intend to generate a 32-bit/64-bit singa solution, please configure all the
+VS projects for the dependent libraries as 32-bit/64-bit. This can be done by
+"Configuration Manager" in VS 2015 or use corresponding generator in cmake. When compiling the following libraries, you
+may get system-specific warnings/errors. Please fix them according to the
+prompts by VS.
+
+### Google Logging
+The glog library is an optional library for singa project. But it is currently necessary for Window compilation.
+Since the latest release version of glog will encounter error C2084 on sprintf function
+under VS2015, we test the compilation and installation using the master branch from [github](https://github.com/google/glog).
+
+Step 1: Download and decompress the source code. Or use `git clone
+https://github.com/google/glog` to get the code.
+
+Step 2: Open "glog.sln" file under project folder. You will get a conversion
+dialog and please finish it by the prompts. Compile all the projects in the solution after
+proper configuration, especially "libglog" and "libglog_static" projects.
+
+Step 3: Copy all the header files and the entire directory named "glog" under
+"src\windows\" folder into the installation include folder (or system folder).
+Copy all the generated library files into the installation library folder (or
+system folder).
+
+Step 4: Done.
+
+
+### Google protobuf
+
+Tested on version 2.6.1:
+
+Step 1: Download and decompress the source code.
+
+Step 2: Open "protobuf.sln" file under "vsprojects" folder. You will get a conversion
+dialog and please finish it by the prompts. Compile all the projects in the solution after proper
+configuration. Especially "libprotobuf", "libprotobuf-lite", "libprotoc" and
+"protoc" projects.
+
+Step 3: Run "extract_includes.bat" script under "vsprojects" folder, you will
+get a new "include" folder with all the headers.
+
+Step 4: Copy the library files, such as "libprotobuf.lib",
+"libprotobuf-lite.lib", "libprotoc.lib", etc., into your installation library folder (or
+system folder). Copy the binary file "protoc" into your installation binary
+folder (or system folder). Copy all the headers and folders in "include" folder into your
+installation include folder (or system folder).
+
+Step 5: Done.
+
+### CBLAS
+
+There are ready-to-use binary packages online
+([link](https://sourceforge.net/projects/openblas/files/)). However, we still install
+OpenBLAS with version 0.2.18 as test:
+
+Step 1: Download and decompress the source code.
+
+Step 2: Start a cmd window under the OpenBLAS folder then run the following
+commands to generate the solution:
+
+ $ md build $$ cd build
+ $ cmake -G "Visual Studio 14" ..
+
+Or run `cmake -G "Visual Studio 14 Win64"` as you wish.
+
+Step 3: Install Perl into your system and put perl.exe on your path. Open "OpenBlas.sln" and build the solution, especially "libopenblas"
+project.
+
+Step 4: Copy the library files under "build\lib" folder and all header files
+under OpenBLAS folder into installation library and include folders (or system
+folders).
+
+Step 5: Done.
+
+
+## FAQ
+
+1. Error C2375 'snprintf': redefinition; different linkage
+
+ Add “HAVE_SNPRINTF” to “C/C++ - Preprocessor - Preprocessor definitions”
+
+2. Error due to hash map
+
+ Add "_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS" to Preprocessor Definitions.
+
+
Modified: incubator/singa/site/trunk/en/_sources/docs/examples/cifar10/README.txt
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/_sources/docs/examples/cifar10/README.txt?rev=1766516&r1=1766515&r2=1766516&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/_sources/docs/examples/cifar10/README.txt (original)
+++ incubator/singa/site/trunk/en/_sources/docs/examples/cifar10/README.txt Tue Oct 25 11:42:44 2016
@@ -10,6 +10,7 @@ the best validation accuracy (without da
2. [VGGNet](http://torch.ch/blog/2015/07/30/cifar.html), the best validation accuracy (without data augmentation) we achieved was about 89%.
3. [ResNet](https://github.com/facebook/fb.resnet.torch), the best validation accuracy (without data augmentation) we achieved was about 83%.
+4. [Alexnet from Caffe](https://github.com/BVLC/caffe/tree/master/examples/cifar10), SINGA is able to convert model from Caffe seamlessly.
## Instructions
@@ -40,7 +41,8 @@ version of the Cifar-10 dataset in 'cifa
python train.py vgg cifar-10-batches-py
- To train other models, please replace 'vgg' to 'alexnet' or 'resnet'. By default
+ To train other models, please replace 'vgg' to 'alexnet', 'resnet' or 'caffe',
+ where 'caffe' refers to the alexnet model converted from Caffe. By default
the training would run on a CudaGPU device, to run it on CppCPU, add an additional
argument
Modified: incubator/singa/site/trunk/en/_sources/docs/index.txt
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/_sources/docs/index.txt?rev=1766516&r1=1766515&r2=1766516&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/_sources/docs/index.txt (original)
+++ incubator/singa/site/trunk/en/_sources/docs/index.txt Tue Oct 25 11:42:44 2016
@@ -26,10 +26,14 @@ Documentation
device
tensor
layer
+ net
initializer
loss
metric
optimizer
data
image_tool
+ snapshot
+ converter
+ utils
examples/index
Modified: incubator/singa/site/trunk/en/_sources/docs/installation.txt
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/_sources/docs/installation.txt?rev=1766516&r1=1766515&r2=1766516&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/_sources/docs/installation.txt (original)
+++ incubator/singa/site/trunk/en/_sources/docs/installation.txt Tue Oct 25 11:42:44 2016
@@ -1,136 +1,84 @@
# Installation
-## Dependencies
-
-### Required
-* google protobuf (>=2.5,<3)
-* blas (tested with openblas >=0.2.10)
-* cmake (>=2.6)
-
-
-### Optional
-* cuda (tested with 6.5, 7.0 and 7.5)
-* cudnn (v4 and v5)
-* opencv (tested with 2.4.8)
-* lmdb (tested with 0.9)
-* glog
-* opencl-headers and viennacl (version 1.7.1 or newer) for OpenCL support
-
-PySINGA (the Python binding) has additional dependencies
-
-* python(==2.7)
-* pip(>=1.5)
-* swig(>=3.0.10)
-* numpy(>=1.11.0)
-
-Users are encouraged to install the cuda and [cudnn](https://developer.nvidia.com/cudnn) for running SINGA on GPUs to
-get better performance.
-Most of the dependent libraries could be installed from source or via package mangers like
-apt-get, homebrew, pip and anaconda. Please refer to FAQ for problems caused by the path setting of the dependent libraries.
-
-
-### apt-get
-The following instructions are tested on Ubuntu 14.04 for installing dependent libraries.
+## Install PySINGA
- # required libraries
- $ sudo apt-get install libprotobuf-dev libopenblas-dev protobuf-compiler
+PySINGA has been tested on Linux (Ubunu 14.04 and 16.04) and Mac OS (10.11).
- # optional libraries
- $ sudo apt-get install python2.7-dev python-pip python-numpy
- $ sudo apt-get install libopencv-dev libgoogle-glog-dev liblmdb-dev
+### Install dependent libraries
-Please note that PySINGA requires swig >=3.0, which could be installed via
-apt-get on Ubuntu 16.04; but it has to be installed from source for other Ubuntu versions including 14.04.
+Python 2.7 is required to run PySINGA.
-### homebrew
-The following instructions are tested on Mac OS X Yosemite (10.10.5) for installing dependent libraries.
-
- # required libraries
- $ brew tap homebrew/science
- $ brew install openblas
- $ brew install protobuf260
+ # For Ubuntu
+ $ sudo apt-get install python2.7-dev python-pip
- # optional libraries
+ # For Mac
$ brew tap homebrew/python
$ brew install python
- $ brew install opencv
- $ brew install -vd glog lmdb
-By default, openblas is installed into /usr/local/opt/openblas. To let the compiler (and cmake) know the openblas
-path, please export
+### Virtual environment
- $ export CMAKE_INCLUDE_PATH=/usr/local/opt/openblas/include:$CMAKE_INCLUDE_PATH
- $ export CMAKE_LIBRARY_PATH=/usr/local/opt/openblas/lib:$CMAKE_LIBRARY_PATH
-
-To let the runtime know the openblas path, please export
-
- $ export LD_LIBRARY_PATH=/usr/local/opt/openblas/library:$LD_LIBRARY_PATH
+Users are recommended to use PySINGA in python virtual environment.
-### pip and anaconda for PySINGA
-pip and anaconda could be used to install python packages, e.g. numpy.
-Python virtual environment is recommended to run PySINGA.
To use pip with virtual environment,
# install virtualenv
$ pip install virtualenv
$ virtualenv pysinga
$ source pysinga/bin/activate
- $ pip install numpy
To use anaconda with virtual environment,
$ conda create --name pysinga python=2
$ source activate pysinga
- $ conda install numpy
-After installing numpy, please export the header path of numpy.i as
-
- $ export CPLUS_INCLUDE_PATH=`python -c "import numpy; print numpy.get_include()"`:$CPLUS_INCLUDE_PATH
+Note that in python virtual environment, you may need to reset the `PYTHONPATH` to empty
+to avoid the conflicts of system path and virtual environment path.
-## Install PySINGA
### From wheel
-After installing the dependencies for SINGA and PySINGA, please download the correct binary:
+Currently, we have three versions of wheel files,
- # Ubuntu/Linux 64-bit, 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-linux_x86_64.whl
+ # Ubuntu 14.04 64-bit, CPU only, Python 2.7
+ $ pip install --upgrade http://comp.nus.edu.sg/~dbsystem/singa/assets/file/ubuntu1404/singa-1.0.0-cp27-none-linux_x86_64.whl
- # 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
+ # Ubuntu 14.04 64-bit, GPU enabled, Python 2.7, CUDA toolkit 7.5 and CuDNN v5
+ $ pip install --upgrade http://comp.nus.edu.sg/~dbsystem/singa/assets/file/ubuntu1404/cuda7.5-cudnn5/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
+ $ pip install --upgrade http://comp.nus.edu.sg/~dbsystem/singa/assets/file/pb2.6/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
+If you have sudo right, you can run the above commands using `sudo pip install` without python virtual environment.
+You can also download the `.whl` file and run `pip install <the whl file directly>`.
+The option `--upgrade` may cause errors sometimes, in which case you can ignore it.
- # Ubuntu/Linux 64-bit, GPU enabled, Python 2.7, Protobuf 2.6, CUDA toolkit 7.5 and CuDNN v5
- $ export SINGA_WHEEL_URL=http://comp.nus.edu.sg/~dbsystem/singa/assets/file/pb2.6-cuda7.5-cudnn5/singa-1.0.0-cp27-none-linux_x86_64.whl
+### From source
-Then, run the following command
+To build the PySINGA from source, the following dependent libraries are required,
- $ sudo pip install --upgrade $SINGA_WHEEL_URL
+* swig(>=3.0.10)
+* numpy(>=1.11.0)
-If you do not have sudo right, you can run `pip install` in a python virtual environment.
-Note that in python virtual environment, you may need to reset the `PYTHONPATH` to empty
-to avoid the conflicts of system path and virtual environment path.
+They can be installed by
+ $ Ubuntu 14.04 and 16.04
+ $ sudo apt-get install python-numpy
+ # Ubuntu 16.04
+ $ sudo apt-get install swig
-### From source
+Note that swig has to be installed from source on Ubuntu 14.04.
+After installing numpy, please export the header path of numpy.i as
+
+ $ export CPLUS_INCLUDE_PATH=`python -c "import numpy; print numpy.get_include()"`:$CPLUS_INCLUDE_PATH
-Please compile SINGA from source (see the next section) with the 'USE_PYTHON' option on (`cmake -DUSE_PYTHON=ON ..`),
+Please compile SINGA from source (see the next section) with `cmake -DUSE_PYTHON=ON -DUSE_MODULES=ON ..`,
and then run the following commands,
# under the build directory
$ cd python
- $ sudo pip install .
-
-If you are using a virtual environment, you can ignore the `sudo` keyword.
+ $ pip install .
Developers can build the wheel file via
@@ -139,50 +87,98 @@ Developers can build the wheel file via
$ python setup.py bdist_wheel
The generated wheel file is under "dist" directory.
-To build cnmem into the wheel file, please change CMakeLists.txt by replacing
-'SHARED' with 'STATIC'.
-## Build SINGA from source
+## Build SINGA on Linux and Mac OS
The source files could be downloaded either as a [tar.gz file](https://dist.apache.org/repos/dist/dev/incubator/singa/1.0.0/apache-singa-incubating-1.0.0-RC2.tar.gz), or as a git repo
$ git clone https://github.com/apache/incubator-singa.git
$ cd incubator-singa/
- # If you use CUDA, then CNMeM is necessary
- $ git submodule init
- $ git submodule update
+cmake (>=2.8) is used for compile SINGA, which can be installed by
-### Linux & MacOS
+ # For Ubuntu 14.04 and 16.04
+ $ sudo apt-get install cmake
GCC (>=4.8.1) is required to compile SINGA on Linux.
For Mac OS users, you can use either GCC or Clang.
-In SINGA_ROOT, execute the following commands for compiling SINGA,
+### Compile SINGA together with dependent libraries
- $ mkdir build && cd build
- $ cmake ..
+SINGA code uses CBLAS and Protobuf (>=2.5, <3).
+If they are not installed in your OS, you can compile SINGA together with them
+
+ $ In SINGA ROOT folder
+ $ mkdir build
+ $ cd build
+ $ cmake -DUSE_MODULES=ON ..
$ make
- $ make install
-Note that if you are using CUDNN and it is not installed under system default
-folder, you need to let cmake know the paths to CUDNN,
+cmake would download OpenBlas and Protobuf (2.6.1) and compile them together
+with SINGA.
+
+### Install dependent libraries and compile SINGA
- $ export CMAKE_INCLUDE_PATH=<path to cudnn>/include:$CMAKE_INCLUDE_PATH
- $ export CMAKE_LIBRARY_PATH=<path to cudnn>/lib64:$CMAKE_LIBRARY_PATH
+Users can also install the dependent libraries and link SINGA with them.
-You can use `ccmake ..` to configure the compilation options including using
-generating python binding and changing the installation folder. Alternatively,
-the options could be switched on by
+The following libraries are required
+* google protobuf (>=2.5,<3)
+* blas (tested with openblas >=0.2.10)
- $ cmake -DUSE_CUDA=ON -DUSE_PYTHON=ON ..
-If the dependent libraries are not in the system default paths, you need to export
-the following environment variables
+The following libraries are optional
+* opencv (tested with 2.4.8)
+* lmdb (tested with 0.9)
+* glog
+
+
+Most of the dependent libraries could be installed from source or via package mangers like
+apt-get, yum, and homebrew. Please refer to FAQ for problems caused by the path setting of the dependent libraries.
+
+The following instructions are tested on Ubuntu 14.04 for installing dependent libraries.
+
+ # required libraries
+ $ sudo apt-get install libprotobuf-dev libopenblas-dev protobuf-compiler
+
+ # optional libraries
+ $ sudo apt-get install python2.7-dev python-pip python-numpy
+ $ sudo apt-get install libopencv-dev libgoogle-glog-dev liblmdb-dev
+
+Please note that PySINGA requires swig >=3.0, which could be installed via
+apt-get on Ubuntu 16.04; but it has to be installed from source for other Ubuntu versions including 14.04.
- export CMAKE_INCLUDE_PATH=<path to your header file folder>
- export CMAKE_LIBRARY_PATH=<path to your lib file folder>
+The following instructions are tested on Mac OS X Yosemite (10.10.5) for installing dependent libraries.
+
+ # required libraries
+ $ brew tap homebrew/science
+ $ brew install openblas
+ $ brew install protobuf260
+
+ # optional libraries
+ $ brew tap homebrew/python
+ $ brew install python
+ $ brew install opencv
+ $ brew install -vd glog lmdb
+
+By default, openblas is installed into /usr/local/opt/openblas. To let the compiler (and cmake) know the openblas
+path, please export
+
+ $ export CMAKE_INCLUDE_PATH=/usr/local/opt/openblas/include:$CMAKE_INCLUDE_PATH
+ $ export CMAKE_LIBRARY_PATH=/usr/local/opt/openblas/lib:$CMAKE_LIBRARY_PATH
+
+To let the runtime know the openblas path, please export
+
+ $ export LD_LIBRARY_PATH=/usr/local/opt/openblas/library:$LD_LIBRARY_PATH
+
+
+With the dependent libraries installed, SINGA can be compiled via
+
+ $ mkdir build
+ $ cd build
+ $ cmake ..
+ $ make
+ $ make install
After compiling SINGA, you can run the unit tests by
@@ -191,9 +187,45 @@ After compiling SINGA, you can run the u
You can see all the testing cases with testing results. If SINGA passes all
tests, then you have successfully installed SINGA. Please proceed to try the examples!
-### OpenCL support (Linux)
+You can use `ccmake ..` to configure the compilation options.
+If some dependent libraries are not in the system default paths, you need to export
+the following environment variables
+
+ export CMAKE_INCLUDE_PATH=<path to the header file folder>
+ export CMAKE_LIBRARY_PATH=<path to the lib file folder>
+
+### Compile SINGA with CUDA and CUDNN
+
+Users are encouraged to install the cuda and
+[cudnn](https://developer.nvidia.com/cudnn) for running SINGA on GPUs to
+get better performance.
+
+SINGA has been tested over CUDA (7 and 7.5), and CUDNN (4-5.1). If CUDNN is
+decompressed into non-system folder, e.g. /home/bob/local/cudnn/, the following
+commands should be executed for cmake and the runtime to find it
-Install `opencl-headers` and `libviennacl-dev` (Ubuntu 16) or `viennacl` (Fedora).
+ $ export CMAKE_INCLUDE_PATH=/home/bob/local/cudnn/include:$CMAKE_INCLUDE_PATH
+ $ export CMAKE_LIBRARY_PATH=/home/bob/local/cudnn/lib64:$CMAKE_LIBRARY_PATH
+ $ export LD_LIBRARY_PATH=/home/bob/local/cudnn/lib64:$LD_LIBRARY_PATH
+
+The cmake options for CUDA and CUDNN should be switched on
+
+ # Dependent libs are install already
+ $ cmake -DUSE_CUDA=ON ..
+
+ # Compile dependent libs together with SINGA
+ $ cmake -DUSE_CUDA=ON -DUSE_MODULES=ON ..
+
+
+### Compile SINGA with OpenCL support (Linux)
+
+SINGA uses opencl-headers and viennacl (version 1.7.1 or newer) for OpenCL support, which
+can be installed using via
+
+ # On Ubuntu 16.04
+ $ sudo apt-get install opencl-headers, libviennacl-dev
+ # On Fedora
+ $ sudo yum install opencl-headers, viennacl
Additionally, you will need the OpenCL Installable Client Driver (ICD) for the platforms that you want to run OpenCL on.
@@ -212,11 +244,44 @@ Remember to add its directory to `PATH`
To build SINGA with OpenCL support, you need to pass the flag during cmake:
- cmake .. -DUSE_OPENCL=ON
+ cmake -DUSE_OPENCL=ON ..
+
+## Build SINGA on Windows
+
+For the dependent library installation, please refer to [Dependencies](dependencies.md).
+After all the dependencies are successfully installed, just run the following commands to
+generate the VS solution in cmd under singa folder:
+
+ $ md build && cd build
+ $ cmake -G "Visual Studio 14" -DUSE_CUDA=OFF -DUSE_PYTHON=OFF ..
+
+The default project generated by the command is 32-bit version. You can also
+specify a 64-bit version project by:
+
+ $ md build && cd build
+ $ cmake -G "Visual Studio 14 Win64" -DUSE_CUDA=OFF -DUSE_PYTHON=OFF ..
+
+If you get error outputs like "Could NOT find xxxxx" indicating a dependent
+library missing, please configure your library file and include path for cmake or the system.
+For example, you get an error "Could NOT find CBLAS" and suppose you installed
+openblas header files at "d:\include" and openblas library at "d:\lib". You should run the
+following command to specify your cblas parameters in cmake:
+
+ $ cmake -G "Visual Studio 14" -DUSE_CUDA=OFF -DUSE_PYTHON=OFF -DCBLAS_INCLUDE_DIR="d:\include" -DCBLAS_LIBRARIES="d:\lib\libopenblas.lib" -DProtobuf_INCLUDE_DIR=<include dir of protobuf> -DProtobuf_LIBRARIES=<path to libprotobuf.lib> -DProtobuf_PROTOC_EXECUTABLE=<path to protoc.exe> -DGLOG_INCLUDE_DIR=<include dir of glog> -DGLOG_LIBRARIES=<path to libglog.lib> ..
+
+
+To find out the parameters you need to specify for some special libraries, you
+can run the following command:
-### Windows
-To be added.
+ $ cmake -LAH
+If you use cmake GUI tool in windows, please make sure you configure the right
+parameters for the singa solution by select "Advanced" box. After generating the VS project,
+please open the "singa.sln" project file under
+the "build" folder and compile it as a normal VS solution. You will find the
+unit tests file named "test_singa" in the project binary folder.
+If you get errors when running test_singa.exe due to libglog.dll/libopenblas.dll missing,
+please just copy the dll files into the same folder as test_singa.exe
## FAQ
@@ -225,19 +290,20 @@ To be added.
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 or missing of cudnn. Following
steps show the solutions for different cases
- 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.
- if cudnn is missing or not match with the wheel version, you can download the correct version of cudnn into ~/local/cudnn/ and
+ 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.
+ If cudnn is missing or not match with the wheel version, you can download the correct version of cudnn into ~/local/cudnn/ and
```
echo "export LD_LIBRARY_PATH=/home/<yourname>/local/cudnn/lib64:$LD_LIBRARY_PATH" >> ~/.bashrc
```
- 2. if it is the problem related to protobuf, then better install protobuf from source into a local folder, say ~/local/;
+ 2. If it is the problem related to protobuf, then please 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.
+ Or you can install protobuf from source into a local folder, say ~/local/;
Decompress the tar file, and then
```
./configure --prefix=/home/<yourname>local
make && make install
echo "export LD_LIBRARY_PATH=/home/<yourname>/local/lib:$LD_LIBRARY_PATH" >> ~/.bashrc
source ~/.bashrc
- 3. if it cannot find other libs including python, then please create virtual env using pip or conda;
+ 3. If it cannot find other libs including python, then please create virtual env using pip or conda;
and then install SINGA via
```
pip install --upgrade <url of singa wheel>
Added: incubator/singa/site/trunk/en/_sources/docs/net.txt
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/_sources/docs/net.txt?rev=1766516&view=auto
==============================================================================
--- incubator/singa/site/trunk/en/_sources/docs/net.txt (added)
+++ incubator/singa/site/trunk/en/_sources/docs/net.txt Tue Oct 25 11:42:44 2016
@@ -0,0 +1,23 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+
+FeedForward Net
+===============
+
+.. automodule:: singa.net
+ :members:
Added: incubator/singa/site/trunk/en/_sources/docs/snapshot.txt
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/_sources/docs/snapshot.txt?rev=1766516&view=auto
==============================================================================
--- incubator/singa/site/trunk/en/_sources/docs/snapshot.txt (added)
+++ incubator/singa/site/trunk/en/_sources/docs/snapshot.txt Tue Oct 25 11:42:44 2016
@@ -0,0 +1,24 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+
+Snapshot
+========
+
+
+.. automodule:: singa.snapshot
+ :members:
Modified: incubator/singa/site/trunk/en/_sources/docs/utils.txt
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/_sources/docs/utils.txt?rev=1766516&r1=1766515&r2=1766516&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/_sources/docs/utils.txt (original)
+++ incubator/singa/site/trunk/en/_sources/docs/utils.txt Tue Oct 25 11:42:44 2016
@@ -16,7 +16,7 @@
under the License.
-Misc.
+Utils
=========
Modified: incubator/singa/site/trunk/en/docs.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/docs.html?rev=1766516&r1=1766515&r2=1766516&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/docs.html (original)
+++ incubator/singa/site/trunk/en/docs.html Tue Oct 25 11:42:44 2016
@@ -150,25 +150,21 @@
<ul>
<li class="toctree-l1"><a class="reference internal" href="docs/index.html">Documentation</a><ul>
<li class="toctree-l2"><a class="reference internal" href="docs/installation.html">Installation</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="docs/installation.html#dependencies">Dependencies</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="docs/installation.html#required">Required</a></li>
-<li class="toctree-l4"><a class="reference internal" href="docs/installation.html#optional">Optional</a></li>
-<li class="toctree-l4"><a class="reference internal" href="docs/installation.html#apt-get">apt-get</a></li>
-<li class="toctree-l4"><a class="reference internal" href="docs/installation.html#homebrew">homebrew</a></li>
-<li class="toctree-l4"><a class="reference internal" href="docs/installation.html#pip-and-anaconda-for-pysinga">pip and anaconda for PySINGA</a></li>
-</ul>
-</li>
<li class="toctree-l3"><a class="reference internal" href="docs/installation.html#install-pysinga">Install PySINGA</a><ul>
+<li class="toctree-l4"><a class="reference internal" href="docs/installation.html#install-dependent-libraries">Install dependent libraries</a></li>
+<li class="toctree-l4"><a class="reference internal" href="docs/installation.html#virtual-environment">Virtual environment</a></li>
<li class="toctree-l4"><a class="reference internal" href="docs/installation.html#from-wheel">From wheel</a></li>
<li class="toctree-l4"><a class="reference internal" href="docs/installation.html#from-source">From source</a></li>
</ul>
</li>
-<li class="toctree-l3"><a class="reference internal" href="docs/installation.html#build-singa-from-source">Build SINGA from source</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="docs/installation.html#linux-macos">Linux & MacOS</a></li>
-<li class="toctree-l4"><a class="reference internal" href="docs/installation.html#opencl-support-linux">OpenCL support (Linux)</a></li>
-<li class="toctree-l4"><a class="reference internal" href="docs/installation.html#windows">Windows</a></li>
+<li class="toctree-l3"><a class="reference internal" href="docs/installation.html#build-singa-on-linux-and-mac-os">Build SINGA on Linux and Mac OS</a><ul>
+<li class="toctree-l4"><a class="reference internal" href="docs/installation.html#compile-singa-together-with-dependent-libraries">Compile SINGA together with dependent libraries</a></li>
+<li class="toctree-l4"><a class="reference internal" href="docs/installation.html#install-dependent-libraries-and-compile-singa">Install dependent libraries and compile SINGA</a></li>
+<li class="toctree-l4"><a class="reference internal" href="docs/installation.html#compile-singa-with-cuda-and-cudnn">Compile SINGA with CUDA and CUDNN</a></li>
+<li class="toctree-l4"><a class="reference internal" href="docs/installation.html#compile-singa-with-opencl-support-linux">Compile SINGA with OpenCL support (Linux)</a></li>
</ul>
</li>
+<li class="toctree-l3"><a class="reference internal" href="docs/installation.html#build-singa-on-windows">Build SINGA on Windows</a></li>
<li class="toctree-l3"><a class="reference internal" href="docs/installation.html#faq">FAQ</a></li>
</ul>
</li>
@@ -195,6 +191,7 @@
<li class="toctree-l3"><a class="reference internal" href="docs/layer.html#cpp-api">CPP API</a></li>
</ul>
</li>
+<li class="toctree-l2"><a class="reference internal" href="docs/net.html">FeedForward Net</a></li>
<li class="toctree-l2"><a class="reference internal" href="docs/initializer.html">Initializer</a><ul>
<li class="toctree-l3"><a class="reference internal" href="docs/initializer.html#module-singa.initializer">Python API</a></li>
<li class="toctree-l3"><a class="reference internal" href="docs/initializer.html#cpp-api">CPP API</a></li>
@@ -205,6 +202,9 @@
<li class="toctree-l2"><a class="reference internal" href="docs/optimizer.html">Optimizer</a></li>
<li class="toctree-l2"><a class="reference internal" href="docs/data.html">Data</a></li>
<li class="toctree-l2"><a class="reference internal" href="docs/image_tool.html">Image Tool</a></li>
+<li class="toctree-l2"><a class="reference internal" href="docs/snapshot.html">Snapshot</a></li>
+<li class="toctree-l2"><a class="reference internal" href="docs/converter.html">Caffe Converter</a></li>
+<li class="toctree-l2"><a class="reference internal" href="docs/utils.html">Utils</a></li>
<li class="toctree-l2"><a class="reference internal" href="docs/examples/index.html">Examples</a><ul>
<li class="toctree-l3"><a class="reference internal" href="docs/examples/cifar10/README.html">Train CNN over Cifar-10</a><ul>
<li class="toctree-l4"><a class="reference internal" href="docs/examples/cifar10/README.html#instructions">Instructions</a><ul>
Added: incubator/singa/site/trunk/en/docs/converter.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/docs/converter.html?rev=1766516&view=auto
==============================================================================
--- incubator/singa/site/trunk/en/docs/converter.html (added)
+++ incubator/singa/site/trunk/en/docs/converter.html Tue Oct 25 11:42:44 2016
@@ -0,0 +1,275 @@
+
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Caffe Converter — incubator-singa 1.0.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="incubator-singa 1.0.0 documentation" href="../index.html"/>
+ <link rel="up" title="Documentation" href="index.html"/>
+ <link rel="next" title="Utils" href="utils.html"/>
+ <link rel="prev" title="Snapshot" href="snapshot.html"/>
+ <link href="../_static/style.css" rel="stylesheet" type="text/css">
+
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-scroll">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> incubator-singa
+
+
+
+
+ <img src="../_static/singa.png" class="logo" />
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../downloads.html">Download SINGA</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Documentation</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="installation.html">Installation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="software_stack.html">Software Stack</a></li>
+<li class="toctree-l2"><a class="reference internal" href="device.html">Device</a></li>
+<li class="toctree-l2"><a class="reference internal" href="tensor.html">Tensor</a></li>
+<li class="toctree-l2"><a class="reference internal" href="layer.html">Layer</a></li>
+<li class="toctree-l2"><a class="reference internal" href="net.html">FeedForward Net</a></li>
+<li class="toctree-l2"><a class="reference internal" href="initializer.html">Initializer</a></li>
+<li class="toctree-l2"><a class="reference internal" href="loss.html">Loss</a></li>
+<li class="toctree-l2"><a class="reference internal" href="metric.html">Metric</a></li>
+<li class="toctree-l2"><a class="reference internal" href="optimizer.html">Optimizer</a></li>
+<li class="toctree-l2"><a class="reference internal" href="data.html">Data</a></li>
+<li class="toctree-l2"><a class="reference internal" href="image_tool.html">Image Tool</a></li>
+<li class="toctree-l2"><a class="reference internal" href="snapshot.html">Snapshot</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="#">Caffe Converter</a></li>
+<li class="toctree-l2"><a class="reference internal" href="utils.html">Utils</a></li>
+<li class="toctree-l2"><a class="reference internal" href="examples/index.html">Examples</a></li>
+</ul>
+</li>
+</ul>
+<p class="caption"><span class="caption-text">Development</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../develop/schedule.html">Development Schedule</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../develop/how-contribute.html">How to Contribute to SINGA</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../develop/contribute-code.html">How to Contribute Code</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../develop/contribute-docs.html">How to Contribute Documentation</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Community</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../community/source-repository.html">Source Repository</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../community/mail-lists.html">Project Mailing Lists</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../community/issue-tracking.html">Issue Tracking</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../community/team-list.html">The SINGA Team</a></li>
+</ul>
+
+
+
+ </div>
+ </div>
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">incubator-singa</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+
+
+
+
+
+
+<div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li><a href="index.html">Documentation</a> »</li>
+
+ <li>Caffe Converter</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="module-singa.converter">
+<span id="caffe-converter"></span><h1>Caffe Converter<a class="headerlink" href="#module-singa.converter" title="Permalink to this headline">¶</a></h1>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+
+ <a href="utils.html" class="btn btn-neutral float-right" title="Utils" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+
+
+ <a href="snapshot.html" class="btn btn-neutral" title="Snapshot" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+
+ </div>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2016 The Apache Software Foundation. All rights reserved. Apache Singa, Apache, the Apache feather logo, and the Apache Singa project logos are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners..
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+<div class="rst-versions shift-up" data-toggle="rst-versions" role="note" aria-label="versions">
+<a href="http://incubator.apache.org/">
+<img src= "../_static/apache.jpg">
+</a>
+
+ <span class="rst-current-version" data-toggle="rst-current-version">
+ <span class="fa fa-book"> incubator-singa </span>
+ v: 1.0.0
+ <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>
+ </dl>
+
+ </div>
+</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/en/docs/data.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/docs/data.html?rev=1766516&r1=1766515&r2=1766516&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/docs/data.html (original)
+++ incubator/singa/site/trunk/en/docs/data.html Tue Oct 25 11:42:44 2016
@@ -96,12 +96,16 @@
<li class="toctree-l2"><a class="reference internal" href="device.html">Device</a></li>
<li class="toctree-l2"><a class="reference internal" href="tensor.html">Tensor</a></li>
<li class="toctree-l2"><a class="reference internal" href="layer.html">Layer</a></li>
+<li class="toctree-l2"><a class="reference internal" href="net.html">FeedForward Net</a></li>
<li class="toctree-l2"><a class="reference internal" href="initializer.html">Initializer</a></li>
<li class="toctree-l2"><a class="reference internal" href="loss.html">Loss</a></li>
<li class="toctree-l2"><a class="reference internal" href="metric.html">Metric</a></li>
<li class="toctree-l2"><a class="reference internal" href="optimizer.html">Optimizer</a></li>
<li class="toctree-l2 current"><a class="current reference internal" href="#">Data</a></li>
<li class="toctree-l2"><a class="reference internal" href="image_tool.html">Image Tool</a></li>
+<li class="toctree-l2"><a class="reference internal" href="snapshot.html">Snapshot</a></li>
+<li class="toctree-l2"><a class="reference internal" href="converter.html">Caffe Converter</a></li>
+<li class="toctree-l2"><a class="reference internal" href="utils.html">Utils</a></li>
<li class="toctree-l2"><a class="reference internal" href="examples/index.html">Examples</a></li>
</ul>
</li>
Added: incubator/singa/site/trunk/en/docs/dependencies.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/docs/dependencies.html?rev=1766516&view=auto
==============================================================================
--- incubator/singa/site/trunk/en/docs/dependencies.html (added)
+++ incubator/singa/site/trunk/en/docs/dependencies.html Tue Oct 25 11:42:44 2016
@@ -0,0 +1,317 @@
+
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>Dependent library installation — incubator-singa 1.0.0 documentation</title>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+
+
+
+
+
+ <link rel="top" title="incubator-singa 1.0.0 documentation" href="../index.html"/>
+ <link href="../_static/style.css" rel="stylesheet" type="text/css">
+
+
+
+ <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+ <div class="wy-grid-for-nav">
+
+
+ <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+ <div class="wy-side-scroll">
+ <div class="wy-side-nav-search">
+
+
+
+ <a href="../index.html" class="icon icon-home"> incubator-singa
+
+
+
+
+ <img src="../_static/singa.png" class="logo" />
+
+ </a>
+
+
+
+
+ <div class="version">
+ 1.0.0
+ </div>
+
+
+
+
+<div role="search">
+ <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+ <input type="text" name="q" placeholder="Search docs" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+</div>
+
+
+ </div>
+
+ <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+
+
+
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../downloads.html">Download SINGA</a></li>
+<li class="toctree-l1"><a class="reference internal" href="index.html">Documentation</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Development</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../develop/schedule.html">Development Schedule</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../develop/how-contribute.html">How to Contribute to SINGA</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../develop/contribute-code.html">How to Contribute Code</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../develop/contribute-docs.html">How to Contribute Documentation</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Community</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../community/source-repository.html">Source Repository</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../community/mail-lists.html">Project Mailing Lists</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../community/issue-tracking.html">Issue Tracking</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../community/team-list.html">The SINGA Team</a></li>
+</ul>
+
+
+
+ </div>
+ </div>
+ </nav>
+
+ <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+ <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+ <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+ <a href="../index.html">incubator-singa</a>
+ </nav>
+
+
+
+ <div class="wy-nav-content">
+ <div class="rst-content">
+
+
+
+
+
+
+<div role="navigation" aria-label="breadcrumbs navigation">
+ <ul class="wy-breadcrumbs">
+ <li><a href="../index.html">Docs</a> »</li>
+
+ <li>Dependent library installation</li>
+ <li class="wy-breadcrumbs-aside">
+
+
+
+ </li>
+ </ul>
+ <hr/>
+</div>
+ <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+ <div itemprop="articleBody">
+
+ <div class="section" id="dependent-library-installation">
+<span id="dependent-library-installation"></span><h1>Dependent library installation<a class="headerlink" href="#dependent-library-installation" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="windows">
+<span id="windows"></span><h2>Windows<a class="headerlink" href="#windows" title="Permalink to this headline">¶</a></h2>
+<p>This section is used to compile and install the dependent libraries under
+windows system from source codes. The following instructions ONLY work for Visual Studio 2015 as
+previous VS does not support <a class="reference external" href="https://msdn.microsoft.com/en-us/library/hh567368.aspx">C++11 features</a> well (including generic lambdas, auto, non-static
+data member initializers). If you intend to generate a 32-bit/64-bit singa solution, please configure all the
+VS projects for the dependent libraries as 32-bit/64-bit. This can be done by
+“Configuration Manager” in VS 2015 or use corresponding generator in cmake. When compiling the following libraries, you
+may get system-specific warnings/errors. Please fix them according to the
+prompts by VS.</p>
+<div class="section" id="google-logging">
+<span id="google-logging"></span><h3>Google Logging<a class="headerlink" href="#google-logging" title="Permalink to this headline">¶</a></h3>
+<p>The glog library is an optional library for singa project. But it is currently necessary for Window compilation.
+Since the latest release version of glog will encounter error C2084 on sprintf function
+under VS2015, we test the compilation and installation using the master branch from <a class="reference external" href="https://github.com/google/glog">github</a>.</p>
+<p>Step 1: Download and decompress the source code. Or use <code class="docutils literal"><span class="pre">git</span> <span class="pre">clone</span> <span class="pre">https://github.com/google/glog</span></code> to get the code.</p>
+<p>Step 2: Open “glog.sln” file under project folder. You will get a conversion
+dialog and please finish it by the prompts. Compile all the projects in the solution after
+proper configuration, especially “libglog” and “libglog_static” projects.</p>
+<p>Step 3: Copy all the header files and the entire directory named “glog” under
+“src\windows“ folder into the installation include folder (or system folder).
+Copy all the generated library files into the installation library folder (or
+system folder).</p>
+<p>Step 4: Done.</p>
+</div>
+<div class="section" id="google-protobuf">
+<span id="google-protobuf"></span><h3>Google protobuf<a class="headerlink" href="#google-protobuf" title="Permalink to this headline">¶</a></h3>
+<p>Tested on version 2.6.1:</p>
+<p>Step 1: Download and decompress the source code.</p>
+<p>Step 2: Open “protobuf.sln” file under “vsprojects” folder. You will get a conversion
+dialog and please finish it by the prompts. Compile all the projects in the solution after proper
+configuration. Especially “libprotobuf”, “libprotobuf-lite”, “libprotoc” and
+“protoc” projects.</p>
+<p>Step 3: Run “extract_includes.bat” script under “vsprojects” folder, you will
+get a new “include” folder with all the headers.</p>
+<p>Step 4: Copy the library files, such as “libprotobuf.lib”,
+“libprotobuf-lite.lib”, “libprotoc.lib”, etc., into your installation library folder (or
+system folder). Copy the binary file “protoc” into your installation binary
+folder (or system folder). Copy all the headers and folders in “include” folder into your
+installation include folder (or system folder).</p>
+<p>Step 5: Done.</p>
+</div>
+<div class="section" id="cblas">
+<span id="cblas"></span><h3>CBLAS<a class="headerlink" href="#cblas" title="Permalink to this headline">¶</a></h3>
+<p>There are ready-to-use binary packages online
+(<a class="reference external" href="https://sourceforge.net/projects/openblas/files/">link</a>). However, we still install
+OpenBLAS with version 0.2.18 as test:</p>
+<p>Step 1: Download and decompress the source code.</p>
+<p>Step 2: Start a cmd window under the OpenBLAS folder then run the following
+commands to generate the solution:</p>
+<div class="highlight-default"><div class="highlight"><pre>$ md build $$ cd build
+$ cmake -G "Visual Studio 14" ..
+</pre></div>
+</div>
+<p>Or run <code class="docutils literal"><span class="pre">cmake</span> <span class="pre">-G</span> <span class="pre">"Visual</span> <span class="pre">Studio</span> <span class="pre">14</span> <span class="pre">Win64"</span></code> as you wish.</p>
+<p>Step 3: Install Perl into your system and put perl.exe on your path. Open “OpenBlas.sln” and build the solution, especially “libopenblas”
+project.</p>
+<p>Step 4: Copy the library files under “build\lib” folder and all header files
+under OpenBLAS folder into installation library and include folders (or system
+folders).</p>
+<p>Step 5: Done.</p>
+</div>
+</div>
+<div class="section" id="faq">
+<span id="faq"></span><h2>FAQ<a class="headerlink" href="#faq" title="Permalink to this headline">¶</a></h2>
+<ol>
+<li><p class="first">Error C2375 ‘snprintf’: redefinition; different linkage</p>
+<p>Add “HAVE_SNPRINTF” to “C/C++ - Preprocessor - Preprocessor definitions”</p>
+</li>
+<li><p class="first">Error due to hash map</p>
+<p>Add “_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS” to Preprocessor Definitions.</p>
+</li>
+</ol>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ <footer>
+
+
+ <hr/>
+
+ <div role="contentinfo">
+ <p>
+ © Copyright 2016 The Apache Software Foundation. All rights reserved. Apache Singa, Apache, the Apache feather logo, and the Apache Singa project logos are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners..
+
+ </p>
+ </div>
+ Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+
+
+
+
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT:'../',
+ VERSION:'1.0.0',
+ COLLAPSE_INDEX:false,
+ FILE_SUFFIX:'.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+
+
+
+
+
+ <script type="text/javascript" src="../_static/js/theme.js"></script>
+
+
+
+
+ <script type="text/javascript">
+ jQuery(function () {
+ SphinxRtdTheme.StickyNav.enable();
+ });
+ </script>
+
+
+<div class="rst-versions shift-up" data-toggle="rst-versions" role="note" aria-label="versions">
+<a href="http://incubator.apache.org/">
+<img src= "../_static/apache.jpg">
+</a>
+
+ <span class="rst-current-version" data-toggle="rst-current-version">
+ <span class="fa fa-book"> incubator-singa </span>
+ v: 1.0.0
+ <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>
+ </dl>
+
+ </div>
+</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/en/docs/device.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/docs/device.html?rev=1766516&r1=1766515&r2=1766516&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/docs/device.html (original)
+++ incubator/singa/site/trunk/en/docs/device.html Tue Oct 25 11:42:44 2016
@@ -101,12 +101,16 @@
</li>
<li class="toctree-l2"><a class="reference internal" href="tensor.html">Tensor</a></li>
<li class="toctree-l2"><a class="reference internal" href="layer.html">Layer</a></li>
+<li class="toctree-l2"><a class="reference internal" href="net.html">FeedForward Net</a></li>
<li class="toctree-l2"><a class="reference internal" href="initializer.html">Initializer</a></li>
<li class="toctree-l2"><a class="reference internal" href="loss.html">Loss</a></li>
<li class="toctree-l2"><a class="reference internal" href="metric.html">Metric</a></li>
<li class="toctree-l2"><a class="reference internal" href="optimizer.html">Optimizer</a></li>
<li class="toctree-l2"><a class="reference internal" href="data.html">Data</a></li>
<li class="toctree-l2"><a class="reference internal" href="image_tool.html">Image Tool</a></li>
+<li class="toctree-l2"><a class="reference internal" href="snapshot.html">Snapshot</a></li>
+<li class="toctree-l2"><a class="reference internal" href="converter.html">Caffe Converter</a></li>
+<li class="toctree-l2"><a class="reference internal" href="utils.html">Utils</a></li>
<li class="toctree-l2"><a class="reference internal" href="examples/index.html">Examples</a></li>
</ul>
</li>
Modified: incubator/singa/site/trunk/en/docs/examples/char-rnn/README.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/docs/examples/char-rnn/README.html?rev=1766516&r1=1766515&r2=1766516&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/docs/examples/char-rnn/README.html (original)
+++ incubator/singa/site/trunk/en/docs/examples/char-rnn/README.html Tue Oct 25 11:42:44 2016
@@ -96,12 +96,16 @@
<li class="toctree-l2"><a class="reference internal" href="../../device.html">Device</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../tensor.html">Tensor</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../layer.html">Layer</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../net.html">FeedForward Net</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../initializer.html">Initializer</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../loss.html">Loss</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../metric.html">Metric</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../optimizer.html">Optimizer</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../data.html">Data</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../image_tool.html">Image Tool</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../snapshot.html">Snapshot</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../converter.html">Caffe Converter</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../utils.html">Utils</a></li>
<li class="toctree-l2 current"><a class="reference internal" href="../index.html">Examples</a><ul class="current">
<li class="toctree-l3"><a class="reference internal" href="../cifar10/README.html">Train CNN over Cifar-10</a></li>
<li class="toctree-l3 current"><a class="current reference internal" href="#">Train Char-RNN over plain text</a><ul>
Modified: incubator/singa/site/trunk/en/docs/examples/cifar10/README.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/docs/examples/cifar10/README.html?rev=1766516&r1=1766515&r2=1766516&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/docs/examples/cifar10/README.html (original)
+++ incubator/singa/site/trunk/en/docs/examples/cifar10/README.html Tue Oct 25 11:42:44 2016
@@ -96,12 +96,16 @@
<li class="toctree-l2"><a class="reference internal" href="../../device.html">Device</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../tensor.html">Tensor</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../layer.html">Layer</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../net.html">FeedForward Net</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../initializer.html">Initializer</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../loss.html">Loss</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../metric.html">Metric</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../optimizer.html">Optimizer</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../data.html">Data</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../image_tool.html">Image Tool</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../snapshot.html">Snapshot</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../converter.html">Caffe Converter</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../utils.html">Utils</a></li>
<li class="toctree-l2 current"><a class="reference internal" href="../index.html">Examples</a><ul class="current">
<li class="toctree-l3 current"><a class="current reference internal" href="#">Train CNN over Cifar-10</a><ul>
<li class="toctree-l4"><a class="reference internal" href="#instructions">Instructions</a></li>
@@ -183,6 +187,7 @@ will train three deep CNN models to do i
the best validation accuracy (without data augmentation) we achieved was about 82%.</li>
<li><a class="reference external" href="http://torch.ch/blog/2015/07/30/cifar.html">VGGNet</a>, the best validation accuracy (without data augmentation) we achieved was about 89%.</li>
<li><a class="reference external" href="https://github.com/facebook/fb.resnet.torch">ResNet</a>, the best validation accuracy (without data augmentation) we achieved was about 83%.</li>
+<li><a class="reference external" href="https://github.com/BVLC/caffe/tree/master/examples/cifar10">Alexnet from Caffe</a>, SINGA is able to convert model from Caffe seamlessly.</li>
</ol>
<div class="section" id="instructions">
<span id="instructions"></span><h2>Instructions<a class="headerlink" href="#instructions" title="Permalink to this headline">¶</a></h2>
@@ -212,7 +217,8 @@ version of the Cifar-10 dataset in ̵
<div class="highlight-default"><div class="highlight"><pre> <span class="n">python</span> <span class="n">train</span><span class="o">.</span><span class="n">py</span> <span class="n">vgg</span> <span class="n">cifar</span><span class="o">-</span><span class="mi">10</span><span class="o">-</span><span class="n">batches</span><span class="o">-</span><span class="n">py</span>
</pre></div>
</div>
-<p>To train other models, please replace ‘vgg’ to ‘alexnet’ or ‘resnet’. By default
+<p>To train other models, please replace ‘vgg’ to ‘alexnet’, ‘resnet’ or ‘caffe’,
+where ‘caffe’ refers to the alexnet model converted from Caffe. By default
the training would run on a CudaGPU device, to run it on CppCPU, add an additional
argument</p>
<div class="highlight-default"><div class="highlight"><pre> <span class="n">python</span> <span class="n">train</span><span class="o">.</span><span class="n">py</span> <span class="n">vgg</span> <span class="n">cifar</span><span class="o">-</span><span class="mi">10</span><span class="o">-</span><span class="n">batches</span><span class="o">-</span><span class="n">py</span> <span class="o">--</span><span class="n">use_cpu</span>
Modified: incubator/singa/site/trunk/en/docs/examples/imagenet/README.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/docs/examples/imagenet/README.html?rev=1766516&r1=1766515&r2=1766516&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/docs/examples/imagenet/README.html (original)
+++ incubator/singa/site/trunk/en/docs/examples/imagenet/README.html Tue Oct 25 11:42:44 2016
@@ -96,12 +96,16 @@
<li class="toctree-l2"><a class="reference internal" href="../../device.html">Device</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../tensor.html">Tensor</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../layer.html">Layer</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../net.html">FeedForward Net</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../initializer.html">Initializer</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../loss.html">Loss</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../metric.html">Metric</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../optimizer.html">Optimizer</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../data.html">Data</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../image_tool.html">Image Tool</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../snapshot.html">Snapshot</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../converter.html">Caffe Converter</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../utils.html">Utils</a></li>
<li class="toctree-l2 current"><a class="reference internal" href="../index.html">Examples</a><ul class="current">
<li class="toctree-l3"><a class="reference internal" href="../cifar10/README.html">Train CNN over Cifar-10</a></li>
<li class="toctree-l3"><a class="reference internal" href="../char-rnn/README.html">Train Char-RNN over plain text</a></li>
Modified: incubator/singa/site/trunk/en/docs/examples/index.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/docs/examples/index.html?rev=1766516&r1=1766515&r2=1766516&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/docs/examples/index.html (original)
+++ incubator/singa/site/trunk/en/docs/examples/index.html Tue Oct 25 11:42:44 2016
@@ -34,7 +34,7 @@
<link rel="top" title="incubator-singa 1.0.0 documentation" href="../../index.html"/>
<link rel="up" title="Documentation" href="../index.html"/>
<link rel="next" title="Train CNN over Cifar-10" href="cifar10/README.html"/>
- <link rel="prev" title="Image Tool" href="../image_tool.html"/>
+ <link rel="prev" title="Utils" href="../utils.html"/>
<link href="../../_static/style.css" rel="stylesheet" type="text/css">
@@ -96,12 +96,16 @@
<li class="toctree-l2"><a class="reference internal" href="../device.html">Device</a></li>
<li class="toctree-l2"><a class="reference internal" href="../tensor.html">Tensor</a></li>
<li class="toctree-l2"><a class="reference internal" href="../layer.html">Layer</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../net.html">FeedForward Net</a></li>
<li class="toctree-l2"><a class="reference internal" href="../initializer.html">Initializer</a></li>
<li class="toctree-l2"><a class="reference internal" href="../loss.html">Loss</a></li>
<li class="toctree-l2"><a class="reference internal" href="../metric.html">Metric</a></li>
<li class="toctree-l2"><a class="reference internal" href="../optimizer.html">Optimizer</a></li>
<li class="toctree-l2"><a class="reference internal" href="../data.html">Data</a></li>
<li class="toctree-l2"><a class="reference internal" href="../image_tool.html">Image Tool</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../snapshot.html">Snapshot</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../converter.html">Caffe Converter</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../utils.html">Utils</a></li>
<li class="toctree-l2 current"><a class="current reference internal" href="#">Examples</a><ul>
<li class="toctree-l3"><a class="reference internal" href="cifar10/README.html">Train CNN over Cifar-10</a></li>
<li class="toctree-l3"><a class="reference internal" href="char-rnn/README.html">Train Char-RNN over plain text</a></li>
@@ -210,7 +214,7 @@
<a href="cifar10/README.html" class="btn btn-neutral float-right" title="Train CNN over Cifar-10" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
- <a href="../image_tool.html" class="btn btn-neutral" title="Image Tool" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+ <a href="../utils.html" class="btn btn-neutral" title="Utils" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
</div>
Modified: incubator/singa/site/trunk/en/docs/image_tool.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/docs/image_tool.html?rev=1766516&r1=1766515&r2=1766516&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/docs/image_tool.html (original)
+++ incubator/singa/site/trunk/en/docs/image_tool.html Tue Oct 25 11:42:44 2016
@@ -33,7 +33,7 @@
<link rel="top" title="incubator-singa 1.0.0 documentation" href="../index.html"/>
<link rel="up" title="Documentation" href="index.html"/>
- <link rel="next" title="Examples" href="examples/index.html"/>
+ <link rel="next" title="Snapshot" href="snapshot.html"/>
<link rel="prev" title="Data" href="data.html"/>
<link href="../_static/style.css" rel="stylesheet" type="text/css">
@@ -96,12 +96,16 @@
<li class="toctree-l2"><a class="reference internal" href="device.html">Device</a></li>
<li class="toctree-l2"><a class="reference internal" href="tensor.html">Tensor</a></li>
<li class="toctree-l2"><a class="reference internal" href="layer.html">Layer</a></li>
+<li class="toctree-l2"><a class="reference internal" href="net.html">FeedForward Net</a></li>
<li class="toctree-l2"><a class="reference internal" href="initializer.html">Initializer</a></li>
<li class="toctree-l2"><a class="reference internal" href="loss.html">Loss</a></li>
<li class="toctree-l2"><a class="reference internal" href="metric.html">Metric</a></li>
<li class="toctree-l2"><a class="reference internal" href="optimizer.html">Optimizer</a></li>
<li class="toctree-l2"><a class="reference internal" href="data.html">Data</a></li>
<li class="toctree-l2 current"><a class="current reference internal" href="#">Image Tool</a></li>
+<li class="toctree-l2"><a class="reference internal" href="snapshot.html">Snapshot</a></li>
+<li class="toctree-l2"><a class="reference internal" href="converter.html">Caffe Converter</a></li>
+<li class="toctree-l2"><a class="reference internal" href="utils.html">Utils</a></li>
<li class="toctree-l2"><a class="reference internal" href="examples/index.html">Examples</a></li>
</ul>
</li>
@@ -464,7 +468,7 @@ it into given size.</p>
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
- <a href="examples/index.html" class="btn btn-neutral float-right" title="Examples" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+ <a href="snapshot.html" class="btn btn-neutral float-right" title="Snapshot" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
<a href="data.html" class="btn btn-neutral" title="Data" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
Modified: incubator/singa/site/trunk/en/docs/index.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/docs/index.html?rev=1766516&r1=1766515&r2=1766516&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/docs/index.html (original)
+++ incubator/singa/site/trunk/en/docs/index.html Tue Oct 25 11:42:44 2016
@@ -95,12 +95,16 @@
<li class="toctree-l2"><a class="reference internal" href="device.html">Device</a></li>
<li class="toctree-l2"><a class="reference internal" href="tensor.html">Tensor</a></li>
<li class="toctree-l2"><a class="reference internal" href="layer.html">Layer</a></li>
+<li class="toctree-l2"><a class="reference internal" href="net.html">FeedForward Net</a></li>
<li class="toctree-l2"><a class="reference internal" href="initializer.html">Initializer</a></li>
<li class="toctree-l2"><a class="reference internal" href="loss.html">Loss</a></li>
<li class="toctree-l2"><a class="reference internal" href="metric.html">Metric</a></li>
<li class="toctree-l2"><a class="reference internal" href="optimizer.html">Optimizer</a></li>
<li class="toctree-l2"><a class="reference internal" href="data.html">Data</a></li>
<li class="toctree-l2"><a class="reference internal" href="image_tool.html">Image Tool</a></li>
+<li class="toctree-l2"><a class="reference internal" href="snapshot.html">Snapshot</a></li>
+<li class="toctree-l2"><a class="reference internal" href="converter.html">Caffe Converter</a></li>
+<li class="toctree-l2"><a class="reference internal" href="utils.html">Utils</a></li>
<li class="toctree-l2"><a class="reference internal" href="examples/index.html">Examples</a></li>
</ul>
</li>
@@ -165,25 +169,21 @@
<div class="toctree-wrapper compound">
<ul>
<li class="toctree-l1"><a class="reference internal" href="installation.html">Installation</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="installation.html#dependencies">Dependencies</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="installation.html#required">Required</a></li>
-<li class="toctree-l3"><a class="reference internal" href="installation.html#optional">Optional</a></li>
-<li class="toctree-l3"><a class="reference internal" href="installation.html#apt-get">apt-get</a></li>
-<li class="toctree-l3"><a class="reference internal" href="installation.html#homebrew">homebrew</a></li>
-<li class="toctree-l3"><a class="reference internal" href="installation.html#pip-and-anaconda-for-pysinga">pip and anaconda for PySINGA</a></li>
-</ul>
-</li>
<li class="toctree-l2"><a class="reference internal" href="installation.html#install-pysinga">Install PySINGA</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation.html#install-dependent-libraries">Install dependent libraries</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation.html#virtual-environment">Virtual environment</a></li>
<li class="toctree-l3"><a class="reference internal" href="installation.html#from-wheel">From wheel</a></li>
<li class="toctree-l3"><a class="reference internal" href="installation.html#from-source">From source</a></li>
</ul>
</li>
-<li class="toctree-l2"><a class="reference internal" href="installation.html#build-singa-from-source">Build SINGA from source</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="installation.html#linux-macos">Linux & MacOS</a></li>
-<li class="toctree-l3"><a class="reference internal" href="installation.html#opencl-support-linux">OpenCL support (Linux)</a></li>
-<li class="toctree-l3"><a class="reference internal" href="installation.html#windows">Windows</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation.html#build-singa-on-linux-and-mac-os">Build SINGA on Linux and Mac OS</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="installation.html#compile-singa-together-with-dependent-libraries">Compile SINGA together with dependent libraries</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation.html#install-dependent-libraries-and-compile-singa">Install dependent libraries and compile SINGA</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation.html#compile-singa-with-cuda-and-cudnn">Compile SINGA with CUDA and CUDNN</a></li>
+<li class="toctree-l3"><a class="reference internal" href="installation.html#compile-singa-with-opencl-support-linux">Compile SINGA with OpenCL support (Linux)</a></li>
</ul>
</li>
+<li class="toctree-l2"><a class="reference internal" href="installation.html#build-singa-on-windows">Build SINGA on Windows</a></li>
<li class="toctree-l2"><a class="reference internal" href="installation.html#faq">FAQ</a></li>
</ul>
</li>
@@ -210,6 +210,7 @@
<li class="toctree-l2"><a class="reference internal" href="layer.html#cpp-api">CPP API</a></li>
</ul>
</li>
+<li class="toctree-l1"><a class="reference internal" href="net.html">FeedForward Net</a></li>
<li class="toctree-l1"><a class="reference internal" href="initializer.html">Initializer</a><ul>
<li class="toctree-l2"><a class="reference internal" href="initializer.html#module-singa.initializer">Python API</a></li>
<li class="toctree-l2"><a class="reference internal" href="initializer.html#cpp-api">CPP API</a></li>
@@ -220,6 +221,9 @@
<li class="toctree-l1"><a class="reference internal" href="optimizer.html">Optimizer</a></li>
<li class="toctree-l1"><a class="reference internal" href="data.html">Data</a></li>
<li class="toctree-l1"><a class="reference internal" href="image_tool.html">Image Tool</a></li>
+<li class="toctree-l1"><a class="reference internal" href="snapshot.html">Snapshot</a></li>
+<li class="toctree-l1"><a class="reference internal" href="converter.html">Caffe Converter</a></li>
+<li class="toctree-l1"><a class="reference internal" href="utils.html">Utils</a></li>
<li class="toctree-l1"><a class="reference internal" href="examples/index.html">Examples</a><ul>
<li class="toctree-l2"><a class="reference internal" href="examples/cifar10/README.html">Train CNN over Cifar-10</a><ul>
<li class="toctree-l3"><a class="reference internal" href="examples/cifar10/README.html#instructions">Instructions</a><ul>
Modified: incubator/singa/site/trunk/en/docs/initializer.html
URL: http://svn.apache.org/viewvc/incubator/singa/site/trunk/en/docs/initializer.html?rev=1766516&r1=1766515&r2=1766516&view=diff
==============================================================================
--- incubator/singa/site/trunk/en/docs/initializer.html (original)
+++ incubator/singa/site/trunk/en/docs/initializer.html Tue Oct 25 11:42:44 2016
@@ -34,7 +34,7 @@
<link rel="top" title="incubator-singa 1.0.0 documentation" href="../index.html"/>
<link rel="up" title="Documentation" href="index.html"/>
<link rel="next" title="Loss" href="loss.html"/>
- <link rel="prev" title="Layer" href="layer.html"/>
+ <link rel="prev" title="FeedForward Net" href="net.html"/>
<link href="../_static/style.css" rel="stylesheet" type="text/css">
@@ -96,6 +96,7 @@
<li class="toctree-l2"><a class="reference internal" href="device.html">Device</a></li>
<li class="toctree-l2"><a class="reference internal" href="tensor.html">Tensor</a></li>
<li class="toctree-l2"><a class="reference internal" href="layer.html">Layer</a></li>
+<li class="toctree-l2"><a class="reference internal" href="net.html">FeedForward Net</a></li>
<li class="toctree-l2 current"><a class="current reference internal" href="#">Initializer</a><ul>
<li class="toctree-l3"><a class="reference internal" href="#module-singa.initializer">Python API</a></li>
<li class="toctree-l3"><a class="reference internal" href="#cpp-api">CPP API</a></li>
@@ -106,6 +107,9 @@
<li class="toctree-l2"><a class="reference internal" href="optimizer.html">Optimizer</a></li>
<li class="toctree-l2"><a class="reference internal" href="data.html">Data</a></li>
<li class="toctree-l2"><a class="reference internal" href="image_tool.html">Image Tool</a></li>
+<li class="toctree-l2"><a class="reference internal" href="snapshot.html">Snapshot</a></li>
+<li class="toctree-l2"><a class="reference internal" href="converter.html">Caffe Converter</a></li>
+<li class="toctree-l2"><a class="reference internal" href="utils.html">Utils</a></li>
<li class="toctree-l2"><a class="reference internal" href="examples/index.html">Examples</a></li>
</ul>
</li>
@@ -247,7 +251,7 @@ Rectifiers: Surpassing Human-Level Perfo
<a href="loss.html" class="btn btn-neutral float-right" title="Loss" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
- <a href="layer.html" class="btn btn-neutral" title="Layer" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+ <a href="net.html" class="btn btn-neutral" title="FeedForward Net" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
</div>