Merged

doc/install.txt

@@ -420,8 +420,8 @@ Installing Dependencies
 If neither Python nor MinGW is installed on your computer, the easiest way to
 install most dependencies is to install
 `Python(x,y) <http://www.pythonxy.com>`__.
-It is a single installation
-file that contains additional packages like NumPy, SciPy, IPython, Matplotlib,
+  It is a single installation
+  file that contains additional packages like NumPy, SciPy, IPython, Matplotlib,
 MinGW, Nose, etc.
 You can keep the default install options, except that the installation directory should not contain any blank space (in particular, do not install it into
 ``C:\Program Files``).
@@ -597,7 +597,7 @@ is the correct Python installation path):
     .. code-block:: cfg
 
       [cuda]
-      nvccflags=-LC:\Python26\libs
+      nvccflags=-LC:\Python27\libs
 
 Then
   
@@ -641,83 +641,25 @@ It could probably also run with `Cygwin <http://www.cygwin.com/>`__,
 but this has not been tested yet.
 
 - From `the MinGW files <http://sourceforge.net/projects/mingw/files/>`__,
-  download the latest version of the ``Automated MinGW Installer`` and install
-  it (keeping default options).
-
-- From `the MinGW files <http://sourceforge.net/projects/mingw/files/>`__,
-  download the latest ``MSYS Base System`` executable file and run it
-  (note that the latest version of MSYS Base System may not contain an
-  executable file, in which case it is easier to just use an
-  older version, e.g. MSYS-1.0.11.exe).
-  This will install MSYS (you can keep the default install options).
-  It will also run a post-install script where it will ask you about the
-  location of MinGW (typically ``c:/MinGW``).
-
-- From `the MinGW files <http://sourceforge.net/projects/mingw/files/>`__,
-  download the current version of ``GCC Version 4`` (full package with
-  binaries, e.g.
-  gcc-full-4.4.0-mingw32-bin-2.tar.lzma). Unpack it (you may use
-  `7-Zip <http://www.7-zip.org>`__ to unpack files with the
-  .lzma extension), copying the content into the root directory
-  of your MinGW installation (if you obtain a .tar file, make
-  sure you expand it as well, either with `7-Zip <http://www.7-zip.org>`__
-  or through the ``tar`` command on the MSYS command line).
-
-- If you are familiar with vi, you may find useful to download and install
-  ``MSYS vim`` (this is done in a similar way to GCC 4).
-  This is strictly optional and mostly helpful to edit configuration files
-  from within MSYS.
-
-- Run MSYS (Start/Programs/MinGW/MSYS/MSYS) and check the installation
-  by verifying that the proper version of GCC is found:
-
-    .. code-block:: bash
-
-        gcc --version
-
-  You may also decide to change the location of your home directory by
-  adding a line at the beginning of msys.bat, that would look like
-  ``set HOME=C:\My\Home\For\MinGW`` (you can also set a global ``HOME``
-  environment variable within Windows, but this could affect more programs).
+  download the latest version of the ``Automated MinGW Installer``
+  (``mingw-get-inst``) and install it with all optional components (although
+  you probably do not need them all: if you feel like figuring out exactly
+  which ones are required, let us know!).
 
 - If you do not have them already, install the latest versions of
   `Python 2.x <http://www.python.org/download/windows>`__ and
   corresponding `NumPy <http://sourceforge.net/projects/numpy/files/>`__
   then `SciPy <http://sourceforge.net/projects/scipy/files/>`__
-  packages (simply use the executable installers).
-
-- Ensure that the Python installation directory and its ``Scripts`` sub-directory
-  are in your system path. This may be done by
-  modifying the global ``PATH`` Windows environment variables, or by creating a ``.profile`` file in
-  your MinGW home, containing the line
-  ``export PATH=$PATH:/c/Python26:/c/Python26/Scripts``
-  (for Python 2.6).
-
-- Install a ``BLAS`` library. Note that although the following instructions
-  will give you a generic way to build your own library, there may exist
-  better (more optimized) versions of BLAS available for your system, but
-  these have not been tested for Windows at this time.
-  To build BLAS, download the latest version of `LAPACK <http://www.netlib.org/lapack/>`__
-  (typically lapack.tgz), then issue the following commands in MSYS
-  (for LAPACK 3.2.1):
-  
-    .. code-block:: bash
-
-        tar zxvf lapack.tgz
-        cd lapack-3.2.1
-        gfortran -shared -O3 -o libblas.dll BLAS/SRC/*.f
-        cp libblas.dll /mingw/lib
-        mv libblas.dll /mingw/bin
-
-- Edit (or create) your ``$HOME/.theanorc`` and add the following section:
-
-    .. code-block:: cfg
-
-        [blas]
-        ldflags = -lblas
+  packages (simply use the executable installers). Note that we experienced
+  issues with the 64 bit version of Python, and thus recommend using the 32 bit
+  version instead (if you managed to get Theano to work with 64 bit Python under
+  Windows, please let us know!).
 
-- Install `Mercurial <http://mercurial.selenic.com/downloads/>`__
-  (you can use the regular Windows release, you do not need TortoiseHg).
+- Ensure that the Python installation directory and its ``Scripts``
+  sub-directory are in your system path. This may be done by
+  modifying the global ``PATH`` Windows environment variables, or by creating
+  a ``.profile`` file in your MinGW home, containing a line like
+  ``export PATH=$PATH:/c/Python27:/c/Python27/Scripts``.
 
 - In order to run Theano's test-suite, you will need `nose
   <http://somethingaboutorange.com/mrl/projects/nose>`__.
@@ -728,17 +670,15 @@ but this has not been tested yet.
 
         python setup.py install
 
-- Install Theano using the above :ref:`install_bleeding_edge` installation instructions
-  (using ``easy_install`` will require additional packages and has not been
-  tested yet, while the latest official Theano release is also untested at this
-  time).
+- Install Theano using the above :ref:`install_bleeding_edge` installation
+  instructions
+  (using ``easy_install`` and has not been tested yet).
   In particular, do not forget to make the Theano package accessible from
   Python, e.g. by adding to your ``.profile`` a line like
   ``export PYTHONPATH=PYTHONPATH:$HOME/Theano``.
 
-- Please note that at this time, some tests (launched using ``nosetests``) are
-  still failing under Windows: we are working on fixing them.
-  It may also happen that many tests may fail while running the test-suite,
+- Please note that at this time, the test suite may be broken under Windows.
+  In particular, many tests may fail while running the test-suite,
   due to insufficient memory resources (in which case you will probably get an
   error of the type ``"Not enough storage is available to
   process this command"``): one workaround is to run nosetests