Merge pull request #2560 from lamblin/fix_buildbot

theano/scan_module/tests/test_scan.py

@@ -379,7 +379,7 @@ class T_Scan(unittest.TestCase):
         fun = theano.function([inp], [broadcasted_inp, gr])
 
         # Execute the Theano function and compare outputs to the expected outputs
-        inputs = numpy.array([[1, 2], [3, 4]])
+        inputs = numpy.array([[1, 2], [3, 4]], dtype=theano.config.floatX)
         expected_out1 = numpy.repeat(inputs[None], n_steps, axis=0)
         expected_out2 = numpy.ones(inputs.shape, dtype="int8") * n_steps
 

theano/tensor/tests/test_subtensor.py

@@ -1135,7 +1135,10 @@ class T_subtensor(unittest.TestCase, utt.TestOptimizationMixin):
                 m2_ref = m_val.copy()
 
                 m1_val, m2_val = f(m_val, i_val)
-                for idx in i_val:
+                # We have to explicitly loop over all individual indices,
+                # not as a list or array, numpy only increments the indexed
+                # elements once even if the indices are repeated.
+                for idx in i_val.ravel():
                     m1_ref[:, idx] = 0
                     m2_ref[:, idx] += 1