whitelist all generators

theano/gof/destroyhandler.py

@@ -960,7 +960,7 @@ class DestroyHandler(toolbox.Bookkeeper):
                     tolerate_same = getattr(app.op, 'destroyhandler_tolerate_same', [])
                     assert isinstance(tolerate_same, list)
                     tolerated = OrderedSet((idx1 for idx0, idx1 in tolerate_same
-                            if idx0 == destroyed_idx), known_deterministic=True)
+                            if idx0 == destroyed_idx))
                     tolerated.add(destroyed_idx)
                     tolerate_aliased = getattr(app.op, 'destroyhandler_tolerate_aliased', [])
                     ignored = OrderedSet(idx1 for idx0, idx1 in tolerate_aliased

theano/misc/ordered_set.py

@@ -7,11 +7,9 @@ except ImportError:
 from theano.gof.python25 import OrderedDict
 import types
 
-def check_deterministic(iterable, known_deterministic):
-    if not isinstance(iterable, (list, tuple, OrderedSet)):
-        if not isinstance(iterable, types.GeneratorType) and \
-                known_deterministic:
-            raise TypeError((type(iterable), known_deterministic))
+def check_deterministic(iterable):
+    if not isinstance(iterable, (list, tuple, OrderedSet, types.GeneratorType)):
+        raise TypeError(type(iterable))
 
 if MutableSet is not None:
     # From http://code.activestate.com/recipes/576694/
@@ -41,18 +39,13 @@ if MutableSet is not None:
 
         # Added by IG-- pre-existing theano code expected sets
         #   to have this method
-        def update(self, iterable, known_deterministic=False):
-            check_deterministic(iterable, known_deterministic)
+        def update(self, iterable):
+            check_deterministic(iterable)
             self |= iterable
 
-        def __init__(self, iterable=None, known_deterministic=False):
-            """
-            known_deterministic: if iterable is a generator expression,
-                                the caller must certify that it is from
-                                a deterministic class, like list or OrderedSet
-            """
+        def __init__(self, iterable=None):
             # Checks added by IG
-            check_deterministic(iterable, known_deterministic)
+            check_deterministic(iterable)
             self.end = end = []
             end += [None, end, end]         # sentinel node for doubly linked list
             self.map = {}                   # key --> [key, prev, next]
@@ -120,13 +113,13 @@ else:
         An implementation of OrderedSet based on the keys of
         an OrderedDict.
         """
-        def __init__(self, iterable=None, known_deterministic=False):
+        def __init__(self, iterable=None):
             self.data = OrderedDict()
             if iterable is not None:
-                self.update(iterable, known_deterministic)
+                self.update(iterable)
 
-        def update(self, container, known_deterministic=False):
-            check_deterministic(container, known_deterministic)
+        def update(self, container):
+            check_deterministic(container)
             for elem in container:
                 self.add(elem)