提交 5a32184f authored 作者: Olivier Delalleau's avatar Olivier Delalleau

Reverted 00dea98e00fa which did not work as intended

上级 96c56c2c
...@@ -123,7 +123,7 @@ directory; see the `virtualenv documentation`_ for details. ...@@ -123,7 +123,7 @@ directory; see the `virtualenv documentation`_ for details.
.. note:: .. note::
The tests should be run with the :envvar:`~config.THEANO_FLAGS` The tests should be run with the ``THEANO_FLAGS``(defined later)
``device=cpu`` (default). Otherwise, it will generate false errors. ``device=cpu`` (default). Otherwise, it will generate false errors.
.. _distribute: http://packages.python.org/distribute/ .. _distribute: http://packages.python.org/distribute/
...@@ -246,8 +246,7 @@ You can also run them in-place from the Mercurial checkout directory by typing ...@@ -246,8 +246,7 @@ You can also run them in-place from the Mercurial checkout directory by typing
.. note:: .. note::
The tests should be run with the :attr:`~config.device` option set to The tests should be run with the :attr:`~config.device` option set to
``cpu``, e.g. setting the :envvar:`~config.THEANO_FLAGS` environment ``cpu``, e.g. with prefixing the ``nosetests`` command with
variable by prefixing the ``nosetests`` command with
``THEANO_FLAGS=device=cpu``. If you have a GPU, it will automatically ``THEANO_FLAGS=device=cpu``. If you have a GPU, it will automatically
be used to run GPU-related tests. be used to run GPU-related tests.
...@@ -272,8 +271,8 @@ was compiled with a static library of BLAS (the latter is not supported in ...@@ -272,8 +271,8 @@ was compiled with a static library of BLAS (the latter is not supported in
Theano). Theano).
The short way to configure the Theano flags ``blas.ldflags`` is by setting the The short way to configure the Theano flags ``blas.ldflags`` is by setting the
environmental variable :envvar:`~config.THEANO_FLAGS` to ``blas.ldflags=XXX`` (in bash environmental variable ``THEANO_FLAGS`` to ``blas.ldflags=XXX`` (in bash
``export THEANO_FLAGS=blas.ldflags=XXX``). ``export THEANO_FLAGS=blas.ldflags=XXX``)
The ``${HOME}/.theanorc`` file is the simplest way to set a relatively The ``${HOME}/.theanorc`` file is the simplest way to set a relatively
permanent option like this one. Add a ``[blas]`` section with an ``ldflags`` permanent option like this one. Add a ``[blas]`` section with an ``ldflags``
...@@ -423,8 +422,7 @@ Mac ...@@ -423,8 +422,7 @@ Mac
For this reason, we've disabled linking with ``-framework Python``, since on For this reason, we've disabled linking with ``-framework Python``, since on
most configurations this solves the ``Bus error`` problem. If this default most configurations this solves the ``Bus error`` problem. If this default
configuration causes problems with your Python/Theano installation and you think configuration causes problems with your Python/Theano installation and you think
that linking with ``-framework Python`` might help, then either set the that linking with ``-framework Python`` might help, then either set
:envvar:`~config.THEANO_FLAGS` environment variable with
``THEANO_FLAGS=cmodule.mac_framework_link`` or edit your ``~/.theanorc`` to ``THEANO_FLAGS=cmodule.mac_framework_link`` or edit your ``~/.theanorc`` to
contain contain
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论