From a31cf3d334aaa062536a893524ddad0e580933ca Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Wed, 26 Apr 2023 11:46:53 +0200 Subject: [PATCH] Fix SRAM import hierarchy for new coriolis namespace. --- cumulus/src/plugins/sram/sram.py | 14 +++++++------- cumulus/src/plugins/sram/sram_256x32.py | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cumulus/src/plugins/sram/sram.py b/cumulus/src/plugins/sram/sram.py index ac270768..87137b1c 100644 --- a/cumulus/src/plugins/sram/sram.py +++ b/cumulus/src/plugins/sram/sram.py @@ -21,13 +21,13 @@ The ``sram`` module provide base classes for SRAM assemby. import sys import re import traceback -from ..helpers.io import ErrorMessage, WarningMessage -from ..helpers.overlay import UpdateSession -from ..helpers import trace, l, u, n -from ..Hurricane import DataBase, Breakpoint, DbU, Box, Net, Cell, \ - Instance, Transformation, PythonAttributes -from .. import CRL -from .chip.configuration import GaugeConf +from ...helpers.io import ErrorMessage, WarningMessage +from ...helpers.overlay import UpdateSession +from ...helpers import trace, l, u, n +from ...Hurricane import DataBase, Breakpoint, DbU, Box, Net, Cell, \ + Instance, Transformation, PythonAttributes +from ... import CRL +from ..block.configuration import GaugeConf af = CRL.AllianceFramework.get() diff --git a/cumulus/src/plugins/sram/sram_256x32.py b/cumulus/src/plugins/sram/sram_256x32.py index d1288f77..2e10b9ed 100644 --- a/cumulus/src/plugins/sram/sram_256x32.py +++ b/cumulus/src/plugins/sram/sram_256x32.py @@ -176,15 +176,15 @@ Conclusion for the nand2+nor2 implementation: import sys import re import traceback -from ...helpers.io import ErrorMessage, WarningMessage -from ...helpers.overlay import UpdateSession -from ...helpers import trace, l, u, n -from ...Hurricane import Breakpoint, DbU, Box, Net, Cell, Instance, \ - Transformation, PythonAttributes -from ... import CRL -from ..chip.configuration import GaugeConf -from .sram import Bus, Column, ColBlock, ColGroup, \ - HeaderRow, BaseSRAM +from ...helpers.io import ErrorMessage, WarningMessage +from ...helpers.overlay import UpdateSession +from ...helpers import trace, l, u, n +from ...Hurricane import Breakpoint, DbU, Box, Net, Cell, Instance, \ + Transformation, PythonAttributes +from ... import CRL +from ..block.configuration import GaugeConf +from .sram import Bus, Column, ColBlock, ColGroup, \ + HeaderRow, BaseSRAM """