[gdsii_arrow] remove non-raw-mode arrow option; fix gzip wrapper

masque/test/test_gdsii_arrow.py

@@ -187,6 +187,18 @@ def test_gdsii_arrow_matches_gdsii_readfile(tmp_path: Path) -> None:
     assert _library_summary(canonical_lib) == _library_summary(arrow_lib)
 
 
+def test_gdsii_arrow_matches_gdsii_readfile_for_gzipped_file(tmp_path: Path) -> None:
+    lib = _make_arrow_test_library()
+    gds_file = tmp_path / 'arrow_roundtrip.gds.gz'
+    gdsii.writefile(lib, gds_file, meters_per_unit=1e-9)
+
+    canonical_lib, canonical_info = gdsii.readfile(gds_file)
+    arrow_lib, arrow_info = gdsii_arrow.readfile(gds_file)
+
+    assert canonical_info == arrow_info
+    assert _library_summary(canonical_lib) == _library_summary(arrow_lib)
+
+
 def test_gdsii_arrow_readfile_arrow_returns_native_payload(tmp_path: Path) -> None:
     gds_file = tmp_path / 'many_cells_native.gds'
     manifest = write_fixture(gds_file, preset='many_cells', scale=0.001)
@@ -199,6 +211,33 @@ def test_gdsii_arrow_readfile_arrow_returns_native_payload(tmp_path: Path) -> No
     assert 0 < len(libarr['layers']) <= manifest.layers
 
 
+def test_gdsii_arrow_readfile_arrow_reads_gzipped_file(tmp_path: Path) -> None:
+    lib = _make_arrow_test_library()
+    gds_file = tmp_path / 'native_payload.gds.gz'
+    gdsii.writefile(lib, gds_file, meters_per_unit=1e-9)
+
+    libarr, info = gdsii_arrow.readfile_arrow(gds_file)
+
+    assert info['name'] == 'masque-klamath'
+    assert libarr['lib_name'].as_py() == 'masque-klamath'
+    assert len(libarr['cells']) == len(lib)
+    assert len(libarr['layers']) > 0
+
+
+def test_gdsii_arrow_removed_raw_mode_arg(tmp_path: Path) -> None:
+    lib = _make_arrow_test_library()
+    gds_file = tmp_path / 'removed_raw_mode.gds'
+    gdsii.writefile(lib, gds_file, meters_per_unit=1e-9)
+
+    libarr, _ = gdsii_arrow.readfile_arrow(gds_file)
+
+    with pytest.raises(TypeError):
+        gdsii_arrow.readfile(gds_file, raw_mode=False)
+
+    with pytest.raises(TypeError):
+        gdsii_arrow.read_arrow(libarr, raw_mode=False)
+
+
 def test_gdsii_arrow_reads_small_perf_fixture(tmp_path: Path) -> None:
     gds_file = tmp_path / 'many_cells_smoke.gds'
     manifest = write_fixture(gds_file, preset='many_cells', scale=0.001)

masque/test/test_gdsii_lazy_arrow.py

@@ -34,6 +34,78 @@ def _make_small_library() -> Library:
     return lib
 
 
+def _make_complex_ref_library() -> Library:
+    lib = Library()
+
+    leaf = Pattern()
+    leaf.polygon((1, 0), vertices=[[0, 0], [10, 0], [10, 10], [0, 10]])
+    lib['leaf'] = leaf
+
+    child = Pattern()
+    child.ref('leaf', offset=(100, 200), rotation=numpy.pi / 2, mirrored=True, scale=1.25)
+    lib['child'] = child
+
+    sibling = Pattern()
+    sibling.ref(
+        'leaf',
+        offset=(-50, 60),
+        repetition=Grid(a_vector=(20, 0), a_count=3, b_vector=(0, 30), b_count=2),
+        )
+    lib['sibling'] = sibling
+
+    fanout = Pattern()
+    fanout.ref('leaf', offset=(0, 0))
+    fanout.ref('child', offset=(10, 0), mirrored=True, rotation=numpy.pi / 6, scale=1.1)
+    fanout.ref('leaf', offset=(30, 0), repetition=Grid(a_vector=(5, 0), a_count=2, b_vector=(0, 7), b_count=3))
+    fanout.ref(
+        'child',
+        offset=(40, 0),
+        mirrored=True,
+        rotation=numpy.pi / 4,
+        scale=1.2,
+        repetition=Grid(a_vector=(9, 0), a_count=2, b_vector=(0, 11), b_count=2),
+        )
+    lib['fanout'] = fanout
+
+    top = Pattern()
+    top.ref('child', offset=(500, 600))
+    top.ref('sibling', offset=(-100, 50), rotation=numpy.pi)
+    top.ref('fanout', offset=(250, -75))
+    lib['top'] = top
+
+    return lib
+
+
+def _transform_rows_key(values: numpy.ndarray) -> tuple[tuple[object, ...], ...]:
+    arr = numpy.asarray(values, dtype=float)
+    arr = numpy.atleast_2d(arr)
+    rows = [
+        (
+            round(float(row[0]), 8),
+            round(float(row[1]), 8),
+            round(float(row[2]), 8),
+            bool(int(round(float(row[3])))),
+            round(float(row[4]), 8),
+            )
+        for row in arr
+        ]
+    return tuple(sorted(rows))
+
+
+def _local_refs_key(refs: dict[str, list[numpy.ndarray]]) -> dict[str, tuple[tuple[object, ...], ...]]:
+    return {
+        parent: _transform_rows_key(numpy.concatenate(transforms))
+        for parent, transforms in refs.items()
+        }
+
+
+def _global_refs_key(refs: dict[tuple[str, ...], numpy.ndarray]) -> dict[tuple[str, ...], tuple[tuple[object, ...], ...]]:
+    return {
+        path: _transform_rows_key(transforms)
+        for path, transforms in refs.items()
+        }
+
+
 def test_gdsii_lazy_arrow_loads_perf_fixture(tmp_path: Path) -> None:
     gds_file = tmp_path / 'many_cells_lazy.gds'
     manifest = write_fixture(gds_file, preset='many_cells', scale=0.001)
@@ -62,6 +134,19 @@ def test_gdsii_lazy_arrow_local_and_global_refs(tmp_path: Path) -> None:
     assert global_refs[('top', 'mid', 'leaf')].shape[0] == 5
 
 
+def test_gdsii_lazy_arrow_ref_queries_match_eager_reader(tmp_path: Path) -> None:
+    gds_file = tmp_path / 'complex_refs.gds'
+    src = _make_complex_ref_library()
+    gdsii.writefile(src, gds_file, meters_per_unit=1e-9, library_name='lazy-complex-refs')
+
+    eager, _ = gdsii.readfile(gds_file)
+    lazy, _ = gdsii_lazy_arrow.readfile(gds_file)
+
+    for name in ('leaf', 'child'):
+        assert _local_refs_key(lazy.find_refs_local(name)) == _local_refs_key(eager.find_refs_local(name))
+        assert _global_refs_key(lazy.find_refs_global(name)) == _global_refs_key(eager.find_refs_global(name))
+
+
 def test_gdsii_lazy_arrow_untouched_write_is_copy_through(tmp_path: Path) -> None:
     gds_file = tmp_path / 'copy_source.gds'
     src = _make_small_library()