From 3ff7cca3c89c5bea1714c610078d8172324fc6e6 Mon Sep 17 00:00:00 2001 From: Peter Gadfort Date: Thu, 19 Sep 2024 17:00:56 -0400 Subject: [PATCH] fix --- scgallery/gallery.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/scgallery/gallery.py b/scgallery/gallery.py index 45f439f..44b0479 100755 --- a/scgallery/gallery.py +++ b/scgallery/gallery.py @@ -17,15 +17,9 @@ from siliconcompiler.tools._common.asic import get_mainlib from siliconcompiler.flowgraph import nodes_to_execute -<<<<<<< HEAD from scgallery.targets.freepdk45 import ( nangate45 as freepdk45_nangate45 ) -======= -from scgallery.targets import \ - ihp130_demo - ->>>>>>> 35430b3 (add ihp130 enablement) from scgallery.targets.asap7 import ( asap7sc7p5t_rvt as asap7_asap7sc7p5t_rvt, asap7sc7p5t_lvt as asap7_asap7sc7p5t_lvt, @@ -38,6 +32,9 @@ gf180mcu_fd_sc_mcu7t5v0 as gf180_gf180mcu_fd_sc_mcu7t5v0, gf180mcu_fd_sc_mcu9t5v0 as gf180_gf180mcu_fd_sc_mcu9t5v0 ) +from scgallery.targets.ihp130 import ( + sg13g2_stdcell as ihp130_sg13g2_stdcell +) from scgallery.targets import linting as gallery_lint from siliconcompiler.flows import lintflow @@ -62,14 +59,10 @@ def __init__(self, name=None, path=None): ("asap7_asap7sc7p5t_rvt", asap7_asap7sc7p5t_rvt), ("asap7_asap7sc7p5t_lvt", asap7_asap7sc7p5t_lvt), ("asap7_asap7sc7p5t_slvt", asap7_asap7sc7p5t_slvt), -<<<<<<< HEAD ("gf180_gf180mcu_fd_sc_mcu9t5v0", gf180_gf180mcu_fd_sc_mcu9t5v0), ("gf180_gf180mcu_fd_sc_mcu7t5v0", gf180_gf180mcu_fd_sc_mcu7t5v0), + ("ihp130_sg13g2_stdcell", ihp130_sg13g2_stdcell), ("None", None)): -======= - ("gf180_gf180mcu_fd_sc_mcu7t5v0", gf180_gf180mcu_fd_sc_mcu7t5v0), - ("ihp130_demo", ihp130_demo)): ->>>>>>> 35430b3 (add ihp130 enablement) self.add_target(name, target) self.__designs = {}