提交 bf549f88 authored 作者: Olivier Delalleau's avatar Olivier Delalleau

Merge pull request #1384 from nouiz/py24

[FIX] Py24
...@@ -20,11 +20,11 @@ since 2007. But it is also approachable enough to be used in the classroom ...@@ -20,11 +20,11 @@ since 2007. But it is also approachable enough to be used in the classroom
News News
==== ====
* Theano 0.6rc3 was released. Everybody is encouraged to update.
* New technical report on Theano: `Theano: new features and speed improvements <http://arxiv.org/abs/1211.5590>`_. * New technical report on Theano: `Theano: new features and speed improvements <http://arxiv.org/abs/1211.5590>`_.
However, please keep citing the other paper below in scientific work involving Theano. However, please keep citing the other paper below in scientific work involving Theano.
* Theano 0.6rc2 was released. Everybody is encouraged to update.
* `HPCS 2011 Tutorial <http://www.iro.umontreal.ca/~lisa/pointeurs/tutorial_hpcs2011_fixed.pdf>`_. * `HPCS 2011 Tutorial <http://www.iro.umontreal.ca/~lisa/pointeurs/tutorial_hpcs2011_fixed.pdf>`_.
We included a few fixes discovered while doing the Tutorial. We included a few fixes discovered while doing the Tutorial.
......
...@@ -935,7 +935,7 @@ Theano is to download and execute this `Windows installer ...@@ -935,7 +935,7 @@ Theano is to download and execute this `Windows installer
for Theano on AnacondaCE for Windows for Theano on AnacondaCE for Windows
<https://github.com/Theano/Theano-wininstaller/raw/master/bin/theano_installer_latest.msi>`__. <https://github.com/Theano/Theano-wininstaller/raw/master/bin/theano_installer_latest.msi>`__.
.. note .. note::
This installer was tested on Windows 7, 64-bit edition, and AnacondaCE This installer was tested on Windows 7, 64-bit edition, and AnacondaCE
version 1.3.1. Please get back to us if you experience trouble with it. version 1.3.1. Please get back to us if you experience trouble with it.
......
...@@ -9,7 +9,7 @@ Update files ...@@ -9,7 +9,7 @@ Update files
Update the NEWS.txt and move the old stuff in the HISTORY.txt file. Update the NEWS.txt and move the old stuff in the HISTORY.txt file.
To update the NEWS.txt file, check all ticket closed for this release To update the NEWS.txt file, check all ticket closed for this release
and all commit log messages. and all commit log messages. Update the index.txt *News* section.
For the final release, copy the file ``Theano/NEWS.txt`` to For the final release, copy the file ``Theano/NEWS.txt`` to
``Theano/doc/NEWS.txt``. ``Theano/doc/NEWS.txt``.
......
...@@ -621,7 +621,11 @@ def get_scalar_constant_value(v): ...@@ -621,7 +621,11 @@ def get_scalar_constant_value(v):
#idx_list can contain Scalar Type object. #idx_list can contain Scalar Type object.
isinstance(v.owner.op.idx_list[0], (int, long, isinstance(v.owner.op.idx_list[0], (int, long,
numpy.integer))): numpy.integer))):
ret = v.owner.inputs[0].owner.inputs[v.owner.op.idx_list[0]]
# Python 2.4 don't support indexing with numpy.integer
# So we cast it.
idx = int(v.owner.op.idx_list[0])
ret = v.owner.inputs[0].owner.inputs[idx]
ret = get_scalar_constant_value(ret) ret = get_scalar_constant_value(ret)
# MakeVector can cast implicitly its input in some case. # MakeVector can cast implicitly its input in some case.
return theano._asarray(ret, dtype=v.type.dtype) return theano._asarray(ret, dtype=v.type.dtype)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论