Use Bloqade-geometry (#48)

* adding geometry to dependences

* switching to using bloqade-geometry Grid

* Removing workspace source

* pinning version and fixing issue with local source

* bump kirin dependency

Author: weinbe58

pyproject.toml

@@ -8,7 +8,8 @@ authors = [
 ]
 dependencies = [
     "bloqade-circuit~=0.10.0",
-    "kirin-toolchain~=0.21.0",
+    "bloqade-geometry~=0.5.0",
+    "kirin-toolchain~=0.22.0",
     "numpy>=2.2.6",
     "rustworkx>=0.17.1",
 ]

src/bloqade/lanes/arch/gemini/impls.py

@@ -1,7 +1,7 @@
 import numpy as np
+from bloqade.geometry.dialects.grid import Grid
 
 from bloqade.lanes.layout.arch import ArchSpec, Bus
-from bloqade.lanes.layout.grid import Grid
 from bloqade.lanes.layout.numpy_compat import as_flat_tuple_int
 from bloqade.lanes.layout.word import Word
 
@@ -56,10 +56,10 @@ def generate_arch(hypercube_dims: int = 4, word_size_y: int = 5) -> ArchSpec:
     x_positions = (0.0, 2.0)
     y_positions = tuple(10.0 * i for i in range(word_size_y))
 
-    grid = Grid(x_positions, y_positions)
+    grid = Grid.from_positions(x_positions, y_positions)
 
     words = tuple(
-        Word(grid.shift(10.0 * ix, 0.0).positions) for ix in range(num_word_x)
+        Word(tuple(grid.shift(10.0 * ix, 0.0).positions)) for ix in range(num_word_x)
     )
 
     word_ids = np.arange(word_size_x * word_size_y).reshape(word_size_y, word_size_x)

src/bloqade/lanes/layout/grid.py

@@ -2,7 +2,7 @@
 from itertools import product
 from typing import Any, Generic, TypeVar
 
-from .grid import Grid
+from bloqade.geometry.dialects.grid import Grid
 
 SiteType = TypeVar("SiteType", bound=Grid | tuple[float, float] | tuple[int, int])