Remove OrderedDict in graph/destroyhandler

Author: Armavica

pytensor/graph/destroyhandler.py

@@ -5,7 +5,7 @@
 """
 
 import itertools
-from collections import OrderedDict, deque
+from collections import deque
 
 import pytensor
 from pytensor.configdefaults import config
@@ -306,7 +306,7 @@ def __init__(self, do_imports_on_attach=True, algo=None):
         TODO: change name to var_to_vroot.
 
         """
-        self.droot = OrderedDict()
+        self.droot = {}
 
         """
         Maps a variable to all variables that are indirect or direct views of it
@@ -317,19 +317,19 @@ def __init__(self, do_imports_on_attach=True, algo=None):
         TODO: rename to x_to_views after reverse engineering what x is
 
         """
-        self.impact = OrderedDict()
+        self.impact = {}
 
         """
         If a var is destroyed, then this dict will map
         droot[var] to the apply node that destroyed var
         TODO: rename to vroot_to_destroyer
 
         """
-        self.root_destroyer = OrderedDict()
+        self.root_destroyer = {}
         if algo is None:
             algo = config.cycle_detection
         self.algo = algo
-        self.fail_validate = OrderedDict()
+        self.fail_validate = {}
 
     def clone(self):
         return type(self)(self.do_imports_on_attach, self.algo)
@@ -370,7 +370,7 @@ def on_attach(self, fgraph):
         self.view_i = {}  # variable -> variable used in calculation
         self.view_o = {}  # variable -> set of variables that use this one as a direct input
         # clients: how many times does an apply use a given variable
-        self.clients = OrderedDict()  # variable -> apply -> ninputs
+        self.clients = {}  # variable -> apply -> ninputs
         self.stale_droot = True
 
         self.debug_all_apps = set()
@@ -527,11 +527,11 @@ def on_import(self, fgraph, app, reason):
 
         # update self.clients
         for i, input in enumerate(app.inputs):
-            self.clients.setdefault(input, OrderedDict()).setdefault(app, 0)
+            self.clients.setdefault(input, {}).setdefault(app, 0)
             self.clients[input][app] += 1
 
         for i, output in enumerate(app.outputs):
-            self.clients.setdefault(output, OrderedDict())
+            self.clients.setdefault(output, {})
 
         self.stale_droot = True
 
@@ -591,7 +591,7 @@ def on_change_input(self, fgraph, app, i, old_r, new_r, reason):
             if self.clients[old_r][app] == 0:
                 del self.clients[old_r][app]
 
-            self.clients.setdefault(new_r, OrderedDict()).setdefault(app, 0)
+            self.clients.setdefault(new_r, {}).setdefault(app, 0)
             self.clients[new_r][app] += 1
 
             # UPDATE self.view_i, self.view_o
@@ -632,7 +632,7 @@ def validate(self, fgraph):
             if self.algo == "fast":
                 if self.fail_validate:
                     app_err_pairs = self.fail_validate
-                    self.fail_validate = OrderedDict()
+                    self.fail_validate = {}
                     # self.fail_validate can only be a hint that maybe/probably
                     # there is a cycle.This is because inside replace() we could
                     # record many reasons to not accept a change, but we don't
@@ -674,12 +674,8 @@ def orderings(self, fgraph, ordered=True):
         c) an Apply destroys (illegally) one of its own inputs by aliasing
 
         """
-        if ordered:
-            set_type = OrderedSet
-            rval = OrderedDict()
-        else:
-            set_type = set
-            rval = dict()
+        set_type = OrderedSet if ordered else set
+        rval = {}
 
         if self.destroyers:
             # BUILD DATA STRUCTURES