Fix tests. All in FAST_COMPILE except the pycuda one

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: