Merge pull request #18 from tscircuit/optimization

Set default maxHotRegions to 2, minor snapshotting to sectionSolver to improve speed

Author: seveibar

lib/compat/convertPortPointPathingSolverInputToSerializedHyperGraph.ts

@@ -0,0 +1,60 @@
+import type { SerializedHyperGraph } from "@tscircuit/hypergraph"
+
+export interface SerializedHyperGraphPortPointPathingSolverParams {
+  format: "serialized-hg-port-point-pathing-solver-params"
+  graph: {
+    regions: SerializedHyperGraph["regions"]
+    ports: SerializedHyperGraph["ports"]
+  }
+  connections: NonNullable<SerializedHyperGraph["connections"]>
+}
+
+export type SerializedHyperGraphPortPointPathingSolverInput =
+  | SerializedHyperGraphPortPointPathingSolverParams
+  | SerializedHyperGraphPortPointPathingSolverParams[]
+
+const isSerializedHyperGraphPortPointPathingSolverParams = (
+  value: unknown,
+): value is SerializedHyperGraphPortPointPathingSolverParams =>
+  typeof value === "object" &&
+  value !== null &&
+  (value as { format?: unknown }).format ===
+    "serialized-hg-port-point-pathing-solver-params" &&
+  Array.isArray((value as { graph?: { regions?: unknown } }).graph?.regions) &&
+  Array.isArray((value as { graph?: { ports?: unknown } }).graph?.ports) &&
+  Array.isArray((value as { connections?: unknown }).connections)
+
+const getSinglePortPointPathingSolverParams = (
+  input: SerializedHyperGraphPortPointPathingSolverInput,
+) => {
+  if (!Array.isArray(input)) {
+    return input
+  }
+
+  const params = input[0]
+  if (!params) {
+    throw new Error(
+      "Port point pathing solver input array must contain at least one item",
+    )
+  }
+
+  return params
+}
+
+export const convertPortPointPathingSolverInputToSerializedHyperGraph = (
+  input: SerializedHyperGraphPortPointPathingSolverInput,
+): SerializedHyperGraph => {
+  const params = getSinglePortPointPathingSolverParams(input)
+
+  if (!isSerializedHyperGraphPortPointPathingSolverParams(params)) {
+    throw new Error(
+      "Expected serialized-hg-port-point-pathing-solver-params input",
+    )
+  }
+
+  return {
+    regions: params.graph.regions,
+    ports: params.graph.ports,
+    connections: params.connections,
+  }
+}

lib/index.ts

@@ -1,4 +1,5 @@
 export * from "./core"
