[Python-modules-commits] [python-brainstorm] 05/06: merge patched into master

[Daniel Stender]

This is an automated email from the git hooks/post-receive script.

danstender-guest pushed a commit to branch master
in repository python-brainstorm.

commit f1cdbf348eb0b58c14ab2361610322457803a978
Merge: f0f6a65 dbdefff
Author: Daniel Stender <stender at debian.org>
Date:   Thu Jan 19 20:34:16 2017 +0100

    merge patched into master

 debian/.git-dpm                                    | 4 ++--
 debian/patches/0001-fix-tests-for-numpy-1.12.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 87622d4,0000000..c68aa52
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 6fb0fd984637c08e16f00e736d387a8c9e33dc08
- 6fb0fd984637c08e16f00e736d387a8c9e33dc08
++dbdefffa1cac55614557bf1df2fb6c54113545aa
++dbdefffa1cac55614557bf1df2fb6c54113545aa
 +99c4696b1fef72329a6ddde3a21239456d6346b2
 +99c4696b1fef72329a6ddde3a21239456d6346b2
 +python-brainstorm_0.5.orig.tar.xz
 +7b507ca7b0ab8e3099ca310dceeb28522e1a80fd
 +114968
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-fix-tests-for-numpy-1.12.patch
index c60d852,0000000..b219a2c
mode 100644,000000..100644
--- a/debian/patches/0001-fix-tests-for-numpy-1.12.patch
+++ b/debian/patches/0001-fix-tests-for-numpy-1.12.patch
@@@ -1,42 -1,0 +1,42 @@@
- From 6fb0fd984637c08e16f00e736d387a8c9e33dc08 Mon Sep 17 00:00:00 2001
++From dbdefffa1cac55614557bf1df2fb6c54113545aa Mon Sep 17 00:00:00 2001
 +From: Daniel Stender <stender at debian.org>
 +Date: Thu, 19 Jan 2017 20:24:51 +0100
 +Subject: fix tests for numpy 1.12
 +
 +Description: fixes tests for Numpy 1.12.0.
 +Bug-Debian: https://bugs.debian.org/849232
 +Author: Graham Inggs <ginggs at debian.org>
- Forwarded: no
++Forwarded: https://github.com/IDSIA/brainstorm/pull/119
 +---
 + brainstorm/tests/test_handler_operations.py | 4 ++--
 + brainstorm/tests/test_weight_modifiers.py   | 2 +-
 + 2 files changed, 3 insertions(+), 3 deletions(-)
 +
 +diff --git a/brainstorm/tests/test_handler_operations.py b/brainstorm/tests/test_handler_operations.py
 +index 783281d..20cc1e8 100644
 +--- a/brainstorm/tests/test_handler_operations.py
 ++++ b/brainstorm/tests/test_handler_operations.py
 +@@ -81,8 +81,8 @@ def test_conv2d_forward_batch_numpy():
 +                                      kernel_shape[1]) / stride[1] + 1
 + 
 +                                 outputs = np.zeros((nr_images,
 +-                                                    output_height,
 +-                                                    output_width,
 ++                                                    int(output_height),
 ++                                                    int(output_width),
 +                                                     nr_filters), dtype=dtype)
 +                                 true_outputs = np.zeros_like(outputs)
 + 
 +diff --git a/brainstorm/tests/test_weight_modifiers.py b/brainstorm/tests/test_weight_modifiers.py
 +index dae512c..2254156 100644
 +--- a/brainstorm/tests/test_weight_modifiers.py
 ++++ b/brainstorm/tests/test_weight_modifiers.py
 +@@ -17,7 +17,7 @@ if has_pycuda:
 + def test_limit_incoming_weights_squared():
 +     for orig in (np.random.rand(4, 5), np.random.randn(3, 5, 4, 6)):
 +         for limit in [0.00001, 1, 10, 10000]:
 +-            x = orig.reshape(orig.shape[0], orig.size / orig.shape[0]).copy()
 ++            x = orig.reshape(orig.shape[0], int(orig.size / orig.shape[0])).copy()
 +             divisor = (x * x).sum(axis=1, keepdims=True) ** 0.5 / limit
 +             divisor[divisor < 1] = 1
 +             out = (x / divisor).reshape(orig.shape)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-brainstorm.git