From 21eedbcc2b5efe7d12be796fd232d7097c03d972 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 28 May 2023 15:31:47 +0200 Subject: [PATCH] Change in strategy for guessing Alliance top cells directory. * In cumulus.designflow.technos.setupCMOS(): export back the guessed ALLIANCE_TOP *before* importing technos.symbolic.cmos so it is used for the CELLS_TOP. This avoid defaulting to /soc/alliance which does exists only on LIP6 computers... --- cumulus/src/designflow/technos.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cumulus/src/designflow/technos.py b/cumulus/src/designflow/technos.py index 0d69724a..814fc605 100644 --- a/cumulus/src/designflow/technos.py +++ b/cumulus/src/designflow/technos.py @@ -42,15 +42,16 @@ class Where ( object ): return ''.format( Where.coriolisTop.as_posix() ) -def setupCMOS (): +def setupCMOS ( checkToolkit=None ): + Where( checkToolkit ) + ShellEnv().export() + from .. import Cfg from .. import Viewer from .. import CRL from ..helpers import overlay, l, u, n from .yosys import Yosys import coriolis.technos.symbolic.cmos - - Where() with overlay.CfgCache(priority=Cfg.Parameter.Priority.UserFile) as cfg: cfg.misc.catchCore = False