+export { convertPortPointPathingSolverInputToSerializedHyperGraph } from "./compat/convertPortPointPathingSolverInputToSerializedHyperGraph"
 export {
   TinyHyperGraphSectionSolver,
   type TinyHyperGraphSectionSolverOptions,

lib/section-solver/TinyHyperGraphSectionPipelineSolver.ts

@@ -78,6 +78,7 @@ const DEFAULT_CANDIDATE_FAMILIES: TinyHyperGraphSectionCandidateFamily[] = [
   "twohop-all",
   "twohop-touch",
 ]
+const DEFAULT_MAX_HOT_REGIONS = 2
 
 const IMPROVEMENT_EPSILON = 1e-9
 
@@ -257,11 +258,15 @@ const findBestAutomaticSectionMask = (
   let candidateSolveMs = 0
   let candidateReplayScoreMs = 0
   const seenPortSectionMasks = new Set<string>()
+  const maxHotRegions =
+    searchConfig?.maxHotRegions ??
+    sectionSolverOptions.MAX_HOT_REGIONS ??
+    DEFAULT_MAX_HOT_REGIONS
 
   for (const candidate of getSectionMaskCandidates(
     solvedSolver,
     topology,
-    searchConfig?.maxHotRegions ?? 9,
+    maxHotRegions,
     searchConfig?.candidateFamilies ?? DEFAULT_CANDIDATE_FAMILIES,
   )) {
     const candidateProblem = createProblemWithPortSectionMask(

lib/section-solver/index.ts

@@ -43,6 +43,12 @@ export interface TinyHyperGraphSectionSolverOptions
   MAX_RIPS?: number
   MAX_RIPS_WITHOUT_MAX_REGION_COST_IMPROVEMENT?: number
   EXTRA_RIPS_AFTER_BEATING_BASELINE_MAX_REGION_COST?: number
+  /**
+   * Pipeline convenience option for automatic section-mask search.
+   * When `sectionSearchConfig.maxHotRegions` is omitted, the section pipeline
+   * falls back to this value before using its built-in default.
+   */
+  MAX_HOT_REGIONS?: number
 }
 
 const applyTinyHyperGraphSectionSolverOptions = (
@@ -118,6 +124,16 @@ const cloneSolvedStateSnapshot = (
   ),
 })
 
+const restoreSolvedStateSnapshot = (
+  solver: TinyHyperGraphSolver,
+  snapshot: SolvedStateSnapshot,
+) => {
+  const clonedSnapshot = cloneSolvedStateSnapshot(snapshot)
+  solver.state.portAssignment = clonedSnapshot.portAssignment
+  solver.state.regionSegments = clonedSnapshot.regionSegments
+  solver.state.regionIntersectionCaches = clonedSnapshot.regionIntersectionCaches
+}
+
 const summarizeRegionIntersectionCaches = (
   regionIntersectionCaches: ArrayLike<RegionIntersectionCache>,
 ): RegionCostSummary => {
@@ -161,6 +177,35 @@ const summarizeRegionIntersectionCachesForRegionIds = (
   }
 }
 
+const summarizeRegionIntersectionCachesExcludingRegionIds = (
+  regionIntersectionCaches: ArrayLike<RegionIntersectionCache>,
+  excludedRegionIds: RegionId[],
+): RegionCostSummary => {
+  const excludedRegionIdSet = new Set(excludedRegionIds)
+  let maxRegionCost = 0
+  let totalRegionCost = 0
+
+  for (
+    let regionId = 0;
+    regionId < regionIntersectionCaches.length;
+    regionId++
+  ) {
+    if (excludedRegionIdSet.has(regionId)) {
+      continue
+    }
+
+    const regionCost =
+      regionIntersectionCaches[regionId]?.existingRegionCost ?? 0
+    maxRegionCost = Math.max(maxRegionCost, regionCost)
+    totalRegionCost += regionCost
+  }
+
+  return {
+    maxRegionCost,
+    totalRegionCost,
+  }
+}
+
 const compareRegionCostSummaries = (
   left: RegionCostSummary,
   right: RegionCostSummary,
@@ -538,6 +583,7 @@ const getSectionRegionIds = (
 
 class TinyHyperGraphSectionSearchSolver extends TinyHyperGraphSolver {
   bestSnapshot?: SolvedStateSnapshot
+  fixedSnapshot?: SolvedStateSnapshot
   bestSummary?: RegionCostSummary
   baselineBeatRipCount?: number
   previousBestMaxRegionCost = Number.POSITIVE_INFINITY
@@ -552,13 +598,20 @@ class TinyHyperGraphSectionSearchSolver extends TinyHyperGraphSolver {
     problem: TinyHyperGraphProblem,
     private routePlans: SectionRoutePlan[],
     private activeRouteIds: RouteId[],
+    private mutableRegionIds: RegionId[],
+    private immutableRegionSummary: RegionCostSummary,
     private baselineSummary: RegionCostSummary,
     options?: TinyHyperGraphSectionSolverOptions,
   ) {
     super(topology, problem, options)
     applyTinyHyperGraphSectionSolverOptions(this, options)
     this.state.unroutedRoutes = [...activeRouteIds]
     this.applyFixedSegments()
+    this.fixedSnapshot = cloneSolvedStateSnapshot({
+      portAssignment: this.state.portAssignment,
+      regionSegments: this.state.regionSegments,
+      regionIntersectionCaches: this.state.regionIntersectionCaches,
+    })
   }
 
   applyFixedSegments() {
@@ -601,10 +654,7 @@ class TinyHyperGraphSectionSearchSolver extends TinyHyperGraphSolver {
       return
     }
 
-    const snapshot = cloneSolvedStateSnapshot(this.bestSnapshot)
-    this.state.portAssignment = snapshot.portAssignment
-    this.state.regionSegments = snapshot.regionSegments
-    this.state.regionIntersectionCaches = snapshot.regionIntersectionCaches
+    restoreSolvedStateSnapshot(this, this.bestSnapshot)
     this.state.currentRouteId = undefined
     this.state.currentRouteNetId = undefined
     this.state.unroutedRoutes = []
@@ -626,16 +676,30 @@ class TinyHyperGraphSectionSearchSolver extends TinyHyperGraphSolver {
   }
 
   override resetRoutingStateForRerip() {
-    super.resetRoutingStateForRerip()
+    if (!this.fixedSnapshot) {
+      super.resetRoutingStateForRerip()
+      this.state.unroutedRoutes = shuffle(
+        [...this.activeRouteIds],
+        this.state.ripCount,
+      )
+      this.applyFixedSegments()
+      return
+    }
+
+    restoreSolvedStateSnapshot(this, this.fixedSnapshot)
+    this.state.currentRouteId = undefined
+    this.state.currentRouteNetId = undefined
     this.state.unroutedRoutes = shuffle(
       [...this.activeRouteIds],
       this.state.ripCount,
     )
-    this.applyFixedSegments()
+    this.state.candidateQueue.clear()
+    this.resetCandidateBestCosts()
+    this.state.goalPortId = -1
   }
 
   override onAllRoutesRouted() {
-    const { topology, state } = this
+    const { state } = this
     const maxRips = Math.min(this.MAX_RIPS, this.RIP_THRESHOLD_RAMP_ATTEMPTS)
     const ripThresholdProgress =
       maxRips <= 0 ? 1 : Math.min(1, state.ripCount / maxRips)
@@ -644,22 +708,34 @@ class TinyHyperGraphSectionSearchSolver extends TinyHyperGraphSolver {
       (this.RIP_THRESHOLD_END - this.RIP_THRESHOLD_START) * ripThresholdProgress
 
     const regionIdsOverCostThreshold: RegionId[] = []
-    const regionCosts = new Float64Array(topology.regionCount)
-    let maxRegionCost = 0
-    let totalRegionCost = 0
+    const mutableRegionCosts = new Float64Array(this.mutableRegionIds.length)
+    let mutableMaxRegionCost = 0
+    let mutableTotalRegionCost = 0
 
-    for (let regionId = 0; regionId < topology.regionCount; regionId++) {
+    for (
+      let mutableRegionIndex = 0;
+      mutableRegionIndex < this.mutableRegionIds.length;
+      mutableRegionIndex++
+    ) {
+      const regionId = this.mutableRegionIds[mutableRegionIndex]!
       const regionCost =
         state.regionIntersectionCaches[regionId]?.existingRegionCost ?? 0
-      regionCosts[regionId] = regionCost
-      maxRegionCost = Math.max(maxRegionCost, regionCost)
-      totalRegionCost += regionCost
+      mutableRegionCosts[mutableRegionIndex] = regionCost
+      mutableMaxRegionCost = Math.max(mutableMaxRegionCost, regionCost)
+      mutableTotalRegionCost += regionCost
 
       if (regionCost > currentRipThreshold) {
         regionIdsOverCostThreshold.push(regionId)
       }
     }
 
+    const maxRegionCost = Math.max(
+      this.immutableRegionSummary.maxRegionCost,
+      mutableMaxRegionCost,
+    )
+    const totalRegionCost =
+      this.immutableRegionSummary.totalRegionCost + mutableTotalRegionCost
+
     this.captureBestState({
       maxRegionCost,
       totalRegionCost,
@@ -713,9 +789,15 @@ class TinyHyperGraphSectionSearchSolver extends TinyHyperGraphSolver {
       return
     }
 
-    for (let regionId = 0; regionId < topology.regionCount; regionId++) {
+    for (
+      let mutableRegionIndex = 0;
+      mutableRegionIndex < this.mutableRegionIds.length;
+      mutableRegionIndex++
+    ) {
+      const regionId = this.mutableRegionIds[mutableRegionIndex]!
       state.regionCongestionCost[regionId] +=
-        regionCosts[regionId] * this.RIP_CONGESTION_REGION_COST_FACTOR
+        mutableRegionCosts[mutableRegionIndex]! *
+        this.RIP_CONGESTION_REGION_COST_FACTOR
     }
 
     state.ripCount += 1
@@ -727,6 +809,25 @@ class TinyHyperGraphSectionSearchSolver extends TinyHyperGraphSolver {
     }
   }
 
+  override onOutOfCandidates() {
+    const { state } = this
+
+    for (const regionId of this.mutableRegionIds) {
+      const regionCost =
+        state.regionIntersectionCaches[regionId]?.existingRegionCost ?? 0
+      state.regionCongestionCost[regionId] +=
+        regionCost * this.RIP_CONGESTION_REGION_COST_FACTOR
+    }
+
+    state.ripCount += 1
+    this.resetRoutingStateForRerip()
+    this.stats = {
+      ...this.stats,
+      ripCount: state.ripCount,
+      reripReason: "out_of_candidates",
+    }
+  }
+
   override tryFinalAcceptance() {
     if (!this.bestSnapshot) {
       return
@@ -750,6 +851,7 @@ export class TinyHyperGraphSectionSolver extends BaseSolver {
   baselineSolver: TinyHyperGraphSolver
   baselineSummary: RegionCostSummary
   sectionBaselineSummary: RegionCostSummary
+  outsideSectionBaselineSummary: RegionCostSummary
   sectionRegionIds: RegionId[]
   optimizedSolver?: TinyHyperGraphSolver
   sectionSolver?: TinyHyperGraphSectionSearchSolver
@@ -790,6 +892,11 @@ export class TinyHyperGraphSectionSolver extends BaseSolver {
       this.baselineSolver.state.regionIntersectionCaches,
       this.sectionRegionIds,
     )
+    this.outsideSectionBaselineSummary =
+      summarizeRegionIntersectionCachesExcludingRegionIds(
+        this.baselineSolver.state.regionIntersectionCaches,
+        this.sectionRegionIds,
+      )
     this.applySectionRipPolicy()
   }
 
@@ -828,6 +935,8 @@ export class TinyHyperGraphSectionSolver extends BaseSolver {
       sectionProblem,
       routePlans,
       activeRouteIds,
+      this.sectionRegionIds,
+      this.outsideSectionBaselineSummary,
       this.baselineSummary,
       getTinyHyperGraphSectionSolverOptions(this),
     )

package.json

@@ -7,7 +7,8 @@
     "typecheck": "tsc -p tsconfig.json --pretty false",
     "benchmark1": "bun run --cpu-prof-md scripts/profiling/hg07-first10.ts",
     "benchmark:section": "bun run scripts/benchmarking/hg07-section-pipeline.ts",
-    "benchmark:section:profile": "bun run scripts/benchmarking/hg07-first40-section-profile.ts"
+    "benchmark:section:profile": "bun run scripts/benchmarking/hg07-first40-section-profile.ts",
+    "benchmark:port-point-pathing": "bun run scripts/benchmarking/port-point-pathing-section-pipeline.ts"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.8",