Merge pull request #5300 from nouiz/cxx

theano/compile/tests/test_mode.py

 from __future__ import absolute_import, print_function, division
+
+from nose.plugins.skip import SkipTest
+
 import theano
 from theano.compile.mode import Mode, AddFeatureOptimizer
 from theano.gof.toolbox import NoOutputFromInplace
@@ -18,6 +21,8 @@ def test_no_output_from_implace():
     op = fct_no_opt.maker.fgraph.outputs[0].owner.op
     assert (hasattr(op, 'destroy_map') and 0 in op.destroy_map)
 
+    if not theano.config.cxx:
+        raise SkipTest("Need cxx for this test")
     # Ensure that the elemwise op that produces the output is not inplace when
     # using a mode that includes the optimization
     opt = AddFeatureOptimizer(NoOutputFromInplace())

theano/gof/tests/test_cc.py

@@ -390,6 +390,9 @@ def test_shared_input_output():
     # Test bug reported on the mailing list by Alberto Orlandi
     # https://groups.google.com/d/topic/theano-users/6dLaEqc2R6g/discussion
     # The shared variable is both an input and an output of the function.
+    if not theano.config.cxx:
+        raise SkipTest("Need cxx for this test")
+
     inc = theano.tensor.iscalar('inc')
     state = theano.shared(0)
     state.name = 'state'

theano/gof/tests/test_compute_test_value.py

@@ -331,7 +331,7 @@ class TestComputeTestValue(unittest.TestCase):
                 assert (str(e).startswith("shape mismatch") or
                         str(e).startswith("operands could not be broadcast "
                                           "together with shapes") or
-                        str(e).startswith("could not broadcast input"))
+                        str(e).startswith("could not broadcast input")), str(e)
 
         finally:
             theano.config.compute_test_value = orig_compute_test_value

theano/gof/tests/test_fg.py

@@ -3,6 +3,8 @@ import os
 import pickle
 import unittest
 
+from nose.plugins.skip import SkipTest
+
 import theano
 from theano.compat import PY3
 from theano.gof import CachedConstantError, FunctionGraph
@@ -32,6 +34,8 @@ class TFunctionGraph(unittest.TestCase):
         # In the past, we where removing some not used variable from
         # fgraph.variables event if the apply had other output used in
         # the graph. This caused a crash.
