提交 08a59233 authored 作者: notoraptor's avatar notoraptor

Update Windows documentation following the plan in…

Update Windows documentation following the plan in https://gist.github.com/notoraptor/ec67e03e7bb311b836e0e351a41b4505 Some other files have been also updated: * Add a |CompilerName| replacement rule to `requirements.inc` which is `gcc` for Windows/Linux and `Clang` for Mac. * Update inclusion rule of `requirements.inc` everywhere it is included to take account of the new replacement rule. * Update `install_generic.inc`. The libgpuarray stable version is now set to `v0.6.0`. I have also updated the download instructions because the actual instructions does not work on my Windows machine. Some other updates and corrections to come (eespecially, how to configure libgpuarray on windows).
上级 127ae529
...@@ -12,6 +12,7 @@ CentOS 6 Installation Instructions ...@@ -12,6 +12,7 @@ CentOS 6 Installation Instructions
page <http://deeplearning.net/software/theano_versions/dev/install_centos6.html>`_. page <http://deeplearning.net/software/theano_versions/dev/install_centos6.html>`_.
.. |PlatformCompiler| replace:: ``python-dev``, ``g++`` >= 4.2 .. |PlatformCompiler| replace:: ``python-dev``, ``g++`` >= 4.2
.. |CompilerName| replace:: ``g++``
.. include:: requirements.inc .. include:: requirements.inc
......
...@@ -30,19 +30,16 @@ If you encountered any trouble, head to the :ref:`troubleshooting` page. ...@@ -30,19 +30,16 @@ If you encountered any trouble, head to the :ref:`troubleshooting` page.
libgpuarray libgpuarray
^^^^^^^^^^^ ^^^^^^^^^^^
It is recommanded that you don't use 0.8.2 for the new back-end. Use For the stable version of Theano you need a specific version of libgpuarray,
the dev version of Theano or 0.9rc3. that has been tagged ``v0.6.0``.
For the stable version of Theano(0.8.2) you need a specific version of libgpuarray,
that has been tagged ``v-9998``.
Download it with: Download it with:
.. raw:: html .. raw:: html
<div class='highlight'><pre> <div class='highlight'><pre>
git clone https://github.com/Theano/libgpuarray.git --tags git clone https://github.com/Theano/libgpuarray.git
git checkout origin/v-9998
cd libgpuarray cd libgpuarray
git checkout tags/v0.6.0 -b v0.6.0
</pre></div> </pre></div>
and then follow the `Step-by-step instructions <http://deeplearning.net/software/libgpuarray/installation.html#step-by-step-install>`__. and then follow the `Step-by-step instructions <http://deeplearning.net/software/libgpuarray/installation.html#step-by-step-install>`__.
......
...@@ -20,6 +20,7 @@ alternative instructions here. ...@@ -20,6 +20,7 @@ alternative instructions here.
.. _theano-users: http://groups.google.com/group/theano-users?pli=1 .. _theano-users: http://groups.google.com/group/theano-users?pli=1
.. |PlatformCompiler| replace:: ``clang`` (the system version) .. |PlatformCompiler| replace:: ``clang`` (the system version)
.. |CompilerName| replace:: ``Clang``
.. include:: requirements.inc .. include:: requirements.inc
......
...@@ -14,6 +14,7 @@ Ubuntu Installation Instructions ...@@ -14,6 +14,7 @@ Ubuntu Installation Instructions
.. _gpu_linux: .. _gpu_linux:
.. |PlatformCompiler| replace:: ``python-dev``, ``g++`` >= 4.2 .. |PlatformCompiler| replace:: ``python-dev``, ``g++`` >= 4.2
.. |CompilerName| replace:: ``g++``
.. include:: requirements.inc .. include:: requirements.inc
......
差异被折叠。
...@@ -7,8 +7,13 @@ Requirements ...@@ -7,8 +7,13 @@ Requirements
.. _BLAS: http://en.wikipedia.org/wiki/Basic_Linear_Algebra_Subprograms .. _BLAS: http://en.wikipedia.org/wiki/Basic_Linear_Algebra_Subprograms
.. _Python: http://www.python.org/ .. _Python: http://www.python.org/
.. _LaTeX: http://www.latex-project.org/
.. _dvipng: http://savannah.nongnu.org/projects/dvipng/
.. _NVIDIA CUDA drivers and SDK: http://developer.nvidia.com/object/gpucomputing.html
.. _libgpuarray: http://deeplearning.net/software/libgpuarray/installation.html
Python_ >= 2.7 or >= 3.3 The development package (python-dev or Python_ >= 2.7 or >= 3.3
The development package (python-dev or
python-devel on most Linux distributions) is recommended (see python-devel on most Linux distributions) is recommended (see
just below). Python 2.4 was supported up to and including the just below). Python 2.4 was supported up to and including the
release 0.6. Python 2.6 was supported up to and including the release 0.6. Python 2.6 was supported up to and including the
...@@ -63,7 +68,7 @@ Follow this `link <http://conda.pydata.org/miniconda.html>`__ to install Minicon ...@@ -63,7 +68,7 @@ Follow this `link <http://conda.pydata.org/miniconda.html>`__ to install Minicon
.. note:: .. note::
If you want fast compiled code (recommended), make sure you have g++ (Windows/Linux) or Clang (OS X) installed. If you want fast compiled code (recommended), make sure you have |CompilerName| installed.
Install requirements and optional packages Install requirements and optional packages
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...@@ -109,9 +114,4 @@ Install and configure the GPU drivers (recommended) ...@@ -109,9 +114,4 @@ Install and configure the GPU drivers (recommended)
* add a ``cuda.root`` flag to :envvar:`THEANO_FLAGS`, as in ``THEANO_FLAGS='cuda.root=/path/to/cuda/root'``, or * add a ``cuda.root`` flag to :envvar:`THEANO_FLAGS`, as in ``THEANO_FLAGS='cuda.root=/path/to/cuda/root'``, or
* add a [cuda] section to your .theanorc file containing the option ``root = /path/to/cuda/root``. * add a [cuda] section to your .theanorc file containing the option ``root = /path/to/cuda/root``.
.. _LaTeX: http://www.latex-project.org/
.. _dvipng: http://savannah.nongnu.org/projects/dvipng/
.. _NVIDIA CUDA drivers and SDK: http://developer.nvidia.com/object/gpucomputing.html
.. _libgpuarray: http://deeplearning.net/software/libgpuarray/installation.html
.. _pycuda: https://mathema.tician.de/software/pycuda/
.. _skcuda: http://scikit-cuda.readthedocs.io/en/latest/
.. |PlatformCompiler| replace:: ``g++`` (Linux and Windows), ``clang`` (OS X) .. |PlatformCompiler| replace:: ``g++`` (Linux and Windows), ``clang`` (OS X)
.. |CompilerName| replace:: ``g++`` (Windows/Linux) or ``Clang`` (OS X)
.. include:: requirements.inc .. include:: requirements.inc
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论