Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update gdsfactory #51

Merged
merged 4 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ __pycache__/
# C extensions
*.so
*.fsp
tests/ref/*.oas


# Distribution / packaging
.Python
Expand Down
2 changes: 1 addition & 1 deletion gvtt/components/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
from gvtt.components.transitions import (
rib_taper,
rib_to_strip,
strip_to_rib,
strip_taper,
strip_to_rib,
xs_rib_strip,
)
from gvtt.xsections import straight, straight_rib, straight_sc
Expand Down
10 changes: 4 additions & 6 deletions gvtt/components/mmi1x2.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
from functools import partial

# from gdsfactory.components import mmi1x2 as _mmi1x2

from gvtt.components.transitions import strip_taper
from gvtt.xsections import xs_sc

import gdsfactory as gf

from gdsfactory.component import Component
from gdsfactory.components.taper import taper as taper_function
from gdsfactory.typings import ComponentFactory, CrossSectionSpec

# from gdsfactory.components import mmi1x2 as _mmi1x2
from gvtt.components.transitions import strip_taper
from gvtt.xsections import xs_sc


@gf.cell
def _mmi1x2(
Expand Down
9 changes: 4 additions & 5 deletions gvtt/components/mmi2x2.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
from functools import partial

# from gdsfactory.components import mmi2x2 as _mmi2x2

from gvtt.components.transitions import strip_taper
from gvtt.xsections import xs_sc

import gdsfactory as gf
from gdsfactory.component import Component
from gdsfactory.components.taper import taper as taper_function
from gdsfactory.typings import ComponentFactory, CrossSectionSpec

# from gdsfactory.components import mmi2x2 as _mmi2x2
from gvtt.components.transitions import strip_taper
from gvtt.xsections import xs_sc


@gf.cell
def _mmi2x2(
Expand Down
2 changes: 1 addition & 1 deletion gvtt/components/transitions.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
cross_section,
)

from gvtt.xsections import rib, strip
from gvtt.layers import LAYER
from gvtt.xsections import rib, strip


def xs_rib_strip(
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ classifiers = [
"Operating System :: OS Independent"
]
dependencies = [
"gdsfactory[cad]==7.26.1"
"gdsfactory~=7.26.1"
]
description = "gdsfactory VTT PDK"
keywords = ["python"]
Expand Down
Binary file added tests/ref/_mmi1x2__mmi1x2_574421d1.gds
Binary file not shown.
Binary file added tests/ref/_mmi2x2__mmi2x2_07b187b9.gds
Binary file not shown.
Binary file added tests/ref/straight_straight_7a68ed6c.gds
Binary file not shown.
Binary file modified tests/ref/strip_taper.gds
Binary file not shown.
5 changes: 1 addition & 4 deletions tests/test_components/test_pdk_settings_die_.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
function: die
info:
port_x_position_east: 2423.5
port_x_position_west: -2423.5
port_y_position_north: 4673.5
port_y_position_south: -4673.5
frame_margin: 76.5
module: gvtt.components.die
name: die
settings:
Expand Down
78 changes: 7 additions & 71 deletions tests/test_components/test_pdk_settings_mmi1x2_.yml
Original file line number Diff line number Diff line change
@@ -1,82 +1,18 @@
function: mmi1x2
function: _mmi1x2
info: {}
module: gdsfactory.components.mmi1x2
name: mmi1x2_c8071938
module: gvtt.components.mmi1x2
name: _mmi1x2_574421d1
settings:
cross_section:
bbox_layers: null
bbox_offsets: null
components_along_path: []
radius: 10.0
radius_min: null
sections:
- hidden: false
insets: null
layer:
- 89
- 1
name: _default
offset: 0.0
offset_function: null
port_names:
- o1
- o2
port_types:
- optical
- optical
simplify: null
function: strip
module: gvtt.xsections
settings:
width: 1.875
width_function: null
- hidden: false
insets: null
layer: WG_RIBS_SUB
name: WG
offset: 0
offset_function: null
port_names:
- null
- null
port_types:
- optical
- optical
simplify: null
width: 1.875
width_function: null
- hidden: false
insets: null
layer: WG_RIBS_ADD
name: trench
offset: 0
offset_function: null
port_names:
- null
- null
port_types:
- optical
- optical
simplify: null
width: 21.875
width_function: null
- hidden: false
insets: null
layer: WG_MOST_ADD
name: trench_2
offset: 0
offset_function: null
port_names:
- null
- null
port_types:
- optical
- optical
simplify: null
width: 22.875
width_function: null
gap_mmi: 1.25
length_mmi: 43.25
length_taper: 1.0
taper:
function: strip_taper
width: null
width: 1.875
width_mmi: 6.25
width_taper: 1.875
78 changes: 7 additions & 71 deletions tests/test_components/test_pdk_settings_mmi2x2_.yml
Original file line number Diff line number Diff line change
@@ -1,80 +1,16 @@
function: mmi2x2
function: _mmi2x2
info: {}
module: gdsfactory.components.mmi2x2
name: mmi2x2_55c4183e
module: gvtt.components.mmi2x2
name: _mmi2x2_07b187b9
settings:
cross_section:
bbox_layers: null
bbox_offsets: null
components_along_path: []
radius: 10.0
radius_min: null
sections:
- hidden: false
insets: null
layer:
- 89
- 1
name: _default
offset: 0.0
offset_function: null
port_names:
- o1
- o2
port_types:
- optical
- optical
simplify: null
function: strip
module: gvtt.xsections
settings:
width: 1.875
width_function: null
- hidden: false
insets: null
layer: WG_RIBS_SUB
name: WG
offset: 0
offset_function: null
port_names:
- null
- null
port_types:
- optical
- optical
simplify: null
width: 1.875
width_function: null
- hidden: false
insets: null
layer: WG_RIBS_ADD
name: trench
offset: 0
offset_function: null
port_names:
- null
- null
port_types:
- optical
- optical
simplify: null
width: 21.875
width_function: null
- hidden: false
insets: null
layer: WG_MOST_ADD
name: trench_2
offset: 0
offset_function: null
port_names:
- null
- null
port_types:
- optical
- optical
simplify: null
width: 22.875
width_function: null
gap_mmi: 1.25
length_mmi: 112.0
length_taper: 1.0
length_taper: null
taper:
function: strip_taper
width: null
Expand Down
72 changes: 4 additions & 68 deletions tests/test_components/test_pdk_settings_straight_.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,76 +7,12 @@ info:
route_info_weight: 10.0
width: 1.875
module: gdsfactory.components.straight
name: straight_bdf7fc24
name: straight_7a68ed6c
settings:
cross_section:
bbox_layers: null
bbox_offsets: null
components_along_path: []
radius: 10.0
radius_min: null
sections:
- hidden: false
insets: null
layer:
- 89
- 1
name: _default
offset: 0.0
offset_function: null
port_names:
- o1
- o2
port_types:
- optical
- optical
simplify: null
function: strip
module: gvtt.xsections
settings:
width: 1.875
width_function: null
- hidden: false
insets: null
layer: WG_RIBS_SUB
name: WG
offset: 0
offset_function: null
port_names:
- null
- null
port_types:
- optical
- optical
simplify: null
width: 1.875
width_function: null
- hidden: false
insets: null
layer: WG_RIBS_ADD
name: trench
offset: 0
offset_function: null
port_names:
- null
- null
port_types:
- optical
- optical
simplify: null
width: 21.875
width_function: null
- hidden: false
insets: null
layer: WG_MOST_ADD
name: trench_2
offset: 0
offset_function: null
port_names:
- null
- null
port_types:
- optical
- optical
simplify: null
width: 22.875
width_function: null
length: 10.0
npoints: 2
Loading