Merge pull request #445 from dcslin/SINGA-433
SINGA-433 updated documentation about docker, dockerfile for consitent, cudnn version in dockerfile
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6fd833c..1b855fa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# How to contribute
[Getting Started](./doc/en/develop/how-contribute.md)
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 43d4004..a75ceea 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,3 +1,102 @@
+Release Notes - SINGA - Version singa-incubating-2.0.0
+
+SINGA is a general distributed deep learning platform for training big deep
+learning models over large datasets.
+
+This release includes following features:
+
+ * Core components
+ * [SINGA-434] Support tensor broadcasting
+ * [SINGA-370] Improvement to tensor reshape and various misc. changes related to SINGA-341 and 351
+
+ * Model components
+ * [SINGA-333] Add support for Open Neural Network Exchange (ONNX) format
+ * [SINGA-385] Add new python module for optimizers
+ * [SINGA-394] Improve the CPP operations via Intel MKL DNN lib
+ * [SINGA-425] Add 3 operators , Abs(), Exp() and leakyrelu(), for Autograd
+ * [SINGA-410] Add two function, set_params() and get_params(), for Autograd Layer class
+ * [SINGA-383] Add Separable Convolution for autograd
+ * [SINGA-388] Develop some RNN layers by calling tiny operations like matmul, addbias.
+ * [SINGA-382] Implement concat operation for autograd
+ * [SINGA-378] Implement maxpooling operation and its related functions for autograd
+ * [SINGA-379] Implement batchnorm operation and its related functions for autograd
+
+ * Utility functions and CI
+ * [SINGA-432] Update depdent lib versions in conda-build config
+ * [SINGA-429] Update docker images for latest cuda and cudnn
+ * [SINGA-428] Move Docker images under Apache user name
+
+ * Documentation and usability
+ * [SINGA-395] Add documentation for autograd APIs
+ * [SINGA-344] Add a GAN example
+ * [SINGA-390] Update installation.md
+ * [SINGA-384] Implement ResNet using autograd API
+ * [SINGA-352] Complete SINGA documentation in Chinese version
+
+ * Bugs fixed
+ * [SINGA-431] Unit Test failed - Tensor Transpose
+ * [SINGA-422] ModuleNotFoundError: No module named "_singa_wrap"
+ * [SINGA-418] Unsupportive type 'long' in python3.
+ * [SINGA-409] Basic `singa-cpu` import throws error
+ * [SINGA-408] Unsupportive function definition in python3
+ * [SINGA-380] Fix bugs from Reshape
+
+---------------------------------------------------------------
+Release Notes - SINGA - Version singa-incubating-1.2.0
+
+SINGA is a general distributed deep learning platform for training big deep
+learning models over large datasets.
+
+This release includes following features:
+
+ * Core components
+ * [SINGA-290] Upgrade to Python 3
+ * [SINGA-341] Added stride functionality to tensors for CPP
+ * [SINGA-347] Create a function that supports einsum
+ * [SINGA-351] Added stride support and cudnn codes to cuda
+
+ * Model components
+ * [SINGA-300] Add residual networks for imagenet classification
+ * [SINGA-312] Rename layer parameters
+ * [SINGA-313] Add L2 norm layer
+ * [SINGA-315] Reduce memory footprint by Python generator for parameter
+ * [SINGA-316] Add SigmoidCrossEntropy
+ * [SINGA-324] Extend RNN layer to accept variant seq length across batches
+ * [SINGA-326] Add Inception V4 for ImageNet classification
+ * [SINGA-328] Add VGG models for ImageNet classification
+ * [SINGA-329] Support layer freezing during training (fine-tuning)
+ * [SINGA-346] Update cudnn from V5 to V7
+ * [SINGA-349] Create layer operations for autograd
+ * [SINGA-363] Add DenseNet for Imagenet classification
+
+ * Utility functions and CI
+ * [SINGA-274] Improve Debian packaging with CPack
+ * [SINGA-303] Create conda packages
+ * [SINGA-337] Add test cases for code
+ * [SINGA-348] Support autograd MLP Example
+ * [SINGA-345] Update Jenkins and fix bugs in compliation
+ * [SINGA-354] Update travis scripts to use conda-build for all platforms
+ * [SINGA-358] Consolidated RUN steps and cleaned caches in Docker containers
+ * [SINGA-359] Create alias for conda packages
+
+ * Documentation and usability
+ * [SINGA-223] Fix side navigation menu in the website
+ * [SINGA-294] Add instructions to run CUDA unit tests on Windows
+ * [SINGA-305] Add jupyter notebooks for SINGA V1 tutorial
+ * [SINGA-319] Fix link errors on the index page
+ * [SINGA-352] Complete SINGA documentation in Chinese version
+ * [SINGA-361] Add git instructions for contributors and committers
+
+ * Bugs fixed
+ * [SINGA-330] fix openblas building on i7 7700k
+ * [SINGA-331] Fix the bug of tensor division operation
+ * [SINGA-350] Error from python3 test
+ * [SINGA-356] Error using travis tool to build SINGA on mac os
+ * [SINGA-363] Fix some bugs in imagenet examples
+ * [SINGA-368] Fix the bug in Cifar10 examples
+ * [SINGA-369] the errors of examples in testing
+
+---------------------------------------------------------------
Release Notes - SINGA - Version singa-incubating-1.1.0
SINGA is a general distributed deep learning platform for training big deep learning models over large datasets.
diff --git a/doc/build.sh b/doc/build.sh
old mode 100755
new mode 100644
index 44eb1c2..c00be39
--- a/doc/build.sh
+++ b/doc/build.sh
@@ -36,4 +36,5 @@
$SPHINXBUILD -b html -c . -d $BUILDDIR/doctree ${LANG_ARR[i]} $BUILDDIR/html/${LANG_ARR[i]}
done
echo "<script language=\"javascript\" type=\"text/javascript\">window.location.href='en/index.html';</script>" > $BUILDDIR/html/index.html
+ ( cat Doxyfile ; echo "OUTPUT_DIRECTORY=$BUILDDIR/html/doxygen" ) | doxygen -
fi
diff --git a/doc/en/community/issue-tracking.md b/doc/en/community/issue-tracking.md
index 26b23dd..c6ff200 100644
--- a/doc/en/community/issue-tracking.md
+++ b/doc/en/community/issue-tracking.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
## Issue Tracking
___
diff --git a/doc/en/develop/contribute-code.md b/doc/en/develop/contribute-code.md
index 39d11f8..bbb22de 100644
--- a/doc/en/develop/contribute-code.md
+++ b/doc/en/develop/contribute-code.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
## How to Contribute Code
diff --git a/doc/en/develop/how-contribute.md b/doc/en/develop/how-contribute.md
index ab4ee66..399a954 100644
--- a/doc/en/develop/how-contribute.md
+++ b/doc/en/develop/how-contribute.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# How to Contribute to SINGA
As with any open source project, there are several ways you can help:
diff --git a/doc/en/docs/cnn.md b/doc/en/docs/cnn.md
old mode 100755
new mode 100644
index 6609137..64aad5a
--- a/doc/en/docs/cnn.md
+++ b/doc/en/docs/cnn.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# Quickstart - Cifar10 example
Convolution neural network (CNN) is a type of feed-forward artificial neural network widely used for image classification. In this example, we will use a deep CNN model to do image classification for the [CIFAR10 dataset](http://www.cs.toronto.edu/~kriz/cifar.html).
diff --git a/doc/en/docs/dependencies.md b/doc/en/docs/dependencies.md
index a812c05..febf6da 100644
--- a/doc/en/docs/dependencies.md
+++ b/doc/en/docs/dependencies.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# Dependent library installation
## Windows
diff --git a/doc/en/docs/docker.md b/doc/en/docs/docker.md
index c9bc27f..287e52d 100644
--- a/doc/en/docs/docker.md
+++ b/doc/en/docs/docker.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# Docker Images
diff --git a/doc/en/docs/installation.md b/doc/en/docs/installation.md
old mode 100755
new mode 100644
index 3062f77..40bf83c
--- a/doc/en/docs/installation.md
+++ b/doc/en/docs/installation.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# Installation
## From Conda
diff --git a/doc/en/docs/neural-net.md b/doc/en/docs/neural-net.md
index 0a97f21..e59a20c 100644
--- a/doc/en/docs/neural-net.md
+++ b/doc/en/docs/neural-net.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# Neural Net
diff --git a/doc/en/docs/notebook/cnn.ipynb b/doc/en/docs/notebook/cnn.ipynb
index d5198b2..7d33e1a 100644
--- a/doc/en/docs/notebook/cnn.ipynb
+++ b/doc/en/docs/notebook/cnn.ipynb
@@ -4,6 +4,13 @@
"cell_type": "markdown",
"metadata": {},
"source": [
+ "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. "
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "metadata": {},
+ "source": [
"# Classify images from MNIST using LeNet"
]
},
diff --git a/doc/en/docs/notebook/core.ipynb b/doc/en/docs/notebook/core.ipynb
index c16cc1f..50bdcf2 100644
--- a/doc/en/docs/notebook/core.ipynb
+++ b/doc/en/docs/notebook/core.ipynb
@@ -2,6 +2,13 @@
"cells": [
{
"cell_type": "markdown",
+ "metadata": {},
+ "source": [
+ "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. "
+ ]
+ },
+ {
+ "cell_type": "markdown",
"metadata": {
"collapsed": true
},
diff --git a/doc/en/docs/notebook/index.ipynb b/doc/en/docs/notebook/index.ipynb
index 29f689f..22b9678 100644
--- a/doc/en/docs/notebook/index.ipynb
+++ b/doc/en/docs/notebook/index.ipynb
@@ -4,6 +4,13 @@
"cell_type": "markdown",
"metadata": {},
"source": [
+ "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. "
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "metadata": {},
+ "source": [
"\n",
"\n",
"# A Tutorial of SINGA V1\n",
diff --git a/doc/en/docs/notebook/installation.ipynb b/doc/en/docs/notebook/installation.ipynb
index 65093dc..5d8793c 100644
--- a/doc/en/docs/notebook/installation.ipynb
+++ b/doc/en/docs/notebook/installation.ipynb
@@ -4,6 +4,13 @@
"cell_type": "markdown",
"metadata": {},
"source": [
+ "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. "
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "metadata": {},
+ "source": [
"The easiast way to install SINGA is via [conda](https://conda.io/docs/).\n",
"\n",
"## Install Conda\n",
diff --git a/doc/en/docs/notebook/mlp.ipynb b/doc/en/docs/notebook/mlp.ipynb
old mode 100755
new mode 100644
index de5fae5..199c44a
--- a/doc/en/docs/notebook/mlp.ipynb
+++ b/doc/en/docs/notebook/mlp.ipynb
@@ -4,6 +4,13 @@
"cell_type": "markdown",
"metadata": {},
"source": [
+ "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. "
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "metadata": {},
+ "source": [
"# Train a multi-layer perceptron (MLP) model \n",
"\n",
"In this notebook, we are going to use PySINGA to train a MLP model for classifying 2-d points into two categories (i.e., positive and negative). We use this example to illustrate the usage of PySINGA's modules. Please refer to the [documentation page](http://singa.apache.org/en/docs/index.html) for the functions of each module."
diff --git a/doc/en/docs/notebook/model.ipynb b/doc/en/docs/notebook/model.ipynb
index 6888435..35380da 100644
--- a/doc/en/docs/notebook/model.ipynb
+++ b/doc/en/docs/notebook/model.ipynb
@@ -4,6 +4,13 @@
"cell_type": "markdown",
"metadata": {},
"source": [
+ "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. "
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "metadata": {},
+ "source": [
"# SINGA Model Classes\n",
"\n",
"<img src=\"http://singa.apache.org/en/_static/images/singav1-sw.png\" width=\"500px\"/>"
diff --git a/doc/en/docs/notebook/rbm.ipynb b/doc/en/docs/notebook/rbm.ipynb
old mode 100755
new mode 100644
index fd3309c..44c7125
--- a/doc/en/docs/notebook/rbm.ipynb
+++ b/doc/en/docs/notebook/rbm.ipynb
@@ -4,6 +4,13 @@
"cell_type": "markdown",
"metadata": {},
"source": [
+ "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. "
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "metadata": {},
+ "source": [
"# Train a RBM model\n",
"\n",
"This notebook woul train a Restricted Boltzmann Machine (RBM) over the MNIST dataset using PySINGA. The RBM model would learn a feature representation of a digit image like MNIST images.\n",
diff --git a/doc/en/docs/notebook/regression.ipynb b/doc/en/docs/notebook/regression.ipynb
old mode 100755
new mode 100644
index 4484564..a1b8884
--- a/doc/en/docs/notebook/regression.ipynb
+++ b/doc/en/docs/notebook/regression.ipynb
@@ -4,6 +4,13 @@
"cell_type": "markdown",
"metadata": {},
"source": [
+ "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. "
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "metadata": {},
+ "source": [
"# Train a linear regression model\n",
"\n",
"In this notebook, we are going to use the tensor module from PySINGA to train a linear regression model. We use this example to illustrate the usage of tensor of PySINGA. Please refer the [documentation page](http://singa.apache.org/en/docs/tensor.html) to for more tensor functions provided by PySINGA. "
diff --git a/doc/en/docs/notebook/rnn.ipynb b/doc/en/docs/notebook/rnn.ipynb
index f05c5b6..c34230d 100644
--- a/doc/en/docs/notebook/rnn.ipynb
+++ b/doc/en/docs/notebook/rnn.ipynb
@@ -4,6 +4,13 @@
"cell_type": "markdown",
"metadata": {},
"source": [
+ "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. "
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "metadata": {},
+ "source": [
"# RNN for Character Level Language Modeling"
]
},
diff --git a/doc/en/docs/software_stack.md b/doc/en/docs/software_stack.md
index c60b6a5..141f4ab 100644
--- a/doc/en/docs/software_stack.md
+++ b/doc/en/docs/software_stack.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# Software Stack
SINGA's software stack includes three major components, namely, core, IO and
diff --git a/doc/en/downloads.md b/doc/en/downloads.md
index 1226d6a..f65222e 100644
--- a/doc/en/downloads.md
+++ b/doc/en/downloads.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
## Download SINGA
* To verify the downloaded tar.gz file, download the KEY and ASC files and then execute the following commands
diff --git a/doc/en/index.rst b/doc/en/index.rst
old mode 100755
new mode 100644
index 14e8fc6..056595c
--- a/doc/en/index.rst
+++ b/doc/en/index.rst
@@ -82,7 +82,7 @@
-------------
* Documentation and Python APIs are listed `here <docs.html>`_.
-* `C++ APIs <http://www.comp.nus.edu.sg/~dbsystem/singa/api/>`_ are generated by Doxygen.
+* `C++ APIs <../doxygen/html/index.html>`_ are generated by Doxygen.
* Research publication list is available `here <http://www.comp.nus.edu.sg/~dbsystem/singa/research/publication/>`_.
How to contribute
diff --git a/doc/en/releases/RELEASE_NOTES_0.1.0.md b/doc/en/releases/RELEASE_NOTES_0.1.0.md
index f0de7a5..b2d8bfb 100644
--- a/doc/en/releases/RELEASE_NOTES_0.1.0.md
+++ b/doc/en/releases/RELEASE_NOTES_0.1.0.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# singa-incubating-0.1.0 Release Notes
---
diff --git a/doc/en/releases/RELEASE_NOTES_0.2.0.md b/doc/en/releases/RELEASE_NOTES_0.2.0.md
index f2133e3..d933f54 100644
--- a/doc/en/releases/RELEASE_NOTES_0.2.0.md
+++ b/doc/en/releases/RELEASE_NOTES_0.2.0.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# singa-incubating-0.2.0 Release Notes
---
diff --git a/doc/en/releases/RELEASE_NOTES_0.3.0.md b/doc/en/releases/RELEASE_NOTES_0.3.0.md
index 4298aa6..a5fa1bb 100644
--- a/doc/en/releases/RELEASE_NOTES_0.3.0.md
+++ b/doc/en/releases/RELEASE_NOTES_0.3.0.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# singa-incubating-0.3.0 Release Notes
---
diff --git a/doc/en/releases/RELEASE_NOTES_1.0.0.md b/doc/en/releases/RELEASE_NOTES_1.0.0.md
index dde2c63..b45e600 100644
--- a/doc/en/releases/RELEASE_NOTES_1.0.0.md
+++ b/doc/en/releases/RELEASE_NOTES_1.0.0.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# singa-incubating-1.0.0 Release Notes
---
diff --git a/doc/en/releases/RELEASE_NOTES_1.1.0.md b/doc/en/releases/RELEASE_NOTES_1.1.0.md
index 75d086d..fffe6b0 100644
--- a/doc/en/releases/RELEASE_NOTES_1.1.0.md
+++ b/doc/en/releases/RELEASE_NOTES_1.1.0.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# singa-incubating-1.1.0 Release Notes
---
diff --git a/doc/en/releases/RELEASE_NOTES_1.2.0.md b/doc/en/releases/RELEASE_NOTES_1.2.0.md
index ca4ace6..2c7a134 100644
--- a/doc/en/releases/RELEASE_NOTES_1.2.0.md
+++ b/doc/en/releases/RELEASE_NOTES_1.2.0.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# singa-incubating-1.2.0 Release Notes
---
diff --git a/doc/en/releases/RELEASE_NOTES_2.0.0.md b/doc/en/releases/RELEASE_NOTES_2.0.0.md
new file mode 100644
index 0000000..3a9159c
--- /dev/null
+++ b/doc/en/releases/RELEASE_NOTES_2.0.0.md
@@ -0,0 +1,45 @@
+# singa-incubating-2.0.0 Release Notes
+
+---
+
+SINGA is a general distributed deep learning platform for training big deep
+learning models over large datasets.
+
+This release includes following features:
+
+ * Core components
+ * [SINGA-434] Support tensor broadcasting
+ * [SINGA-370] Improvement to tensor reshape and various misc. changes related to SINGA-341 and 351
+
+ * Model components
+ * [SINGA-333] Add support for Open Neural Network Exchange (ONNX) format
+ * [SINGA-385] Add new python module for optimizers
+ * [SINGA-394] Improve the CPP operations via Intel MKL DNN lib
+ * [SINGA-425] Add 3 operators , Abs(), Exp() and leakyrelu(), for Autograd
+ * [SINGA-410] Add two function, set_params() and get_params(), for Autograd Layer class
+ * [SINGA-383] Add Separable Convolution for autograd
+ * [SINGA-388] Develop some RNN layers by calling tiny operations like matmul, addbias.
+ * [SINGA-382] Implement concat operation for autograd
+ * [SINGA-378] Implement maxpooling operation and its related functions for autograd
+ * [SINGA-379] Implement batchnorm operation and its related functions for autograd
+
+ * Utility functions and CI
+ * [SINGA-432] Update depdent lib versions in conda-build config
+ * [SINGA-429] Update docker images for latest cuda and cudnn
+ * [SINGA-428] Move Docker images under Apache user name
+
+ * Documentation and usability
+ * [SINGA-395] Add documentation for autograd APIs
+ * [SINGA-344] Add a GAN example
+ * [SINGA-390] Update installation.md
+ * [SINGA-384] Implement ResNet using autograd API
+ * [SINGA-352] Complete SINGA documentation in Chinese version
+
+
+ * Bugs fixed
+ * [SINGA-431] Unit Test failed - Tensor Transpose
+ * [SINGA-422] ModuleNotFoundError: No module named "_singa_wrap"
+ * [SINGA-418] Unsupportive type 'long' in python3.
+ * [SINGA-409] Basic `singa-cpu` import throws error
+ * [SINGA-408] Unsupportive function definition in python3
+ * [SINGA-380] Fix bugs from Reshape
diff --git a/doc/notebook/index.ipynb b/doc/notebook/index.ipynb
index f4e1e49..f96fe66 100644
--- a/doc/notebook/index.ipynb
+++ b/doc/notebook/index.ipynb
@@ -4,6 +4,13 @@
"cell_type": "markdown",
"metadata": {},
"source": [
+ "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. "
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "metadata": {},
+ "source": [
""
]
},
diff --git a/doc/zh/community/source-repository.md b/doc/zh/community/source-repository.md
index cc4cb9c..d5e7de0 100644
--- a/doc/zh/community/source-repository.md
+++ b/doc/zh/community/source-repository.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# 源代码库
___
diff --git a/doc/zh/docs/data.md b/doc/zh/docs/data.md
index f60f7fc..93d5043 100644
--- a/doc/zh/docs/data.md
+++ b/doc/zh/docs/data.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# 数据(Data)
这个模块包含加载和预获取批数据的类。
diff --git a/doc/zh/docs/image_tool.md b/doc/zh/docs/image_tool.md
index fa7c425..3e78924 100644
--- a/doc/zh/docs/image_tool.md
+++ b/doc/zh/docs/image_tool.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# 图像工具
图像增强的模型。
diff --git a/doc/zh/docs/initializer.md b/doc/zh/docs/initializer.md
index b2686cf..91ddb47 100644
--- a/doc/zh/docs/initializer.md
+++ b/doc/zh/docs/initializer.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# 初始化器(Initializer)
## Python API
diff --git a/doc/zh/docs/layer.md b/doc/zh/docs/layer.md
index db7d712..4ca3ba1 100644
--- a/doc/zh/docs/layer.md
+++ b/doc/zh/docs/layer.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# 层(Layer)
## Python API
diff --git a/doc/zh/docs/optimizer.md b/doc/zh/docs/optimizer.md
index 6657e41..2913123 100644
--- a/doc/zh/docs/optimizer.md
+++ b/doc/zh/docs/optimizer.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# 优化器(Optimizer)
这个模块包含一系列用于模型参数更新的优化器。
diff --git a/doc/zh/docs/snapshot.md b/doc/zh/docs/snapshot.md
index 9978ca1..5401e35 100644
--- a/doc/zh/docs/snapshot.md
+++ b/doc/zh/docs/snapshot.md
@@ -1,3 +1,21 @@
+<!--
+ 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
此模块包含io::snapshot类及其方法。
diff --git a/doc/zh/docs/utils.md b/doc/zh/docs/utils.md
index 41a60d1..17df7ad 100644
--- a/doc/zh/docs/utils.md
+++ b/doc/zh/docs/utils.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
# Utils
---
diff --git a/doc/zh/downloads.md b/doc/zh/downloads.md
index 819fd34..6018dc3 100644
--- a/doc/zh/downloads.md
+++ b/doc/zh/downloads.md
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
## 下载 SINGA
* 要验证下载的tar.gz文件，请下载KEY和ASC文件，然后执行以下命令
diff --git a/doc/zh/index.rst b/doc/zh/index.rst
index aec5343..5a069e4 100644
--- a/doc/zh/index.rst
+++ b/doc/zh/index.rst
@@ -75,7 +75,7 @@
-------------
* `这里 <docs.html>`_ 列出了文档和 Python API.
-* `C++ APIs <http://www.comp.nus.edu.sg/~dbsystem/singa/api/>`_ 由 Doxygen 生成.
+* `C++ APIs <../doxygen/html/index.html>`_ 由 Doxygen 生成.
* 研究出版物清单可在 `此处 <http://www.comp.nus.edu.sg/~dbsystem/singa/research/publication/>`_ 查阅.
如何贡献
diff --git a/src/api/.gitignore b/src/api/.gitignore
deleted file mode 100644
index adb5d03..0000000
--- a/src/api/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-config.i
diff --git a/tool/conda/docker/cuda10/Dockerfile b/tool/conda/docker/cuda10/Dockerfile
index 1b93cf2..c95e652 100644
--- a/tool/conda/docker/cuda10/Dockerfile
+++ b/tool/conda/docker/cuda10/Dockerfile
@@ -15,9 +15,16 @@
# limitations under the License.
#
-# Change tags to build with different cuda/cudnn versions:
+# 18.04 has erros in ssh
FROM nvidia/cuda:10.0-devel-ubuntu16.04
+ENV CUDNN_VERSION 7.4.2.24
+RUN apt-get update && apt-get install -y --no-install-recommends \
+ libcudnn7=$CUDNN_VERSION-1+cuda10.0 \
+ libcudnn7-dev=$CUDNN_VERSION-1+cuda10.0 && \
+ apt-mark hold libcudnn7 && \
+ rm -rf /var/lib/apt/lists/*
+
# install dependencies
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
diff --git a/tool/conda/docker/cuda9/Dockerfile b/tool/conda/docker/cuda9/Dockerfile
index e3e1842..fc0ffc4 100644
--- a/tool/conda/docker/cuda9/Dockerfile
+++ b/tool/conda/docker/cuda9/Dockerfile
@@ -18,6 +18,15 @@
# Change tags to build with different cuda/cudnn versions:
FROM nvidia/cuda:9.0-devel-ubuntu16.04
+
+ENV CUDNN_VERSION 7.4.2.24
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+ libcudnn7=$CUDNN_VERSION-1+cuda9.0 \
+ libcudnn7-dev=$CUDNN_VERSION-1+cuda9.0 && \
+ apt-mark hold libcudnn7 && \
+ rm -rf /var/lib/apt/lists/*
+
# install dependencies
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
diff --git a/tool/conda/singa/README.md b/tool/conda/singa/README.md
index 0a3f42d..8d970be 100644
--- a/tool/conda/singa/README.md
+++ b/tool/conda/singa/README.md
@@ -23,28 +23,20 @@
## Environment variables
-Build string is a part of the conda package specification. We include the cuda and cudnn version in it if Singa is compiled with CUDA enabled.
+We export the CUDA version if Singa is compiled with CUDA enabled. The cuDNN version is fixed by Singa and cuDNN is installed from [anaconda cloud](https://anaconda.org/anaconda/cudnn).
- # for singa with gpu, e.g. cuda8.0-cudnn7.0.5
- export BUILD_STR=cudax.y-cudnna.b.c
+ # for singa with gpu, e.g. cuda9.0-cudnn7.3.1
+ export CUDA=9.0
- # for singa running only on cpu
- export BUILD_STR=cpu
-
-
-To package Singa with CUDA and CUDNN,
-
- export CUDNN_PATH=<path to cudnn folder>
-
-this folder should include a subfolder `include/cudnn.h` for the header file, and another subfolder `lib64` for the shared libraries. The BUILD_STR and CUDNN_PATH must be consistent. For example, if CUDNN_PATH is set, then BUILD_STR must be like cudax.y-cudnna.b.c. CUDNN must be provided if we want to compiled Singa with CUDA enabled.
+For CPU-only version, we do not export CUDA.
## Instruction
After exporting the environment variables, execute the following command to compile Singa and package it
- conda-build . --python 3.6 (or 2.7)
+ conda-build . --python 3.6
-You will see the package path from the screen output.
+You will see the package path from the screen output, e.g., `xx/yy/singa-1.2.0-cpu.tar.bz2` or `xx/yy/singa-1.2.0-cudnn7.3.1_cuda9.0.tar.bz2`.
To clean the cache
diff --git a/tool/conda/singa/build.sh b/tool/conda/singa/build.sh
index f5a3acf..a486b56 100644
--- a/tool/conda/singa/build.sh
+++ b/tool/conda/singa/build.sh
@@ -29,7 +29,8 @@
# PY3K is set by conda
# if [ "$PY3K" == "1" ]; then USE_PYTHON3=ON; fi
-if [ -z ${CUDA+x} ]; then
+# if [ -z ${CUDA+x} ]; then
+if [ -z "$CUDA" ]; then
USE_CUDA=OFF
else
USE_CUDA=ON
diff --git a/tool/conda/singa/meta.yaml b/tool/conda/singa/meta.yaml
index d93d7f4..6cca7c4 100644
--- a/tool/conda/singa/meta.yaml
+++ b/tool/conda/singa/meta.yaml
@@ -22,11 +22,13 @@
version: "{{ GIT_DESCRIBE_TAG }}"
source:
- # path: /path to/incubator-singa/
+ # path: ../../../
git_url: https://github.com/apache/incubator-singa.git
build:
number: 0
+ script_env:
+ - CUDA # E.g., export CUDA=9.0
string: {{ build_str }}
# py{{py}}_{{ environ.get('BUILD_STR', 'cpu') }}
@@ -58,7 +60,7 @@
- pillow
- future
- tqdm
- - onnx >= 1.3.0
+ - onnx >=1.3.0
test:
diff --git a/tool/jenkins/README.md b/tool/jenkins/README.md
index 26275e8..bc24189 100644
--- a/tool/jenkins/README.md
+++ b/tool/jenkins/README.md
@@ -103,7 +103,7 @@
To run the docker images,
- nvidia-docker run --name <node name> -d <Image ID> -P
+ nvidia-docker run --name <node name> -P -d <Image ID>
To add the container into a network for easy access
@@ -124,9 +124,9 @@
The working nodes (or Docker containers) are configured in Jenkins-Manage Jenkins-Mange Nodes.
Each node should configure the following environment variable
- export CUDNN_PATH=<path to cudnn folder>
+ export CUDA=<cuda version, e.g., 9.0>
-where the cudnn folder should include `inlcude/cudnn.h` and `lib64/libcudnn.so*`. [Dockerfiles](../docker/README.md) are provided to create the working nodes.
+[Dockerfiles](../conda/docker) are provided to create the working nodes.
## Configure Jenkins for Singa Website Updates
