From eaa915895ce73fddf6c16fef7342e0a5a2656d7b Mon Sep 17 00:00:00 2001 From: Ebrahim Songhori Date: Wed, 28 Aug 2024 19:36:21 -0700 Subject: [PATCH] update the plc API. PiperOrigin-RevId: 668716826 Change-Id: Iee37ca67ec68cd652c85ceef0f512a51b7d6bd1b --- circuit_training/dreamplace/plc_converter.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/circuit_training/dreamplace/plc_converter.py b/circuit_training/dreamplace/plc_converter.py index a671c1e..7f2ac81 100644 --- a/circuit_training/dreamplace/plc_converter.py +++ b/circuit_training/dreamplace/plc_converter.py @@ -592,7 +592,7 @@ def initialize_placedb_region_attributes(self, db, plc): # A region is an array of BB. region_to_id = {} next_region_id = 0 - movable_node_indices = self._physical_node_indices[:-db.num_terminals] + movable_node_indices = self._physical_node_indices[: -db.num_terminals] # Ignores macro region constraints for now. db.node2fence_region_map = np.full( len(movable_node_indices), @@ -604,13 +604,13 @@ def initialize_placedb_region_attributes(self, db, plc): w, h = math.floor(w), math.floor(h) for n in movable_node_indices: areas = plc.get_area_constraint(n) + for area in areas: + assert len(area) == 4 if not areas: # No area constraints. Set region as the entire canvas. - areas = (0, 0, w, h) - # Areas is a flatten list of BBs. - # Different orders of same BBs will be treated as different regions. - assert len(areas) % 4 == 0 - region = tuple(areas) + areas = [[0, 0, w, h]] + + region = tuple(sorted([tuple(area) for area in areas])) if region not in region_to_id.keys(): region_to_id[region] = next_region_id next_region_id += 1 @@ -624,7 +624,7 @@ def initialize_placedb_region_attributes(self, db, plc): for region, rid in region_to_id.items(): db_regions[rid] = region for i, region in enumerate(db_regions): - db_regions[i] = np.array(region).reshape(-1, 4) + db_regions[i] = np.array(region) # Finish region initialization. db.regions = db_regions @@ -641,4 +641,3 @@ def initialize_placedb_region_attributes(self, db, plc): db.flat_region_boxes = np.array([], dtype=db.dtype) db.flat_region_boxes_start = np.array([0], dtype=np.int32) db.node2fence_region_map = np.array([], dtype=np.int32) -