Merge pull request #6323 from nouiz/tests

theano/compile/debugmode.py

@@ -10,7 +10,6 @@ import copy
 import sys
 import gc
 import logging
-import six.moves.copyreg as copyreg
 from itertools import chain, product as itertools_product
 from theano.compat import izip
 
@@ -2414,10 +2413,6 @@ class _Maker(FunctionMaker):  # inheritance buys a few helper functions
         return fn
 
 
-def _pickle_DebugMode_Maker(maker):
-    raise NotImplementedError('DebugMode is not picklable (yet)')
-copyreg.pickle(_Maker, _pickle_DebugMode_Maker)
-
 ########################
 #
 # API symbol: DebugMode

theano/compile/mode.py

@@ -317,7 +317,7 @@ class Mode(object):
                                               self.provided_optimizer)
         # N.B. opt might be a Query instance, not sure what else it might be...
         #     string? Optimizer? OptDB? who knows???
-        return self.clone(optimizer=opt.including(*tags))
+        return self.clone(optimizer=opt.including(*tags), linker=link)
 
     def register(self, *optimizations):
         """Adds new optimization instances to a mode.
@@ -347,12 +347,12 @@ class Mode(object):
     def excluding(self, *tags):
         link, opt = self.get_linker_optimizer(self.provided_linker,
                                               self.provided_optimizer)
-        return self.clone(optimizer=opt.excluding(*tags))
+        return self.clone(optimizer=opt.excluding(*tags), linker=link)
 
     def requiring(self, *tags):
         link, opt = self.get_linker_optimizer(self.provided_linker,
                                               self.provided_optimizer)
-        return self.clone(optimizer=opt.requiring(*tags))
+        return self.clone(optimizer=opt.requiring(*tags), linker=link)
 
     def clone(self, link_kwargs=None, optimizer="", **kwargs):
         """

theano/compile/tests/test_function_module.py

@@ -654,9 +654,13 @@ class T_picklefunction(unittest.TestCase):
     def test_output_keys(self):
         x = T.vector()
         f = theano.function([x], {'vec': x**2})
-        assert isinstance(f([2, 3, 4]), dict)
+        o = f([2, 3, 4])
+        assert isinstance(o, dict)
+        assert np.allclose(o['vec'], [4, 9, 16])
         g = copy.deepcopy(f)
-        assert isinstance(g([2, 3, 4]), dict)
+        o = g([2, 3, 4])
+        assert isinstance(o, dict)
+        assert np.allclose(o['vec'], [4, 9, 16])
 
     def test_deepcopy_shared_container(self):
         # Ensure that shared containers remain shared after a deep copy.

theano/configdefaults.py

@@ -466,12 +466,24 @@ AddConfigVar(
 # scalable.
 # Also, please be careful not to modify the first item in the enum when adding
 # new modes, since it is the default mode.
+def filter_mode(val):
+    if val in ['Mode', 'DebugMode', 'FAST_RUN',
+               'NanGuardMode',
+               'FAST_COMPILE', 'DEBUG_MODE']:
+        return val
+    # This can be executed before Theano is completly imported, so
+    # theano.Mode is not always available.
+    elif hasattr(theano, 'Mode') and isinstance(val, theano.Mode):
+        return val
+    else:
+        raise ValueError("Expected one of those string 'Mode', 'DebugMode',"
+                         " 'FAST_RUN', 'NanGuardMode', 'FAST_COMPILE',"
+                         " 'DEBUG_MODE' or an instance of Mode.")
+
 AddConfigVar(
     'mode',
     "Default compilation mode",
-    EnumStr('Mode', 'DebugMode', 'FAST_RUN',
-            'NanGuardMode',
-            'FAST_COMPILE', 'DEBUG_MODE'),
+    ConfigParam('Mode', filter_mode),
     in_c_key=False)
 
 param = "g++"

theano/gpuarray/elemwise.py

@@ -165,10 +165,13 @@ class GpuElemwise(HideC, Elemwise):
         scal_v_out = fake_node.outputs
         assert len(scal_v_out) == len(node.outputs)
 
-        kop = fake_node.op.c_code(fake_node, 'elem_scalar',
-                                  inps, outs,
-                                  dict(fail='return;'))
-
+        try:
+            kop = fake_node.op.c_code(fake_node, 'elem_scalar',
+                                      inps, outs,
+                                      dict(fail='return;'))
+        except MethodNotDefined:
+            raise AssertionError(
+                "No c code for this scalar. Can not make a GpuElemwise")
         # If the following assert fail, then we need to update the
         # code handler above.
         assert 'npy_float16' not in kop

theano/gpuarray/opt.py

@@ -748,6 +748,8 @@ def local_gpua_elemwise(op, context_name, inputs, outputs):
                 scal_op)
         if not have_cuda:
             return None
