Merge pull request #3486 from nouiz/tests

theano/compile/debugmode.py

@@ -2403,13 +2403,15 @@ class _Maker(FunctionMaker):  # inheritance buys a few helper functions
 
     """
 
-    def __init__(self, inputs, outputs, optimizer, mode,
+    def __init__(self, inputs, outputs, mode,
                  accept_inplace=False,
                  function_builder=Function,
                  profile=None,
                  on_unused_input=None,
+                 fgraph=None,  # If present the optimized graph. we ignore it.
                  output_keys=None):
         self.profile = profile
+        optimizer = mode.optimizer
         # Handle the case where inputs and/or outputs is a single
         # Variable (not in a list)
         unpack_single = False
@@ -2523,6 +2525,7 @@ class _Maker(FunctionMaker):  # inheritance buys a few helper functions
         self.accept_inplace = accept_inplace
         self.function_builder = function_builder
         self.mode = mode
+        self.on_unused_input = on_unused_input  # Used for the pickling/copy
         self.output_keys = output_keys
 
     def create(self, defaults=None, trustme=False, storage_map=None):
@@ -2744,7 +2747,7 @@ class DebugMode(Mode):
 
         """
         assert m is self
-        return _Maker(i, o, self.optimizer, self, *args, **kwargs)
+        return _Maker(i, o, self, *args, **kwargs)
 
     def __init__(self,
                  optimizer='fast_run',

theano/compile/function_module.py

@@ -711,7 +711,10 @@ class Function(object):
                                 mode=maker.mode, profile=profile,
                                 on_unused_input=maker.on_unused_input,
                                 function_builder=maker.function_builder,
-                                accept_inplace=maker.accept_inplace
+                                # As this is an optimized graph, it
+                                # can contain inplace. DebugMode check
+                                # that.
+                                accept_inplace=True,
                                 ).create(input_storage,
                                          storage_map=new_storage_map)
 
@@ -1497,7 +1500,7 @@ class FunctionMaker(object):
         self.mode = mode
         self.accept_inplace = accept_inplace
         self.function_builder = function_builder
-        self.on_unused_input = on_unused_input  # Used only for the pickling
+        self.on_unused_input = on_unused_input  # Used for the pickling/copy
         self.output_keys = output_keys
 
         self.required = [(i.value is None) for i in self.inputs]

theano/d3viz/tests/test_formatting.py

@@ -29,9 +29,16 @@ class TestPyDotFormatter(unittest.TestCase):
         f = th.function(m.inputs, m.outputs)
         pdf = PyDotFormatter()
         graph = pdf(f)
-        self.assertEqual(len(graph.get_nodes()), 11)
+        expected = 11
+        if th.config.mode == "FAST_COMPILE":
+            expected = 12
+        self.assertEqual(len(graph.get_nodes()), 12)
         nc = self.node_counts(graph)
-        assert nc['apply'] == 5
+
+        if th.config.mode == "FAST_COMPILE":
+            assert nc['apply'] == 6
+        else:
+            assert nc['apply'] == 5
         assert nc['output'] == 1
 
     def test_ofg(self):
@@ -43,7 +50,10 @@ class TestPyDotFormatter(unittest.TestCase):
         sub_graphs = graph.get_subgraph_list()
         assert len(sub_graphs) == 2
         ofg1, ofg2 = sub_graphs
-        assert len(ofg1.get_nodes()) == 5
+        if th.config.mode == "FAST_COMPILE":
+            assert len(ofg1.get_nodes()) == 9
+        else:
+            assert len(ofg1.get_nodes()) == 5
         assert len(ofg1.get_nodes()) == len(ofg2.get_nodes())
 
     def test_ofg_nested(self):

theano/misc/ordered_set.py

@@ -15,8 +15,13 @@ def check_deterministic(iterable):
     # So I must use an assert here. In the long term we should fix the rest of
     # theano to use exceptions correctly, so that this can be a TypeError.
     if iterable is not None:
-        assert isinstance(iterable, (
-            list, tuple, OrderedSet, types.GeneratorType, string_types))
+        if not isinstance(iterable, (
+                list, tuple, OrderedSet,
+                types.GeneratorType, string_types)):
+            if len(iterable) > 1:
+                # We need to accept length 1 size to allow unpickle in tests.
+                raise AssertionError(
+                    "Get an not ordered iterable when one was expected")
 
 # Copyright (C) 2009 Raymond Hettinger
 # Permission is hereby granted, free of charge, to any person obtaining a

theano/misc/pycuda_example.py

@@ -287,8 +287,8 @@ class PycudaElemwiseSourceModuleMakeThunkOp(Op):
 
     # As we have a dict in props, we need to implement __hash__
     def __hash__(self):
-        return hash(type(self), hash(self.scalar_op),
-                    hash_from_dict(self.inplace_pattern))
+        return hash((type(self), hash(self.scalar_op),
+                    hash_from_dict(self.inplace_pattern)))
 
     def __str__(self):
         if self.name is None: