Skip to content

Commit 753a5aa

Browse files
chore:parse_csv: Remove local imports
Signed-off-by: Jonas K. <[email protected]>
1 parent 26c08d0 commit 753a5aa

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

FABulous/fabric_generator/parser/parse_csv.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
from FABulous.fabric_definition.Gen_IO import Gen_IO
1818
from FABulous.fabric_definition.SuperTile import SuperTile
1919
from FABulous.fabric_definition.Tile import Tile
20-
from FABulous.fabric_generator.gen_fabric.fabric_automation import addBelsToPrim
20+
from FABulous.fabric_generator.gen_fabric.fabric_automation import (
21+
addBelsToPrim,
22+
generateCustomTileConfig,
23+
generateSwitchmatrixList,
24+
)
2125
from FABulous.fabric_generator.parser.parse_hdl import parseBelFile
2226
from FABulous.fabric_generator.parser.parse_switchmatrix import (
2327
parseList,
@@ -225,11 +229,6 @@ def parseTilesCSV(fileName: Path) -> tuple[list[Tile], list[tuple[str, str]]]:
225229
configBit = 0
226230

227231
if "GENERATE" in temp:
228-
# import here to avoid circular import
229-
from FABulous.fabric_generator.gen_fabric.fabric_automation import (
230-
generateSwitchmatrixList,
231-
)
232-
233232
logger.info(f"Generating switch matrix list for tile {tileName}")
234233
genMatrixList = True
235234
if len(temp) <= 2:
@@ -530,13 +529,8 @@ def parseFabricCSV(fileName: str) -> Fabric:
530529
continue
531530
if i[0].startswith("Tile"):
532531
if "GENERATE" in i:
533-
# import here to avoid circular import
534-
from FABulous.fabric_generator.gen_fabric.fabric_automation import (
535-
generate_custom_tile_config,
536-
)
537-
538532
# we generate the tile right before we parse everything
539-
i[1] = str(generate_custom_tile_config(filePath.joinpath(i[1])))
533+
i[1] = str(generateCustomTileConfig(filePath.joinpath(i[1])))
540534

541535
new_tiles, new_commonWirePair = parseTilesCSV(filePath.joinpath(i[1]))
542536
tileTypes += [new_tile.name for new_tile in new_tiles]

0 commit comments

Comments
 (0)