+    if not scal_op.supports_c_code(inputs, outputs):
+        return
     res = GpuElemwise(scal_op, name=name,
                       inplace_pattern=copy.copy(op.inplace_pattern),
                       nfunc_spec=op.nfunc_spec)

theano/gpuarray/tests/test_opt.py

 from __future__ import absolute_import, print_function, division
-import numpy as np
 from nose.tools import assert_raises
+import numpy as np
 
 import theano
 from theano import tensor
@@ -745,7 +745,11 @@ class Conv_opt_test(unittest.TestCase):
         mode = mode_with_gpu.including('conv_meta')
 
         ref_func = theano.function([], conv_op, mode=mode_with_gpu)
-        conv_func = theano.function([], conv_op, mode=mode)
+        # All meta optimizer compile a new function. This need to know
+        # the current linker, but this information is not available,
+        # so it use the default mode.
+        with theano.change_flags(mode=mode):
+            conv_func = theano.function([], conv_op, mode=mode)
         assert any([isinstance(node.op, op)
                     for node in conv_func.maker.fgraph.toposort()])
         utt.assert_allclose(conv_func(), ref_func())
@@ -787,13 +791,20 @@ class Conv_opt_test(unittest.TestCase):
         mode = mode_with_gpu.including('conv_meta')
 
         ref_func = theano.function([], conv_op, mode=mode_with_gpu)
-        conv_func = theano.function([], conv_op, mode=mode)
+        # All meta optimizer compile a new function. This need to know
+        # the current linker, but this information is not available,
+        # so it use the default mode.
+        with theano.change_flags(mode=mode):
+            conv_func = theano.function([], conv_op, mode=mode)
         if op is not None:
             assert any([isinstance(node.op, op)
                        for node in conv_func.maker.fgraph.toposort()])
         utt.assert_allclose(conv_func(), ref_func())
 
-    def test_optimizers(self):
+    def test_optimizers_2d(self):
+        if theano.config.cxx == "":
+            raise SkipTest("Need a c compiler.")
+
         imshp2d = [(2, 3, 5, 5), (2, 2, 5, 7), (2, 1, 3, 3)]
         kshp2d = [(4, 3, 3, 3), (3, 2, 3, 5), (4, 1, 1, 1)]
         tshp2d = [(2, 4, 3, 3), (2, 3, 3, 3), (2, 4, 3, 3)]
@@ -827,6 +838,10 @@ class Conv_opt_test(unittest.TestCase):
                               'conv_gemm:default',
                               dnn.GpuDnnConv)
 
+    def test_optimizers_3d(self):
+        if theano.config.cxx == "":
+            raise SkipTest("Need a c compiler.")
+
         imshp3d = [(2, 3, 5, 5, 5), (2, 2, 5, 7, 5), (2, 1, 3, 3, 3)]
         kshp3d = [(4, 3, 3, 3, 3), (3, 2, 3, 5, 3), (4, 1, 1, 1, 1)]
         tshp3d = [(2, 4, 3, 3, 3), (2, 3, 3, 3, 3), (2, 4, 3, 3, 3)]
@@ -865,6 +880,9 @@ class Conv_opt_test(unittest.TestCase):
                               'conv_gemm:default',
                               dnn.GpuDnnConv)
 
