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.

Sign up for GitHub

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

refactor folder structure in blocks directory #334

Merged
merged 2 commits into from
Aug 30, 2024
Merged

refactor folder structure in blocks directory #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f33728
refactor
chetanyagoyal Aug 22, 2024
9f93d27
Delete openfasoc/generators/glayout/glayout/flow/blocks/CrossCoupledI…
chetanyagoyal Aug 22, 2024
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
6 changes: 3 additions & 3 deletions .github/scripts/test_glayout_ci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
__import__('glayout')
except ImportError:
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')))
from glayout.flow.blocks.opamp import opamp
from glayout.flow.blocks.diff_pair import diff_pair
from glayout.flow.blocks.composite.opamp import opamp
from glayout.flow.blocks.elementary.diff_pair import diff_pair
from glayout.flow.primitives.fet import nmos, pmos
from glayout.flow.pdk.sky130_mapped import sky130_mapped_pdk
from glayout.flow.blocks.current_mirror import current_mirror
from glayout.flow.blocks.elementary.current_mirror import current_mirror
import json
import numpy as np
import shutil
Expand Down
6 changes: 3 additions & 3 deletions docs/source/notebooks/glayout/GLayout_Cells.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@
},
"outputs": [],
"source": [
"from glayout.flow.blocks.diff_pair import diff_pair\n",
"from glayout.flow.blocks.elementary.diff_pair import diff_pair\n",
"# Used to display the results in a grid (notebook only)\n",
"left = widgets.Output()\n",
"leftSPICE = widgets.Output()\n",
Expand Down Expand Up @@ -455,7 +455,7 @@
},
"outputs": [],
"source": [
"from glayout.flow.blocks.differential_to_single_ended_converter import differential_to_single_ended_converter\n",
"from glayout.flow.blocks.composite.differential_to_single_ended_converter import differential_to_single_ended_converter\n",
"# Used to display the results in a grid (notebook only)\n",
"left = widgets.Output()\n",
"leftSPICE = widgets.Output()\n",
Expand Down Expand Up @@ -532,7 +532,7 @@
},
"outputs": [],
"source": [
"from glayout.flow.blocks.opamp import opamp\n",
"from glayout.flow.blocks.composite.opamp import opamp\n",
"\n",
"# Select which PDK to use\n",
"pdk = sky130\n",
Expand Down
2 changes: 1 addition & 1 deletion docs/source/notebooks/glayout/glayout_opamp.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@
},
"outputs": [],
"source": [
"from glayout.flow.blocks.opamp import opamp\n",
"from glayout.flow.blocks.composite.opamp import opamp\n",
"\n",
"# Select which PDK to use\n",
"pdk = sky130\n",
Expand Down
2 changes: 2 additions & 0 deletions openfasoc/generators/glayout/glayout/flow/blocks/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
from glayout.flow.blocks.composite import *
from glayout.flow.blocks.elementary import *
Empty file added openfasoc/generators/glayout/glayout/flow/blocks/composite/__init__.py
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion ...ed_inverter/CrossCoupledInverters_cell.py → ...ed_inverter/CrossCoupledInverters_cell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from glayout.flow.placement.two_transistor_interdigitized import two_nfet_interdigitized
from glayout.flow.placement.four_transistor_interdigitized import generic_4T_interdigitzed
from glayout.flow.placement.two_transistor_interdigitized import two_pfet_interdigitized
from glayout.flow.blocks.diff_pair import diff_pair_generic
from glayout.flow.blocks.elementary.diff_pair import diff_pair_generic
from glayout.flow.routing.smart_route import smart_route
from glayout.flow.routing.L_route import L_route
from glayout.flow.routing.c_route import c_route
Expand Down
0 ...blocks/cross_coupled_inverter/__init__.py → ...posite/cross_coupled_inverter/__init__.py
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions .../glayout/glayout/flow/blocks/composite/differential_to_single_ended_converter/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from .differential_to_single_ended_converter import differential_to_single_ended_converter, differential_to_single_ended_converter_netlist
2 changes: 1 addition & 1 deletion ...differential_to_single_ended_converter.py → ...differential_to_single_ended_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from gdsfactory.components.rectangle import rectangle
from glayout.flow.pdk.mappedpdk import MappedPDK
from typing import Optional, Union
from glayout.flow.blocks.diff_pair import diff_pair
from glayout.flow.blocks.elementary.diff_pair.diff_pair import diff_pair
from glayout.flow.primitives.fet import nmos, pmos, multiplier
from glayout.flow.primitives.guardring import tapring
from glayout.flow.primitives.mimcap import mimcap_array, mimcap
Expand Down
1 change: 1 addition & 0 deletions openfasoc/generators/glayout/glayout/flow/blocks/composite/diffpair_cmirror_bias/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from .diff_pair_cmirrorbias import diff_pair_ibias, diff_pair_ibias_netlist
4 changes: 2 additions & 2 deletions ...air_cmirror_bias/diff_pair_cmirrorbias.py → ...air_cmirror_bias/diff_pair_cmirrorbias.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from gdsfactory.components.rectangle import rectangle
from glayout.flow.pdk.mappedpdk import MappedPDK
from typing import Optional, Union
from glayout.flow.blocks.diff_pair import diff_pair
from glayout.flow.blocks.elementary.diff_pair import diff_pair
from glayout.flow.primitives.fet import nmos, pmos, multiplier
from glayout.flow.primitives.guardring import tapring
from glayout.flow.primitives.mimcap import mimcap_array, mimcap
Expand Down Expand Up @@ -36,7 +36,7 @@
from pydantic import validate_arguments
from glayout.flow.placement.two_transistor_interdigitized import two_nfet_interdigitized
from glayout.flow.spice import Netlist
from glayout.flow.blocks.current_mirror import current_mirror_netlist
from glayout.flow.blocks.elementary.current_mirror import current_mirror_netlist

def diff_pair_ibias_netlist(center_diffpair: Component, current_mirror: Component, antenna_diode: Optional[Component] = None) -> Netlist:
netlist = Netlist(
Expand Down
2 changes: 2 additions & 0 deletions openfasoc/generators/glayout/glayout/flow/blocks/composite/opamp/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
from glayout.flow.blocks.composite.opamp.opamp import opamp, opamp_netlist
from glayout.flow.blocks.composite.opamp.diff_pair_stackedcmirror import diff_pair_stackedcmirror
10 changes: 5 additions & 5 deletions .../blocks/opamp/diff_pair_stackedcmirror.py → ...mposite/opamp/diff_pair_stackedcmirror.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from gdsfactory.components.rectangle import rectangle
from glayout.flow.pdk.mappedpdk import MappedPDK
from typing import Optional, Union
from glayout.flow.blocks.diff_pair import diff_pair
from glayout.flow.blocks.elementary.diff_pair import diff_pair
from glayout.flow.primitives.fet import nmos, pmos, multiplier
from glayout.flow.primitives.guardring import tapring
from glayout.flow.primitives.mimcap import mimcap_array, mimcap
Expand All @@ -19,10 +19,10 @@
from pydantic import validate_arguments
from glayout.flow.placement.two_transistor_interdigitized import two_nfet_interdigitized

from glayout.flow.blocks.diffpair_cmirror_bias import diff_pair_ibias
from glayout.flow.blocks.stacked_current_mirror import stacked_nfet_current_mirror
from glayout.flow.blocks.differential_to_single_ended_converter import differential_to_single_ended_converter
from glayout.flow.blocks.opamp.row_csamplifier_diff_to_single_ended_converter import row_csamplifier_diff_to_single_ended_converter
from glayout.flow.blocks.composite.diffpair_cmirror_bias import diff_pair_ibias
from glayout.flow.blocks.composite.stacked_current_mirror import stacked_nfet_current_mirror
from glayout.flow.blocks.composite.differential_to_single_ended_converter import differential_to_single_ended_converter
from glayout.flow.blocks.composite.opamp.row_csamplifier_diff_to_single_ended_converter import row_csamplifier_diff_to_single_ended_converter


@validate_arguments
Expand Down
6 changes: 3 additions & 3 deletions ...layout/glayout/flow/blocks/opamp/opamp.py → ...yout/flow/blocks/composite/opamp/opamp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from glayout.flow.pdk.mappedpdk import MappedPDK
from typing import Optional, Union
from glayout.flow.primitives.fet import nmos, pmos, multiplier
from glayout.flow.blocks.diff_pair import diff_pair
from glayout.flow.blocks.elementary.diff_pair import diff_pair
from glayout.flow.primitives.guardring import tapring
from glayout.flow.primitives.mimcap import mimcap_array, mimcap
from glayout.flow.routing.L_route import L_route
Expand All @@ -20,8 +20,8 @@
from glayout.flow.placement.two_transistor_interdigitized import two_nfet_interdigitized
from glayout.flow.spice import Netlist

from glayout.flow.blocks.opamp.opamp_twostage import opamp_twostage
from glayout.flow.blocks.current_mirror import current_mirror_netlist
from glayout.flow.blocks.composite.opamp.opamp_twostage import opamp_twostage
from glayout.flow.blocks.elementary.current_mirror import current_mirror_netlist

def opamp_output_stage_netlist(pdk: MappedPDK, output_amp_fet_ref: ComponentReference, biasParams: list) -> Netlist:
bias_netlist = current_mirror_netlist(pdk, biasParams[0], biasParams[1], biasParams[2])
Expand Down
14 changes: 7 additions & 7 deletions ...ayout/flow/blocks/opamp/opamp_twostage.py → .../blocks/composite/opamp/opamp_twostage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from glayout.flow.pdk.mappedpdk import MappedPDK
from typing import Optional, Union
from glayout.flow.primitives.fet import nmos, pmos, multiplier
from glayout.flow.blocks.diff_pair import diff_pair
from glayout.flow.blocks.elementary.diff_pair import diff_pair
from glayout.flow.primitives.guardring import tapring
from glayout.flow.primitives.mimcap import mimcap_array, mimcap
from glayout.flow.routing.L_route import L_route
Expand All @@ -19,13 +19,13 @@
from pydantic import validate_arguments
from glayout.flow.placement.two_transistor_interdigitized import two_nfet_interdigitized

from glayout.flow.blocks.diffpair_cmirror_bias import diff_pair_ibias
from glayout.flow.blocks.stacked_current_mirror import stacked_nfet_current_mirror
from glayout.flow.blocks.differential_to_single_ended_converter import differential_to_single_ended_converter
from glayout.flow.blocks.opamp.row_csamplifier_diff_to_single_ended_converter import row_csamplifier_diff_to_single_ended_converter
from glayout.flow.blocks.opamp.diff_pair_stackedcmirror import diff_pair_stackedcmirror
from glayout.flow.blocks.composite.diffpair_cmirror_bias import diff_pair_ibias
from glayout.flow.blocks.composite.stacked_current_mirror import stacked_nfet_current_mirror
from glayout.flow.blocks.composite.differential_to_single_ended_converter import differential_to_single_ended_converter
from glayout.flow.blocks.composite.opamp.row_csamplifier_diff_to_single_ended_converter import row_csamplifier_diff_to_single_ended_converter
from glayout.flow.blocks.composite.opamp.diff_pair_stackedcmirror import diff_pair_stackedcmirror
from glayout.flow.spice import Netlist
from glayout.flow.blocks.current_mirror import current_mirror_netlist
from glayout.flow.blocks.elementary.current_mirror import current_mirror_netlist

@validate_arguments
def __create_and_route_pins(
Expand Down
2 changes: 1 addition & 1 deletion ...plifier_diff_to_single_ended_converter.py → ...plifier_diff_to_single_ended_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from glayout.flow.pdk.mappedpdk import MappedPDK
from typing import Optional, Union
from glayout.flow.primitives.fet import nmos, pmos, multiplier
from glayout.flow.blocks.diff_pair import diff_pair
from glayout.flow.blocks.elementary.diff_pair import diff_pair
from glayout.flow.primitives.guardring import tapring
from glayout.flow.primitives.mimcap import mimcap_array, mimcap
from glayout.flow.routing.L_route import L_route
Expand Down
1 change: 1 addition & 0 deletions ...fasoc/generators/glayout/glayout/flow/blocks/composite/stacked_current_mirror/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from .stacked_current_mirror import stacked_nfet_current_mirror
2 changes: 1 addition & 1 deletion ..._current_mirror/stacked_current_mirror.py → ..._current_mirror/stacked_current_mirror.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from glayout.flow.pdk.mappedpdk import MappedPDK
from typing import Optional, Union
from glayout.flow.primitives.fet import nmos, pmos, multiplier
from glayout.flow.blocks.diff_pair import diff_pair
from glayout.flow.blocks.elementary.diff_pair import diff_pair
from glayout.flow.primitives.guardring import tapring
from glayout.flow.primitives.mimcap import mimcap_array, mimcap
from glayout.flow.routing.L_route import L_route
Expand Down
1 change: 0 additions & 1 deletion openfasoc/generators/glayout/glayout/flow/blocks/current_mirror/__init__.py
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion openfasoc/generators/glayout/glayout/flow/blocks/diff_pair/__init__.py
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...generators/glayout/glayout/flow/blocks/differential_to_single_ended_converter/__init__.py
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion openfasoc/generators/glayout/glayout/flow/blocks/diffpair_cmirror_bias/__init__.py
View file
Open in desktop

This file was deleted.

Empty file added openfasoc/generators/glayout/glayout/flow/blocks/elementary/__init__.py
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions openfasoc/generators/glayout/glayout/flow/blocks/elementary/current_mirror/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from glayout.flow.blocks.elementary.current_mirror.current_mirror import current_mirror, current_mirror_netlist
0 ...w/blocks/current_mirror/current_mirror.py → ...ementary/current_mirror/current_mirror.py
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions openfasoc/generators/glayout/glayout/flow/blocks/elementary/diff_pair/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from glayout.flow.blocks.elementary.diff_pair.diff_pair import diff_pair, diff_pair_generic, diff_pair_netlist
0 ...layout/flow/blocks/diff_pair/diff_pair.py → .../blocks/elementary/diff_pair/diff_pair.py
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion openfasoc/generators/glayout/glayout/flow/blocks/opamp/__init__.py
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion openfasoc/generators/glayout/glayout/flow/blocks/stacked_current_mirror/__init__.py
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions openfasoc/generators/glayout/glayout/syntaxer/nltk_init_deps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ def check_and_download_nltk_data(data_name):


check_and_download_nltk_data("punkt")
check_and_download_nltk_data("punkt_tab")
2 changes: 1 addition & 1 deletion openfasoc/generators/glayout/glayout/syntaxer/relational.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ def __init__(self, toplvl_name: str):
two_pfet_interdigitized_aliases = list_cartesian_product(["interdigitized","interdigitated"],["pmos","pfet"],True)
self.update_import_table(two_pfet_interdigitized_aliases,"two_pfet_interdigitized","glayout.flow.placement.two_transistor_interdigitized")
self.update_import_table(["common centroid"],"common_centroid_ab_ba","glayout.flow.placement.common_centroid_ab_ba")
self.update_import_table(["diff pair","diff_pair","differential pair","differential pairs","differential transistor"],"diff_pair_generic","glayout.flow.blocks.diff_pair")
self.update_import_table(["diff pair","diff_pair","differential pair","differential pairs","differential transistor"],"diff_pair_generic","glayout.flow.blocks.elementary.diff_pair")
# import routing funcs
self.update_import_table(["smart route","smart","smart_route"],"smart_route","glayout.flow.routing.smart_route")
self.update_import_table(["L route","L_route","l route","l_route"],"L_route","glayout.flow.routing.L_route")
Expand Down
2 changes: 1 addition & 1 deletion openfasoc/generators/glayout/tapeout/tapeout_and_RL/sky130_nist_tapeout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from glayout.flow.pdk.util.port_utils import add_ports_perimeter, print_ports
from gdsfactory.component import Component
from glayout.flow.pdk.mappedpdk import MappedPDK
from glayout.flow.blocks.opamp import opamp
from glayout.flow.blocks.composite.opamp import opamp
from glayout.flow.routing.L_route import L_route
from glayout.flow.routing.straight_route import straight_route
from glayout.flow.routing.c_route import c_route
Expand Down