From 70e2d03ecda2e32a14fc28f3072a4024fb963558 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mar 25 2016 02:53:28 +0000 Subject: New upstream release. --- diff --git a/.gitignore b/.gitignore index c7ce167..4e75755 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /Theano-missing.tar.xz /Theano-0.7.0.tar.gz /Theano-0.7.1a1.tar.gz +/Theano-0.8.0.tar.gz diff --git a/Theano.png b/Theano.png deleted file mode 100644 index df88485..0000000 Binary files a/Theano.png and /dev/null differ diff --git a/badge.png b/badge.png deleted file mode 100644 index 6cdadf5..0000000 Binary files a/badge.png and /dev/null differ diff --git a/badge2.png b/badge2.png deleted file mode 100644 index c98cf96..0000000 Binary files a/badge2.png and /dev/null differ diff --git a/bdcb752aa9abcaf8a7fb1e8e56d981e9bc151058.patch b/bdcb752aa9abcaf8a7fb1e8e56d981e9bc151058.patch deleted file mode 100644 index ac50d00..0000000 --- a/bdcb752aa9abcaf8a7fb1e8e56d981e9bc151058.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bdcb752aa9abcaf8a7fb1e8e56d981e9bc151058 Mon Sep 17 00:00:00 2001 -From: Frederic Bastien -Date: Mon, 19 Oct 2015 16:25:57 -0400 -Subject: [PATCH] Fix gh-3052, don't build ufunc when not used(We limit to 31 - inputs when there is no C compiler) - ---- - theano/tensor/elemwise.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/theano/tensor/elemwise.py b/theano/tensor/elemwise.py -index 1881af1..de18aa8 100644 ---- a/theano/tensor/elemwise.py -+++ b/theano/tensor/elemwise.py -@@ -505,7 +505,7 @@ def __init__(self, scalar_op, inplace_pattern=None, name=None, - self.nfunc_spec = nfunc_spec - if nfunc_spec: - self.nfunc = getattr(numpy, nfunc_spec[0]) -- elif scalar_op.nin > 0: -+ elif scalar_op.nin > 0 and scalar_op.nin < 32: - self.ufunc = numpy.frompyfunc(scalar_op.impl, scalar_op.nin, - scalar_op.nout) - -@@ -527,7 +527,7 @@ def __setstate__(self, d): - self.nfunc = None - if getattr(self, 'nfunc_spec', None): - self.nfunc = getattr(numpy, self.nfunc_spec[0]) -- elif self.scalar_op.nin > 0: -+ elif self.scalar_op.nin > 0 and self.scalar_op.nin < 32: - self.ufunc = numpy.frompyfunc(self.scalar_op.impl, - self.scalar_op.nin, - self.scalar_op.nout) diff --git a/python-theano-doc.patch b/python-theano-doc.patch index ab49966..0930800 100644 --- a/python-theano-doc.patch +++ b/python-theano-doc.patch @@ -1,6 +1,6 @@ ---- ./doc/tutorial/using_gpu.txt.orig 2015-03-26 15:34:26.000000000 -0600 -+++ ./doc/tutorial/using_gpu.txt 2015-03-31 20:00:00.000000000 -0600 -@@ -670,7 +670,7 @@ Modify and execute to work for a matrix +--- ./doc/tutorial/using_gpu.txt.orig 2016-03-21 13:17:57.000000000 -0600 ++++ ./doc/tutorial/using_gpu.txt 2016-03-22 18:49:34.589346869 -0600 +@@ -708,7 +708,7 @@ Modify and execute to work for a matrix @@ -9,9 +9,9 @@ **Example: Theano + PyCUDA** ---- ./MANIFEST.in.orig 2015-03-26 15:34:24.000000000 -0600 -+++ ./MANIFEST.in 2015-03-31 20:00:00.000000000 -0600 -@@ -5,7 +5,7 @@ global-include *.cuh +--- ./MANIFEST.in.orig 2016-03-21 13:17:57.000000000 -0600 ++++ ./MANIFEST.in 2016-03-22 18:49:50.492072870 -0600 +@@ -6,7 +6,7 @@ global-include *.cpp global-include *.h global-include *.sh global-include *.pkl @@ -20,18 +20,16 @@ include bin/theano-cache include bin/theano-nose include bin/theano-test ---- ./theano/sandbox/cuda/basic_ops.py.orig 2015-03-26 15:34:27.000000000 -0600 -+++ ./theano/sandbox/cuda/basic_ops.py 2015-03-31 20:00:00.000000000 -0600 -@@ -1239,8 +1239,10 @@ class GpuCAReduce(GpuOp): +--- ./theano/sandbox/cuda/basic_ops.py.orig 2016-03-21 13:17:57.000000000 -0600 ++++ ./theano/sandbox/cuda/basic_ops.py 2016-03-22 18:50:25.402276144 -0600 +@@ -1279,8 +1279,8 @@ class GpuCAReduce(GpuOp): + Parameters + ---------- + N : int +- The number of 1 in the pattern +- N=1 -> 01, N=2 -> 011 N=3 ->0111 ++ The number of 1s in the pattern. ++ N=1 -> 01, N=2 -> 011, N=3 ->0111. + Works for N=1,2,3. - def c_code_reduce_01X(self, sio, node, name, x, z, fail, N): """ -- :param N: the number of 1 in the pattern N=1 -> 01, N=2 -> 011 N=3 ->0111 -- Work for N=1,2,3 -+ :param N: the number of 1s in the pattern N=1 -> 01, N=2 -> 011, -+ N=3 ->0111. Works for N=1,2,3 -+ -+ Reduce. - """ - - assert N in [1, 2, 3] diff --git a/python-theano.spec b/python-theano.spec index 926c54e..5957762 100644 --- a/python-theano.spec +++ b/python-theano.spec @@ -1,41 +1,35 @@ %global pkgname Theano %global srcname theano -%global rctag a1 +#%%global rctag a1 Name: python-theano -Version: 0.7.1 -Release: 0.2%{?rctag:.%{rctag}}%{?dist} +Version: 0.8.0 +Release: 1%{?rctag:.%{rctag}}%{?dist} Summary: Mathematical expressions involving multidimensional arrays License: BSD URL: http://deeplearning.net/software/theano/ Source0: https://github.com/Theano/Theano/archive/rel-%{version}%{?rctag:%{rctag}}/%{pkgname}-%{version}%{?rctag:%{rctag}}.tar.gz -# Images used when building documentation -Source2: https://secure.travis-ci.org/Theano/Theano.png -Source3: https://pypip.in/v/Theano/badge.png -# Renamed due to base name collision with source3. -# Original: https://pypip.in/d/Theano/badge.png -Source4: badge2.png # Fix some documentation bugs Patch0: %{name}-doc.patch -# https://github.com/Theano/Theano/commit/bdcb752aa9abcaf8a7fb1e8e56d981e9bc151058 -Patch1: bdcb752aa9abcaf8a7fb1e8e56d981e9bc151058.patch - BuildArch: noarch BuildRequires: atlas-devel -BuildRequires: Cython python3-Cython BuildRequires: epydoc -BuildRequires: numpy python3-numpy +BuildRequires: gcc-c++ +BuildRequires: gcc-gfortran BuildRequires: pydot +BuildRequires: python2-Cython python3-Cython BuildRequires: python2-devel python3-devel -BuildRequires: python-nose python3-nose -BuildRequires: python-setuptools python3-setuptools -BuildRequires: python-six python3-six -BuildRequires: python-sphinx -BuildRequires: scipy python3-scipy +BuildRequires: python2-nose python3-nose +BuildRequires: python2-numpy python3-numpy +BuildRequires: python2-scipy python3-scipy +BuildRequires: python2-setuptools python3-setuptools +BuildRequires: python2-six python3-six +BuildRequires: python2-sphinx +BuildRequires: tex(latex) BuildRequires: tex-dvipng %description @@ -59,10 +53,10 @@ Summary: Mathematical expressions involving multidimensional arrays Requires: atlas-devel Requires: gcc-c++ Requires: gcc-gfortran -Requires: numpy Requires: pydot -Requires: python-six -Requires: scipy +Requires: python2-numpy +Requires: python2-six +Requires: python2-scipy %{?python_provide:%python_provide python2-%{srcname}} @@ -118,14 +112,6 @@ User documentation for Theano. %prep %setup -q -n %{pkgname}-rel-%{version}%{?rctag:%{rctag}} %patch0 -%patch1 -p1 - -# Don't use non-local images when building documentation -cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} doc/images -sed -e 's,https://.*/Theano\.png?branch=master,images/Theano.png,' \ - -e 's,https://pypip\.in/v/Theano/badge\.png,images/badge.png,' \ - -e 's,https://pypip\.in/d/Theano/badge\.png,images/badge2.png,' \ - -i doc/index.txt doc/install.txt # Remove bundled python-six rm -f theano/compat/six.py @@ -187,10 +173,6 @@ popd # Restore executable permission on the scripts chmod a+x $(find %{buildroot} -name \*.py -o -name \*.sh | xargs grep -l '^#!') -# Shebang in a python module -- Looking at the module, upstream probably should -# remove the shebang (or possibly even remove the file from the tarball -sed -i s'!/usr/bin/python$!/usr/bin/python3!' %{buildroot}%{python3_sitelib}/theano/sandbox/test_neighbourhoods.py - %check PYTHONPATH=$PWD bin/theano-test @@ -209,6 +191,9 @@ PYTHONPATH=$PWD bin/theano-test %doc html %changelog +* Wed Mar 23 2016 Jerry James - 0.8.0-1 +- New upstream release + * Thu Feb 04 2016 Fedora Release Engineering - 0.7.1-0.2.a1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 19016af..570719c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5541b8df9adaa4f6378be428d60ed115 Theano-0.7.1a1.tar.gz +d9f5e9e4fb5610af64ad585e2a59955b Theano-0.8.0.tar.gz