+    def test_optimizers_non_default(self):
+        if theano.config.cxx == "":
+            raise SkipTest("Need a c compiler.")
         # conv2d forward pass with Non-default border_mode and filter_dilation
         imshp2d = [(2, 3, 5, 5), (4, 2, 5, 5)]
         kshp2d = [(4, 3, 3, 3), (3, 2, 3, 3)]

theano/scalar/basic_scipy.py

@@ -52,7 +52,8 @@ class Erf(UnaryScalarOp):
         z, = out
         if node.inputs[0].type in complex_types:
             raise NotImplementedError('type not supported', type)
-        return "%(z)s = erf(%(x)s);" % locals()
+        cast = node.outputs[0].type.dtype_specs()[1]
+        return "%(z)s = erf((%(cast)s)%(x)s);" % locals()
 erf = Erf(upgrade_to_float, name='erf')
 
 
@@ -83,7 +84,8 @@ class Erfc(UnaryScalarOp):
         z, = out
         if node.inputs[0].type in complex_types:
             raise NotImplementedError('type not supported', type)
-        return "%(z)s = erfc(%(x)s);" % locals()
+        cast = node.outputs[0].type.dtype_specs()[1]
+        return "%(z)s = erfc((%(cast)s)%(x)s);" % locals()
 
 # scipy.special.erfc don't support complex. Why?
 erfc = Erfc(upgrade_to_float_no_complex, name='erfc')
@@ -275,11 +277,8 @@ class GammaLn(UnaryScalarOp):
         # For some reason, on the GPU, uint64 inputs don't get casted
         # automatically to float64. This make the compilation crash
         dtype = ""
-        if node.outputs[0].dtype == 'float64':
-            dtype = "(double)"
-        elif node.outputs[0].dtype == 'float32':
-            dtype = "(float)"
-        return """%(z)s = lgamma(%(dtype)s%(x)s);""" % locals()
+        cast = node.outputs[0].type.dtype_specs()[1]
+        return """%(z)s = lgamma((%(cast)s)%(x)s);""" % locals()
 gammaln = GammaLn(upgrade_to_float, name='gammaln')
 
 

theano/tensor/nnet/tests/test_ctc.py

 from __future__ import (division, absolute_import, print_function)
 
 import unittest
+from nose.plugins.skip import SkipTest
 import numpy as np
 
 import theano
@@ -84,6 +85,9 @@ class TestCTC(unittest.TestCase):
     """
 
     def setUp(self):
+        if theano.config.mode == "FAST_COMPILE" or theano.config.cxx == "":
+            raise SkipTest("We need a c compiler")
+
         if not ctc_available():
             self.skipTest('Optional library warp-ctc not available')
 

theano/tensor/tests/test_basic.py

@@ -1242,7 +1242,8 @@ CeilTester = makeBroadcastTester(
 CeilInplaceTester = makeBroadcastTester(
     op=inplace.ceil_inplace,
     expected=upcast_float16_ufunc(np.ceil),
-    good=_good_broadcast_unary_normal_no_complex,
+    good=copymod(_good_broadcast_unary_normal_no_complex,
+                 without=['integers', 'int8', 'uint8', 'uint16']),
     # corner cases includes a lot of integers: points where Ceil is not
     # continuous (not differentiable)
     inplace=True)
@@ -1256,7 +1257,8 @@ FloorTester = makeBroadcastTester(
 FloorInplaceTester = makeBroadcastTester(
     op=inplace.floor_inplace,
     expected=upcast_float16_ufunc(np.floor),
-    good=_good_broadcast_unary_normal_no_complex,
+    good=copymod(_good_broadcast_unary_normal_no_complex,
+                 without=["integers", "int8", "uint8", "uint16"]),
     inplace=True)
 
 TruncInplaceTester = makeBroadcastTester(
@@ -1603,7 +1605,8 @@ Arctan2InplaceTester = makeBroadcastTester(
     op=inplace.arctan2_inplace,
     expected=np.arctan2,
     good=copymod(_good_broadcast_binary_arctan2,
-                 without=['integers', 'int8', 'uint8', 'uint16']),
+                 without=['integers', 'int8', 'uint8',
+                          'uint16', 'dtype_mixup_2']),
     inplace=True)
 
 CoshTester = makeBroadcastTester(