Merge pull request #354 from gdsfactory/update_sax

Update sax
gdsfactory · Mar 7, 2024 · 45d25f9 · 45d25f9
2 parents b3db0d5 + 3345ad1
commit 45d25f9
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 42 deletions.
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -1,4 +1,4 @@
-name: Sphinx docs to gh-pages
+name: Build docs
 
 on:
   push:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: Release PyPI, installers and docker container
+name: Release package
 
 on:
   push:

diff --git a/.github/workflows/test_code.yml b/.github/workflows/test_code.yml
@@ -63,34 +63,6 @@ jobs:
           micromamba install -c conda-forge pymeep=*=mpi_mpich_* nlopt -y
           pip install -e .[dev]
           pytest gplugins/gmeep gplugins/modes
-  test_non_pip:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      max-parallel: 2
-      matrix:
-        os: [ubuntu-latest]
-        plugin: [elmer]
-    name: Test ${{ matrix.plugin }} on ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cache/pip
-          key: ${{ hashFiles('pyproject.toml') }}
-      - uses: actions/setup-python@v5
-        with:
-          python-version: 3.11
-      - name: Install dependencies
-        run: |
-          make gmsh
-          make ${{ matrix.plugin }}
-          pip install -e .[dev,gmsh]
-      - name: Test with pytest
-        env:
-          GDSFACTORY_DISPLAY_TYPE: klayout
-        run: pytest gplugins/${{ matrix.plugin }}
   test_code_coverage:
     runs-on: ubuntu-latest
     steps:

diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,8 @@ __pycache__/
 temp.msh2
 docs/notebooks/temporary
 docs/notebooks/batch-*
+.virtual_documents/
+
 
 # C extensions
 *.so

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -23,6 +23,7 @@ execute:
     - "*02_model_extraction*"
     - "*palace*"
     - "*fdtdz*"
+    - "*elmer_01_electrostatic*"
     # - "*sax_01_sax*"
     # - "*20_schematic_driven_layout*"
     # - "*001_meep_sparameters*"

diff --git a/notebooks/20_schematic_driven_layout.ipynb b/notebooks/20_schematic_driven_layout.ipynb
@@ -360,7 +360,7 @@
    "custom_cell_magics": "kql"
   },
   "kernelspec": {
-   "display_name": "base",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },

diff --git a/notebooks/sax_01_sax.ipynb b/notebooks/sax_01_sax.ipynb
@@ -2061,7 +2061,7 @@
    "custom_cell_magics": "kql"
   },
   "kernelspec": {
-   "display_name": "base",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },

diff --git a/notebooks/sdl_demo.pic.yml b/notebooks/sdl_demo.pic.yml
@@ -9,12 +9,10 @@ instances:
     settings: {gap_mmi: 0.7}
   s1:
     component: straight
-    settings: {length: 20, npoints: 2, layer: null, width: null, add_pins: true, cross_section: xs_sc,
-      add_bbox: null}
+    settings: {length: 20, npoints: 2, cross_section: xs_sc, post_process: null, info: null}
   s2:
     component: straight
-    settings: {length: 40, npoints: 2, layer: null, width: null, add_pins: true, cross_section: xs_sc,
-      add_bbox: null}
+    settings: {length: 40, npoints: 2, cross_section: xs_sc, post_process: null, info: null}
 placements:
   mmi1: {x: null, y: null, port: null, rotation: 0.0, dx: -22.832156230736544, dy: -0.9358105716724547,
     mirror: null}

diff --git a/notebooks/test.schem.yml b/notebooks/test.schem.yml
@@ -8,12 +8,10 @@ instances:
     settings: {gap_mmi: 0.7}
   s1:
     component: straight
-    settings: {length: 20, npoints: 2, layer: null, width: null, add_pins: true, cross_section: xs_sc,
-      add_bbox: null}
+    settings: {length: 20, npoints: 2, cross_section: xs_sc, post_process: null, info: null}
   s2:
     component: straight
-    settings: {length: 40, npoints: 2, layer: null, width: null, add_pins: true, cross_section: xs_sc,
-      add_bbox: null}
+    settings: {length: 40, npoints: 2, cross_section: xs_sc, post_process: null, info: null}
 schematic_placements:
   mmi1: {x: null, y: null, port: null, rotation: 0.0, dx: -22.832156230736544, dy: -0.9358105716724547,
     mirror: null}

diff --git a/pyproject.toml b/pyproject.toml
@@ -89,7 +89,7 @@ meow = [
 sax = [
   "jax<=0.4.23",
   "jaxlib<=0.4.23",
-  "sax>=0.11.1,<0.12.0",
+  "sax>=0.12.1,<0.13.0",
   "scikit-learn",
   "pyvis<=0.3.1"
 ]
@@ -131,7 +131,8 @@ norecursedirs = [
   'gplugins/devsim',
   'gplugins/sax/integrations',
   'gplugins/tidy3d/tests/tests_sparameters',
-  'gplugins/fdtdz'
+  'gplugins/fdtdz',
+  'gplugins/elmer'
 ]
 python_files = ["gplugins/*.py", "notebooks/*.ipynb", "tests/*.py"]
 testpaths = ["gplugins/", "tests"]