提交 05f36e3e authored 作者: Olivier Delalleau's avatar Olivier Delalleau

Typo and doc formatting fixes

上级 72c4382a
...@@ -850,7 +850,7 @@ You can then proceed to the :ref:`windows_basic` or the :ref:`windows_bleeding_e ...@@ -850,7 +850,7 @@ You can then proceed to the :ref:`windows_basic` or the :ref:`windows_bleeding_e
Alternative: Canopy Alternative: Canopy
################### ###################
Another software from Enthought that install all Theano dependancy. Another software from Enthought that installs all Theano dependencies.
If you are affiliated with a university (as student or employee), you If you are affiliated with a university (as student or employee), you
can download the installation for free. can download the installation for free.
...@@ -863,8 +863,8 @@ can download the installation for free. ...@@ -863,8 +863,8 @@ can download the installation for free.
- In Canopy Package Manager, search and install packages "mingw 4.5.2" and "libpython 1.2" - In Canopy Package Manager, search and install packages "mingw 4.5.2" and "libpython 1.2"
- (Needed only for Theano 0.6rc3 or earlier) - (Needed only for Theano 0.6rc3 or earlier)
The "libpython 1.2" package installs files `libpython27.a` and `libmsvcr90.a` to The "libpython 1.2" package installs files `libpython27.a` and `libmsvcr90.a` to
`C:\Users\<USER>\AppData\Local\Enthought\Canopy\User\libs`. Copy the two files to `C:\\Users\\<USER>\\AppData\\Local\\Enthought\\Canopy\\User\\libs`. Copy the two files to
`C:\Users\<USER>\AppData\Local\Enthought\Canopy\App\appdata\canopy-1.0.0.1160.win-x86_64\libs`. `C:\\Users\\<USER>\\AppData\\Local\\Enthought\\Canopy\\App\\appdata\\canopy-1.0.0.1160.win-x86_64\libs`.
- (Needed only for Theano 0.6rc3 or earlier) Set the Theano flags - (Needed only for Theano 0.6rc3 or earlier) Set the Theano flags
``blas.ldflags=-LC:\Users\<USER>\AppData\Local\Enthought\Canopy\App\appdata\canopy-1.0.0.1160.win-x86_64\Scripts -lmk2_core -lmk2_intel_thread -lmk2_rt``. ``blas.ldflags=-LC:\Users\<USER>\AppData\Local\Enthought\Canopy\App\appdata\canopy-1.0.0.1160.win-x86_64\Scripts -lmk2_core -lmk2_intel_thread -lmk2_rt``.
......
...@@ -1457,7 +1457,7 @@ def std_lib_dirs_and_libs(): ...@@ -1457,7 +1457,7 @@ def std_lib_dirs_and_libs():
# directories. # directories.
python_lib_dirs = [os.path.join(os.path.dirname(python_inc), 'libs')] python_lib_dirs = [os.path.join(os.path.dirname(python_inc), 'libs')]
if "Canopy" in python_lib_dirs[0]: if "Canopy" in python_lib_dirs[0]:
# Canopy store libpython27.a and libmsccr90.a in this directory. # Canopy stores libpython27.a and libmsccr90.a in this directory.
# For some reason, these files are needed when compiling Python # For some reason, these files are needed when compiling Python
# modules, even when libpython27.lib and python27.dll are # modules, even when libpython27.lib and python27.dll are
# available, and the *.a files have to be found earlier than # available, and the *.a files have to be found earlier than
...@@ -1467,7 +1467,7 @@ def std_lib_dirs_and_libs(): ...@@ -1467,7 +1467,7 @@ def std_lib_dirs_and_libs():
for f, lib in [('libpython27.a', 'libpython 1.2'), for f, lib in [('libpython27.a', 'libpython 1.2'),
('libmsvcr90.a', 'mingw 4.5.2')]: ('libmsvcr90.a', 'mingw 4.5.2')]:
if not os.path.exists(os.path.join(libdir, f)): if not os.path.exists(os.path.join(libdir, f)):
print ("Your python version is from Canopy. " + print ("Your Python version is from Canopy. " +
"You need to install the package '" + lib + "You need to install the package '" + lib +
"' from Canopy package manager." "' from Canopy package manager."
) )
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论