Merge branch 'main' into main

SiEPIC · Feb 11, 2024 · 184d453 · 184d453
2 parents 0d6cbfa + 0c4b8f8
commit 184d453
Show file tree

Hide file tree

Showing 101 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -53,11 +53,14 @@ jobs:
 
         # can also specify python version if needed
       - name: setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11' 
+          cache: 'pip'
 
       - name: install python packages
         run: |
-          python -m pip install --upgrade pip
+          # python -m pip install --upgrade pip
           pip install klayout SiEPIC siepic_ebeam_pdk
           python -m pip install --upgrade SiEPIC
 
@@ -76,7 +79,7 @@ jobs:
           mkdir -p merge_output
 
           for file in $output_files; do
-            cp "/home/runner/work/openEBL-2024-02/openEBL-2024-02/merge/$file" merge_output/
+            cp "merge/$file" merge_output/
           done
 
       - name: upload artifact

diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ The submission involves several steps. First, you need to create your design(s)
  - Fork a copy of this GitHub repository into your own account:  <a href="../../fork">Create a new fork</a>.
  - Turn on the GitHub Actions on your forked repository: <a href="../../actions">Actions</a> (In your repository's page on GitHub, click on Actions in the top-menu bar, and Enable the workflows).
  - [Optional] Install GitHub Desktop (or git) on your computer, and Clone a local copy: <a href="x-github-client://openRepo/https://github.com/SiEPIC/openEBL-2024-02">Open with GitHub Desktop</a>
- - Create your design, and ensure that the filename contains your <a href="https://www.edx.org/learn/engineering/university-of-british-columbia-silicon-photonics-design-fabrication-and-data-ana">edX.org</a> username, and be formatted according to the course/workshop as follows:
+ - Create your design, and ensure that the filename contains your <a href="https://www.edx.org/learn/engineering/university-of-british-columbia-silicon-photonics-design-fabrication-and-data-ana">edX.org</a> (or GitHub username if the edX one is a random string that does not contain your name), and be formatted according to the course/workshop as follows:
    - EBeam_username.oas: for the <a href="https://www.edx.org/learn/engineering/university-of-british-columbia-silicon-photonics-design-fabrication-and-data-ana">edX Phot1x silicon photonics design course</a>
    - ELEC413_username.oas: for the <a href="https://ece.ubc.ca/courses/elec-413/">UBC ELEC 413 course</a>
    - SiEPIC_Passives_username.oas: for the <a href="https://www.cmc.ca/passive-silicon-photonics-fabrication-workshop-2023">CMC SiEPIC Passives silicon photonics workshop</a>
@@ -64,5 +64,5 @@ Optional: The verification and merging is performed using GitHub actions. The re
 ## Latest Merge Layout File
 
 <!-- start-link -->
-https://github.com/SiEPIC/openEBL-2024-02/actions/runs/7848869443/artifacts/1234346860
+https://github.com/SiEPIC/openEBL-2024-02/actions/runs/7860310641/artifacts/1236292741
 <!-- end-link -->
diff --git a/merge/EBeam_merge.py b/merge/EBeam_merge.py
@@ -35,7 +35,7 @@
 layers_keep = ['1/0','1/10', '68/0', '81/0', '10/0', '99/0', '26/0', '31/0', '32/0', '33/0', '998/0']
 layer_text = '10/0'
 layer_SEM = '200/0'
-layer_SEM_allow = ['edX']  # which submission folder is allowed to include SEM images
+layer_SEM_allow = ['edXphot1x', 'ELEC413','SiEPIC_Passives']  # which submission folder is allowed to include SEM images
 dbu = 0.001
 log_siepictools = False
 framework_file = 'EBL_Framework_1cm_PCM_static.oas'

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,4 @@
+numpy
+scipy
+SiEPIC
+siepic_ebeam_pdk
diff --git a/submissions/EBEAM_NickL.gds b/submissions/EBEAM_NickL.gds
diff --git a/submissions/EBeam_Arefin_Islam_11.gds b/submissions/EBeam_Arefin_Islam_11.gds
diff --git a/submissions/EBeam_EthanJ_fpcavitiesLargen.oas b/submissions/EBeam_EthanJ_fpcavitiesLargen.oas
diff --git a/submissions/EBeam_EthanJ_fpcavitiesMediumn.oas b/submissions/EBeam_EthanJ_fpcavitiesMediumn.oas
diff --git a/submissions/EBeam_EthanJ_fpcavitiesPeriods.oas b/submissions/EBeam_EthanJ_fpcavitiesPeriods.oas
diff --git a/submissions/EBeam_EthanJ_fpcavitiesSmalln.oas b/submissions/EBeam_EthanJ_fpcavitiesSmalln.oas
diff --git a/submissions/EBeam_JohnGerguis.gds b/submissions/EBeam_JohnGerguis.gds
diff --git a/submissions/EBeam_JohnGerguis_B.gds b/submissions/EBeam_JohnGerguis_B.gds
diff --git a/submissions/EBeam_JohnGerguis_C.gds b/submissions/EBeam_JohnGerguis_C.gds
diff --git a/submissions/EBeam_Judson_RSS.GDS b/submissions/EBeam_Judson_RSS.GDS
diff --git a/submissions/Ebeam_BrianCLWu_3.gds → submissions/EBeam_KaailaashV.gds b/submissions/Ebeam_BrianCLWu_3.gds → submissions/EBeam_KaailaashV.gds
diff --git a/submissions/EBeam_LeelaQ.gds b/submissions/EBeam_LeelaQ.gds
diff --git a/submissions/EBeam_LeelaQv1.gds b/submissions/EBeam_LeelaQv1.gds
diff --git a/submissions/EBeam_LeelaQv2.gds b/submissions/EBeam_LeelaQv2.gds
diff --git a/submissions/EBeam_LeelaQv3.gds b/submissions/EBeam_LeelaQv3.gds
diff --git a/submissions/EBeam_Safarim1.gds b/submissions/EBeam_Safarim1.gds
diff --git a/submissions/EBeam_Safarim1_orig.gds b/submissions/EBeam_Safarim1_orig.gds
diff --git a/submissions/EBeam_XuchenZhang.gds b/submissions/EBeam_XuchenZhang.gds
diff --git a/submissions/EBeam_dmildenb.gds b/submissions/EBeam_dmildenb.gds
diff --git a/submissions/EBeam_elanarr13.gds b/submissions/EBeam_elanarr13.gds
diff --git a/submissions/EBeam_erikch.gds b/submissions/EBeam_erikch.gds
diff --git a/submissions/EBeam_jannatulnijhum.gds.gds b/submissions/EBeam_jannatulnijhum.gds.gds
diff --git a/submissions/EBeam_julyastein_v1.gds b/submissions/EBeam_julyastein_v1.gds
diff --git a/submissions/EBeam_lleustean_rings.gds b/submissions/EBeam_lleustean_rings.gds
diff --git a/submissions/EBeam_mariusminnen.GDS b/submissions/EBeam_mariusminnen.GDS
diff --git a/submissions/EBeam_mariusminnen.gds b/submissions/EBeam_mariusminnen.gds
diff --git a/submissions/EBeam_mariusminnen_A.gds b/submissions/EBeam_mariusminnen_A.gds
diff --git a/submissions/EBeam_mariusminnen_v1.GDS b/submissions/EBeam_mariusminnen_v1.GDS
diff --git a/submissions/EBeam_newmansc22B.gds b/submissions/EBeam_newmansc22B.gds
diff --git a/submissions/EBeam_newmansc22BB.gds b/submissions/EBeam_newmansc22BB.gds
diff --git a/submissions/EBeam_newmansc22C.gds b/submissions/EBeam_newmansc22C.gds
diff --git a/submissions/EBeam_newmansc22D.gds b/submissions/EBeam_newmansc22D.gds
diff --git a/submissions/EBeam_newmansc22DD.gds b/submissions/EBeam_newmansc22DD.gds
diff --git a/submissions/EBeam_newmansc22E.gds b/submissions/EBeam_newmansc22E.gds
diff --git a/submissions/EBeam_newmansc22EE.gds b/submissions/EBeam_newmansc22EE.gds
diff --git a/submissions/EBeam_rmicanekAA.gds b/submissions/EBeam_rmicanekAA.gds
diff --git a/submissions/EBeam_rmicanekB.gds b/submissions/EBeam_rmicanekB.gds
diff --git a/submissions/EBeam_rmicanekBB.gds b/submissions/EBeam_rmicanekBB.gds
diff --git a/submissions/EBeam_rmicanekC.gds b/submissions/EBeam_rmicanekC.gds
diff --git a/submissions/EBeam_rmicanekCC.gds b/submissions/EBeam_rmicanekCC.gds
diff --git a/submissions/EBeam_rmicanekD.gds b/submissions/EBeam_rmicanekD.gds
diff --git a/submissions/EBeam_rmicanekDD.gds b/submissions/EBeam_rmicanekDD.gds
diff --git a/submissions/EBeam_rmicanekE.gds b/submissions/EBeam_rmicanekE.gds
diff --git a/submissions/EBeam_rmicanekEE.gds b/submissions/EBeam_rmicanekEE.gds
diff --git a/submissions/EBeam_rmicanekF.gds b/submissions/EBeam_rmicanekF.gds
diff --git a/submissions/EBeam_rmicanekFF.gds b/submissions/EBeam_rmicanekFF.gds
diff --git a/submissions/EBeam_rwzhou.gds b/submissions/EBeam_rwzhou.gds
diff --git a/submissions/EBeam_shuowu_bragg.gds b/submissions/EBeam_shuowu_bragg.gds
diff --git a/submissions/ELEC413_475fac14b1844ea7b9e0f382c11eae_a.gds b/submissions/ELEC413_475fac14b1844ea7b9e0f382c11eae_a.gds
diff --git a/submissions/ELEC413_475fac14b1844ea7b9e0f382c11eae_b.gds b/submissions/ELEC413_475fac14b1844ea7b9e0f382c11eae_b.gds
diff --git a/submissions/ELEC413_ArthurB.gds b/submissions/ELEC413_ArthurB.gds
diff --git a/submissions/ELEC413_ArthurB_2.gds b/submissions/ELEC413_ArthurB_2.gds
diff --git a/submissions/ELEC413_BryceJacobs_1.gds b/submissions/ELEC413_BryceJacobs_1.gds
diff --git a/submissions/ELEC413_BryceJacobs_2.gds b/submissions/ELEC413_BryceJacobs_2.gds
diff --git a/submissions/ELEC413_GreyPoupon_10.oas b/submissions/ELEC413_GreyPoupon_10.oas
diff --git a/submissions/ELEC413_GreyPoupon_11.oas b/submissions/ELEC413_GreyPoupon_11.oas
diff --git a/submissions/ELEC413_GreyPoupon_3.oas b/submissions/ELEC413_GreyPoupon_3.oas
diff --git a/submissions/ELEC413_GreyPoupon_4.oas b/submissions/ELEC413_GreyPoupon_4.oas
diff --git a/submissions/ELEC413_GreyPoupon_5.oas b/submissions/ELEC413_GreyPoupon_5.oas
diff --git a/submissions/ELEC413_GreyPoupon_6.oas b/submissions/ELEC413_GreyPoupon_6.oas
diff --git a/submissions/ELEC413_GreyPoupon_7.oas b/submissions/ELEC413_GreyPoupon_7.oas
diff --git a/submissions/ELEC413_GreyPoupon_8.oas b/submissions/ELEC413_GreyPoupon_8.oas
diff --git a/submissions/ELEC413_GreyPoupon_9.oas b/submissions/ELEC413_GreyPoupon_9.oas
diff --git a/submissions/ELEC413_TheTian.gds b/submissions/ELEC413_TheTian.gds
diff --git a/submissions/ELEC413_Tsuchijo_a.gds b/submissions/ELEC413_Tsuchijo_a.gds
diff --git a/submissions/ELEC413_arnankabir_layout1.gds.gds b/submissions/ELEC413_arnankabir_layout1.gds.gds
diff --git a/submissions/ELEC413_arnankabir_layout2.gds.gds b/submissions/ELEC413_arnankabir_layout2.gds.gds
diff --git a/submissions/ELEC413_aychen00_A.gds b/submissions/ELEC413_aychen00_A.gds
diff --git a/submissions/ELEC413_aychen00_B.gds b/submissions/ELEC413_aychen00_B.gds
diff --git a/submissions/ELEC413_ayu07_1.gds b/submissions/ELEC413_ayu07_1.gds
diff --git a/submissions/ELEC413_ayu07_2.gds b/submissions/ELEC413_ayu07_2.gds
diff --git a/submissions/ELEC413_ayu07_3.gds b/submissions/ELEC413_ayu07_3.gds
diff --git a/submissions/ELEC413_brianclwu.gds b/submissions/ELEC413_brianclwu.gds
diff --git a/submissions/ELEC413_brianclwu_design2.gds b/submissions/ELEC413_brianclwu_design2.gds
diff --git a/submissions/ELEC413_brianclwu_design3.gds b/submissions/ELEC413_brianclwu_design3.gds
diff --git a/submissions/ELEC413_caseyhill.GDS b/submissions/ELEC413_caseyhill.GDS
diff --git a/submissions/ELEC413_glojui00_extradesigns.gds b/submissions/ELEC413_glojui00_extradesigns.gds
diff --git a/submissions/ELEC413_jaydensahl.gds b/submissions/ELEC413_jaydensahl.gds
diff --git a/submissions/ELEC413_joshuaj7.gds b/submissions/ELEC413_joshuaj7.gds
diff --git a/submissions/ELEC413_joshuaj7_layout2.gds b/submissions/ELEC413_joshuaj7_layout2.gds
diff --git a/submissions/ELEC413_jwgood_P1BG.oas b/submissions/ELEC413_jwgood_P1BG.oas
diff --git a/submissions/ELEC413_mbahrani_ubc.gds b/submissions/ELEC413_mbahrani_ubc.gds
diff --git a/submissions/ELEC413_polinashopina.gds b/submissions/ELEC413_polinashopina.gds
diff --git a/submissions/ELEC413_prayetnaa_1.gds b/submissions/ELEC413_prayetnaa_1.gds
diff --git a/submissions/ELEC413_thomasm.gds b/submissions/ELEC413_thomasm.gds
diff --git a/submissions/ELEC413_thomasm_V1_V7_1.gds b/submissions/ELEC413_thomasm_V1_V7_1.gds
diff --git a/submissions/ELEC413_thomasm_V4s_V7s_2.gds b/submissions/ELEC413_thomasm_V4s_V7s_2.gds
diff --git a/submissions/ELEC413_thomasm_V8_V3s_3.gds b/submissions/ELEC413_thomasm_V8_V3s_3.gds
diff --git a/submissions/ELEC413_trisse.GDS b/submissions/ELEC413_trisse.GDS
diff --git a/submissions/ELEC413_vbanh_a.gds b/submissions/ELEC413_vbanh_a.gds
diff --git a/submissions/ELEC413_vbanh_b.gds b/submissions/ELEC413_vbanh_b.gds
diff --git a/submissions/Ebeam_Andrew_Project_1.gds b/submissions/Ebeam_Andrew_Project_1.gds
diff --git a/submissions/Ebeam_BrianCLWu.gds b/submissions/Ebeam_BrianCLWu.gds
diff --git a/submissions/Ebeam_BrianCLWu_2.gds b/submissions/Ebeam_BrianCLWu_2.gds
diff --git a/submissions/Ebeam_OmidEs_v2.oas b/submissions/Ebeam_OmidEs_v2.oas
diff --git a/submissions/SiEPIC_Passives_YiranGuan.gds b/submissions/SiEPIC_Passives_YiranGuan.gds
diff --git a/submissions/SiEPIC_Passives_niteb_v2.oas b/submissions/SiEPIC_Passives_niteb_v2.oas