+        if not theano.config.cxx:
+            raise SkipTest("Need cxx for this test")
 
         # This test run the pickle that reproduce this case.
         with open(os.path.join(os.path.dirname(__file__),

theano/gof/tests/test_vm.py

@@ -209,6 +209,8 @@ def test_partial_function():
         utt.assert_allclose(f(5), np.array([32., 16., 1.7857142857142858]))
 
     check_partial_function(vm.VM_Linker(allow_partial_eval=True, use_cloop=False))
+    if not theano.config.cxx:
+        raise SkipTest("Need cxx for this test")
     check_partial_function('cvm')
 
 
@@ -223,6 +225,8 @@ def test_partial_function_with_output_keys():
         assert f(5, output_subset=['a'])['a'] == f(5)['a']
 
     check_partial_function_output_keys(vm.VM_Linker(allow_partial_eval=True, use_cloop=False))
+    if not theano.config.cxx:
+        raise SkipTest("Need cxx for this test")
     check_partial_function_output_keys('cvm')
 
 
@@ -243,6 +247,8 @@ def test_partial_function_with_updates():
         assert y.get_value() == 10
 
     check_updates(vm.VM_Linker(allow_partial_eval=True, use_cloop=False))
+    if not theano.config.cxx:
+        raise SkipTest("Need cxx for this test")
     check_updates('cvm')
 
 

theano/scalar/tests/test_basic_sympy.py

 from __future__ import absolute_import, print_function, division
+
+import theano
 from theano.scalar.basic_sympy import SymPyCCode
 from theano.scalar.basic import floats
-import theano
+
+from nose.plugins.skip import SkipTest
 
 try:
     import sympy
     xs = sympy.Symbol('x')
     ys = sympy.Symbol('y')
 except ImportError:
-    from nose.plugins.skip import SkipTest
     raise SkipTest('optional package sympy disabled')
 
 xt, yt = floats('xy')
 
 
 def test_SymPyCCode():
+    if not theano.config.cxx:
+        raise SkipTest("Need cxx for this test")
+
     op = SymPyCCode([xs, ys], xs + ys)
     e = op(xt, yt)
     g = theano.gof.FunctionGraph([xt, yt], [e])

theano/scan_module/scan_op.py

@@ -1436,6 +1436,11 @@ class Scan(PureOp):
                             outs[j][0][pos[j]] = \
                                 output_storage[offset_out + j].storage[0]
                         except ValueError as e:
+                            if i == 0:
+                                # First iteration, so don't change the
+                                # error message as it can't be the
+                                # case we write about.
+                                raise
                             ne = ValueError(
                                 "An output of the scan has changed shape. "
                                 "This may be caused by a pushout optimization."

theano/scan_module/scan_perform.pyx

@@ -62,7 +62,7 @@ import copy
 
 
 def get_version():
-    return 0.294
+    return 0.295
 
 @cython.boundscheck(False)
 def perform(
@@ -547,6 +547,8 @@ def perform(
                     try:
                         outs[j][0][pos[j]] = output_storage[j+offset_out].storage[0]
                     except ValueError as e:
+                        if i == 0:
+                            raise
                         raise ValueError(
                             "An output of the scan has changed shape. "
                             "This may be caused by a pushout optimization."

theano/scan_module/scan_perform_ext.py

+"""
+To update the scan Cython code in Theano you must
+- update the version in this file and scan_perform.py
+- call "cd theano/scan_module/; cython scan_perform.pyx; patch scan_perform.c numpy_api_changes.diff"
+
+"""
+
 from __future__ import absolute_import, print_function, division
 import errno
 import logging
@@ -17,7 +24,7 @@ from theano.gof import cmodule
 _logger = logging.getLogger('theano.scan_module.scan_perform')
 
 
-version = 0.294  # must match constant returned in function get_version()
+version = 0.295  # must match constant returned in function get_version()
 
 need_reload = False
 

theano/tensor/nnet/tests/test_abstract_conv.py

@@ -456,6 +456,9 @@ class TestAbstractConvNoOptim(BaseTestConv2d):
         o = self.get_output_shape(i, f, s, b, fd)
         mode = theano.Mode(optimizer=None)
 
+        if not theano.config.cxx:
+            raise SkipTest("Need cxx to test conv2d")
+
         self.run_fwd(inputs_shape=i, filters_shape=f, subsample=s,
                      verify_grad=True, provide_shape=provide_shape,
                      border_mode=b, filter_flip=flip,
@@ -490,6 +493,9 @@ class TestCpuConv2d(BaseTestConv2d):
     def tcase(self, i, f, s, b, flip, provide_shape, fd=(1, 1)):
         if fd != (1, 1):
             raise SkipTest("No dilation implementation for basic cpu ConvOp.")
+        if not theano.config.cxx:
+            raise SkipTest("Need cxx to test conv2d")
+
         mode = self.mode
         o = self.get_output_shape(i, f, s, b, fd)
         fwd_OK = True
@@ -679,6 +685,8 @@ class TestCpuConv3d(BaseTestConv3d):
     def tcase(self, i, f, s, b, flip, provide_shape, fd=(1, 1, 1)):
         if fd != (1, 1, 1):
             raise SkipTest("No dilation implementation for basic cpu Conv3D.")
+        if not theano.config.cxx:
+            raise SkipTest("Need cxx to test conv2d")
         mode = self.mode
         o = self.get_output_shape(i, f, s, b, fd)
         fwd_OK = True

theano/tensor/nnet/tests/test_corr.py

@@ -37,6 +37,8 @@ class TestCorr2D(utt.InferShapeTester):
         :param image_shape: The constant shape info passed to corrMM.
         :param filter_shape: The constant shape info passed to corrMM.
         """
+        if not theano.config.cxx:
+            raise SkipTest("Need cxx to test conv2d")
         N_image_shape = [T.get_scalar_constant_value(T.as_tensor_variable(x))
                          for x in image_shape]
         N_filter_shape = [T.get_scalar_constant_value(T.as_tensor_variable(x))
@@ -265,6 +267,8 @@ class TestCorr2D(utt.InferShapeTester):
         def rand(shape, dtype='float64'):
             r = numpy.asarray(numpy.random.rand(*shape), dtype=dtype)
             return r * 2 - 1
+        if not theano.config.cxx:
+            raise SkipTest("Need cxx to test conv2d")
 
         ops = [corr.CorrMM, corr.CorrMM_gradWeights, corr.CorrMM_gradInputs]
         a_shapes = [[4, 5, 6, 3], [1, 5, 6, 3], [1, 5, 6, 3]]
@@ -288,6 +292,8 @@ class TestCorr2D(utt.InferShapeTester):
     def test_infer_shape_forward(self):
         if theano.config.mode == "FAST_COMPILE":
             raise SkipTest("CorrMM don't work in FAST_COMPILE")
+        if not theano.config.cxx:
+            raise SkipTest("Need cxx for this test")
 
         def rand(*shape):
             r = numpy.asarray(numpy.random.rand(*shape), dtype='float64')
@@ -319,6 +325,8 @@ class TestCorr2D(utt.InferShapeTester):
     def test_infer_shape_gradW(self):
         if theano.config.mode == "FAST_COMPILE":
             raise SkipTest("CorrMM don't work in FAST_COMPILE")
+        if not theano.config.cxx:
+            raise SkipTest("Need cxx for this test")
 
         def rand(*shape):
             r = numpy.asarray(numpy.random.rand(*shape), dtype='float64')
@@ -357,6 +365,8 @@ class TestCorr2D(utt.InferShapeTester):
     def test_infer_shape_gradI(self):
         if theano.config.mode == "FAST_COMPILE":
             raise SkipTest("CorrMM don't work in FAST_COMPILE")
+        if not theano.config.cxx:
+            raise SkipTest("Need cxx for this test")
 
         def rand(*shape):
             r = numpy.asarray(numpy.random.rand(*shape), dtype='float64')

theano/tensor/nnet/tests/test_corr3d.py

@@ -37,6 +37,9 @@ class TestCorr3D(utt.InferShapeTester):
         :param image_shape: The constant shape info passed to corr3dMM.
         :param filter_shape: The constant shape info passed to corr3dMM.
         """
+        if not theano.config.cxx:
+            raise SkipTest("Need cxx for this test")
+
         N_image_shape = [T.get_scalar_constant_value(T.as_tensor_variable(x))
                          for x in image_shape]
         N_filter_shape = [T.get_scalar_constant_value(T.as_tensor_variable(x))
@@ -276,6 +279,9 @@ class TestCorr3D(utt.InferShapeTester):
         """
         Checks dtype upcast for Corr3dMM methods.
         """
+        if not theano.config.cxx:
+            raise SkipTest("Need cxx for this test")
+
         def rand(shape, dtype='float64'):
             r = numpy.asarray(numpy.random.rand(*shape), dtype=dtype)
             return r * 2 - 1
@@ -302,6 +308,8 @@ class TestCorr3D(utt.InferShapeTester):
     def test_infer_shape_forward(self):
         if theano.config.mode == "FAST_COMPILE":
             raise SkipTest("Corr3dMM don't work in FAST_COMPILE")
+        if not theano.config.cxx:
+            raise SkipTest("Need cxx for this test")
 
         def rand(*shape):
             r = numpy.asarray(numpy.random.rand(*shape), dtype='float64')
@@ -333,6 +341,8 @@ class TestCorr3D(utt.InferShapeTester):
     def test_infer_shape_gradW(self):
         if theano.config.mode == "FAST_COMPILE":
             raise SkipTest("Corr3dMM don't work in FAST_COMPILE")
+        if not theano.config.cxx:
+            raise SkipTest("Need cxx for this test")
 
         def rand(*shape):
             r = numpy.asarray(numpy.random.rand(*shape), dtype='float64')
@@ -372,6 +382,8 @@ class TestCorr3D(utt.InferShapeTester):
     def test_infer_shape_gradI(self):
         if theano.config.mode == "FAST_COMPILE":
             raise SkipTest("Corr3dMM don't work in FAST_COMPILE")
+        if not theano.config.cxx:
+            raise SkipTest("Need cxx for this test")
 
         def rand(*shape):
             r = numpy.asarray(numpy.random.rand(*shape), dtype='float64')