Upload 2 files

quread/eda_translator.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Dict, List, Any
+from typing import Dict, List, Any, Tuple
 
 import numpy as np
 
@@ -31,6 +31,7 @@ def build_eda_mapping(
     metrics: Dict[str, np.ndarray],
     *,
     cfg: EDATranslatorConfig | None = None,
+    qubit_coords: Dict[int, Tuple[int, int]] | None = None,
 ) -> List[Dict[str, Any]]:
     cfg = cfg or EDATranslatorConfig()
     required = [
@@ -59,6 +60,12 @@ def build_eda_mapping(
             float(cfg.max_guardband_mv) - float(cfg.base_guardband_mv)
         )
         route_priority = "HIGH" if tier == "CRITICAL" else ("MEDIUM" if tier == "WARNING" else "LOW")
+        layout_row = None
+        layout_col = None
+        if qubit_coords and q in qubit_coords:
+            rr, cc = qubit_coords[q]
+            layout_row = int(rr)
+            layout_col = int(cc)
 
         rows.append(
             {
@@ -72,6 +79,8 @@ def build_eda_mapping(
                 "timing_derate": float(timing_derate),
                 "guardband_mv": float(guardband_mv),
                 "route_priority": route_priority,
+                "layout_row": layout_row,
+                "layout_col": layout_col,
             }
         )
 
@@ -96,19 +105,25 @@ def to_synopsys_tcl(mapping_rows: List[Dict[str, Any]]) -> str:
         derate = float(row["timing_derate"])
         gb = float(row["guardband_mv"])
         route = row["route_priority"]
-        out.append(f"# q{q}: tier={tier} risk={risk:.4f} route={route}")
+        layout_row = row.get("layout_row")
+        layout_col = row.get("layout_col")
+        rr = -1 if layout_row is None else int(layout_row)
+        cc = -1 if layout_col is None else int(layout_col)
+        out.append(f"# q{q}: tier={tier} risk={risk:.4f} route={route} row={rr} col={cc}")
         out.append(f"set quread_q{q}_risk {risk:.6f}")
         out.append(f"set quread_q{q}_tier {tier}")
         out.append(f"set quread_q{q}_timing_derate {derate:.6f}")
         out.append(f"set quread_q{q}_guardband_mv {gb:.3f}")
+        out.append(f"set quread_q{q}_row {rr}")
+        out.append(f"set quread_q{q}_col {cc}")
         out.append(
-            f"lappend quread_risk_rows [list q{q} $quread_q{q}_risk $quread_q{q}_tier $quread_q{q}_timing_derate $quread_q{q}_guardband_mv {route}]"
+            f"lappend quread_risk_rows [list q{q} $quread_q{q}_risk $quread_q{q}_tier $quread_q{q}_timing_derate $quread_q{q}_guardband_mv $quread_q{q}_row $quread_q{q}_col {route}]"
         )
         out.append("")
 
     out.append("# Example integration hook:")
     out.append("# foreach row $quread_risk_rows {")
-    out.append("#   lassign $row q risk tier derate guardband route")
+    out.append("#   lassign $row q risk tier derate guardband row col route")
     out.append("#   # apply derate/guardband to path groups or physical regions")
     out.append("# }")
     out.append("")
@@ -132,8 +147,12 @@ def to_cadence_skill_reliability(mapping_rows: List[Dict[str, Any]]) -> str:
         derate = float(row["timing_derate"])
         gb = float(row["guardband_mv"])
         route = row["route_priority"]
+        layout_row = row.get("layout_row")
+        layout_col = row.get("layout_col")
+        rr = -1 if layout_row is None else int(layout_row)
+        cc = -1 if layout_col is None else int(layout_col)
         out.append(
-            f'qureadRiskRows = cons(list("q{q}" {risk:.6f} "{tier}" {derate:.6f} {gb:.3f} "{route}") qureadRiskRows)'
+            f'qureadRiskRows = cons(list("q{q}" {risk:.6f} "{tier}" {derate:.6f} {gb:.3f} {rr} {cc} "{route}") qureadRiskRows)'
         )
 
     out.append("")
@@ -141,8 +160,8 @@ def to_cadence_skill_reliability(mapping_rows: List[Dict[str, Any]]) -> str:
     out.append("")
     out.append("; Example integration hook:")
     out.append("; foreach(row qureadRiskRows")
-    out.append(';   printf("Qubit=%s risk=%L tier=%s derate=%L guardband(mV)=%L route=%s\\n"')
-    out.append(";          car(row) cadr(row) caddr(row) cadddr(row) car(cddddr(row)) cadr(cddddr(row)))")
+    out.append(';   printf("Qubit=%s risk=%L tier=%s derate=%L guardband(mV)=%L row=%L col=%L route=%s\\n"')
+    out.append(';          nth(0 row) nth(1 row) nth(2 row) nth(3 row) nth(4 row) nth(5 row) nth(6 row) nth(7 row))')
     out.append("; )")
     out.append("")
     return "\n".join(out) + "\n"

quread/layout_mapper.py

@@ -0,0 +1,102 @@
+from __future__ import annotations
+
+import csv
+import io
+from typing import Any, Dict, Optional, Tuple
+
+
+def default_qubit_coords(n_qubits: int, rows: int, cols: int) -> Dict[int, Tuple[int, int]]:
+    n = int(n_qubits)
+    rmax = int(rows)
+    cmax = int(cols)
+    m: Dict[int, Tuple[int, int]] = {}
+    for q in range(n):
+        rr = q // max(1, cmax)
+        cc = q % max(1, cmax)
+        if rr >= rmax:
+            break
+        m[q] = (rr, cc)
+    return m
+
+
+def _to_int(v: Any) -> Optional[int]:
+    try:
+        s = str(v).strip()
+        if s == "":
+            return None
+        return int(s)
+    except Exception:
+        return None
+
+
+def parse_layout_csv_text(
+    csv_text: str,
+    n_qubits: int,
+    *,
+    rows: int,
+    cols: int,
+) -> Tuple[Dict[int, Tuple[int, int]], Dict[str, Any]]:
+    """
+    Parse qubit-to-layout CSV.
+    Expected headers (case-insensitive):
+      qubit,row,col
+    Also accepts aliases:
+      qubit_id/q/id, r/y for row, c/x/column for col.
+    """
+    n = int(n_qubits)
+    rmax = int(rows)
+    cmax = int(cols)
+    fallback = default_qubit_coords(n, rmax, cmax)
+
+    text = (csv_text or "").strip()
+    if not text:
+        return fallback, {
+            "source": "default",
+            "parsed_rows": 0,
+            "mapped": len(fallback),
+            "fallback": len(fallback),
+            "skipped": 0,
+            "duplicates": 0,
+        }
+
+    reader = csv.DictReader(io.StringIO(text))
+    coords: Dict[int, Tuple[int, int]] = {}
+    skipped = 0
+    duplicates = 0
+    parsed_rows = 0
+
+    def _pick(row: Dict[str, Any], *keys: str) -> Any:
+        row_lc = {str(k).strip().lower(): v for k, v in row.items()}
+        for k in keys:
+            if k in row_lc:
+                return row_lc[k]
+        return None
+
+    for raw in reader:
+        parsed_rows += 1
+        q = _to_int(_pick(raw, "qubit", "qubit_id", "q", "id"))
+        rr = _to_int(_pick(raw, "row", "r", "y"))
+        cc = _to_int(_pick(raw, "col", "column", "c", "x"))
+        if q is None or rr is None or cc is None:
+            skipped += 1
+            continue
+        if not (0 <= q < n):
+            skipped += 1
+            continue
+        if not (0 <= rr < rmax and 0 <= cc < cmax):
+            skipped += 1
+            continue
+        if q in coords:
+            duplicates += 1
+        coords[q] = (rr, cc)
+
+    merged = dict(fallback)
+    merged.update(coords)
+    return merged, {
+        "source": "uploaded",
+        "parsed_rows": parsed_rows,
+        "mapped": len(coords),
+        "fallback": len(merged) - len(coords),
+        "skipped": skipped,
+        "duplicates": duplicates,
+    }