SINGA-290 Upgrade to Python 3
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/bfeb6127 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/bfeb6127 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/bfeb6127 Branch: refs/heads/master Commit: bfeb61279d8d8af19a65d2c5ca628d65a09269c9 Parents: 8c9b594 Author: Moaz Reyad <[email protected]> Authored: Sat Jun 24 15:00:57 2017 +0800 Committer: Wei Wang <[email protected]> Committed: Thu Aug 3 18:16:00 2017 +0800 ---------------------------------------------------------------------- CMakeLists.txt | 2 +- doc/en/docs/notebook/index.ipynb | 12 +-- doc/en/docs/notebook/mlp.ipynb | 103 +++++++++---------- doc/en/docs/notebook/model.ipynb | 126 +++++++++-------------- doc/en/docs/notebook/rbm.ipynb | 128 +++++++++++------------ doc/en/docs/notebook/regression.ipynb | 157 +++++++++++++++++++---------- python/setup.py.in | 1 + 7 files changed, 278 insertions(+), 251 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/bfeb6127/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index 0522f61..fbd4f9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -195,7 +195,7 @@ IF(PACKAGE) IF(PYTHON2) SET(PYTHON_DEPENDENCIES "${CORE_DEPENDENCIES}, python-dev, libpython2.7, python-pip, python-numpy, python-pillow") ELSE() - SET(PYTHON_DEPENDENCIES "${CORE_DEPENDENCIES}, python3, python3-dev, python3-pip, python3-numpy, python3-pillow") + SET(PYTHON_DEPENDENCIES "${CORE_DEPENDENCIES}, python3, python3-dev, python3-pip, python3-numpy, python3-pillow, python3-matplotlib") ENDIF() SET(CPACK_GENERATOR "DEB") http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/bfeb6127/doc/en/docs/notebook/index.ipynb ---------------------------------------------------------------------- diff --git a/doc/en/docs/notebook/index.ipynb b/doc/en/docs/notebook/index.ipynb index 0c29187..29f689f 100644 --- a/doc/en/docs/notebook/index.ipynb +++ b/doc/en/docs/notebook/index.ipynb @@ -22,7 +22,7 @@ " * [Multi-layer Perceptron](./mlp.ipynb)\n", "* Deep learning models\n", " * [Convolutional Neural Network (CNN)](./cnn.ipynb)\n", - " * [Recurrent Neural Networks (RNN)](./rnn.ipynb) (WIP)\n", + " * [Recurrent Neural Networks (RNN)](./rnn.ipynb)\n", " * [Restricted Boltzmann Machine (RBM)](./rbm.ipynb)\n", "* [Distributed training](./distributed.ipynb) (WIP)\n", "* [Rafiki](./rafiki.ipynb) (WIP)" @@ -112,21 +112,21 @@ "metadata": { "anaconda-cloud": {}, "kernelspec": { - "display_name": "Python [conda env:conda]", + "display_name": "py3", "language": "python", - "name": "conda-env-conda-py" + "name": "py3" }, "language_info": { "codemirror_mode": { "name": "ipython", - "version": 2 + "version": 3 }, "file_extension": ".py", "mimetype": "text/x-python", "name": "python", "nbconvert_exporter": "python", - "pygments_lexer": "ipython2", - "version": "2.7.13" + "pygments_lexer": "ipython3", + "version": "3.5.3" } }, "nbformat": 4,
