Merge pull request #555 from skaae/slice

replace ndim with len(inputs) in line 119 + test
Lasagne · Dec 29, 2015 · 5956ceb · 5956ceb
2 parents 60a78bc + 9fab702
commit 5956ceb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lasagne/layers/merge.py b/lasagne/layers/merge.py
@@ -116,7 +116,7 @@ def autocrop(inputs, cropping):
 
         # Nested list of slices; each list in `slices` corresponds to
         # an input and contains a slice for each dimension
-        slices_by_input = [[] for i in range(ndim)]
+        slices_by_input = [[] for i in range(len(inputs))]
 
         # If there are more dimensions than cropping entries, pad
         # the cropping

diff --git a/lasagne/tests/layers/test_merge.py b/lasagne/tests/layers/test_merge.py
@@ -93,6 +93,12 @@ def crop_test(cropping, inputs, expected):
         crop_test(crop_x, [x0, x1, x2],
                   [x0[:1, :2, :, :], x1[:1, :2, :, :], x2[:1, :2, :, :]])
 
+        # test that num outputs is correct when the number of inputs is
+        # larger than ndim of the inputs.
+        crop_test(crop_x, [x0, x1, x2, x0, x1, x2],
+                  [x0[:1, :2, :, :], x1[:1, :2, :, :], x2[:1, :2, :, :],
+                   x0[:1, :2, :, :], x1[:1, :2, :, :], x2[:1, :2, :, :]])
+
         with pytest.raises(ValueError):
             crop_test(crop_bad, [x0, x1, x2],
                       [x0[:1, :2, :, :], x1[:1, :2, :, :], x2[:1, :2, :, :]])