Enhancement, remove unnecessary ci/pi from default paths that use the…

… same IP
Xilinx · Feb 7, 2022 · 0bcd474 · 0bcd474
1 parent 7a2e38c
commit 0bcd474
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pynq_composable/composable.py b/pynq_composable/composable.py
@@ -273,14 +273,16 @@ def _default_paths(self):
                     if kk in c_dict.keys():
                         c_dict.pop(kk)
                     v['fullpath'] = kk
-                    c_dict[k] = vv
+                    c_dict[k] = vv.copy()
                     c_dict[k]['default'] = True
                     c_dict[k]['fullpath'] = kk
                     if kk not in self._default_ip.keys():
                         self._default_ip[kk] = c_dict[k].copy()
                     if 'cpath' not in self._default_ip[kk].keys():
                         self._default_ip[kk]['cpath'] = dict()
-                    key = 'pi' if pi is not None else 'ci'
+                    key, delkey = ('pi', 'ci') if pi else ('ci', 'pi')
+                    if c_dict[k].get(delkey):
+                        c_dict[k].pop(delkey)
                     self._default_ip[kk]['cpath'][key] = k
                     break