From 128c2668744c78f91429aebd913485368f26e318 Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Fri, 10 Nov 2023 15:37:49 -0800 Subject: [PATCH 001/173] Attempting with new image and uncommented lines in test script --- .../EBeam/pymacros/EBeam_Lib_PCellTests.py | 33 ++++--------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py index eab8223b..63196be4 100644 --- a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py +++ b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py @@ -6,7 +6,7 @@ #import pcells_EBeam ### folder name ### import importlib -# Equivalent to from custom_exceptions_path import * +# Equivalent to 'from custom_exceptions_path import *' current_directory = os.path.dirname(os.path.abspath(__file__)) custom_exceptions_path = os.path.join(current_directory, 'custom_exceptions.py') exec(open(custom_exceptions_path).read()) @@ -26,7 +26,6 @@ 2023/10/30, Jasmina Brar - raise exceptions when errors occur and exits under these conditions - tests successful pcell registration in all libraries - """ library_folders = ["pcells_EBeam", "pcells_EBeam_Beta", "pcells_SiN"] @@ -35,24 +34,20 @@ for i in range(len(library_folders)): - # get all .py files in library folder + # Get all .py files in library folder files = [f for f in os.listdir(os.path.join(os.path.dirname( os.path.realpath(__file__)),library_folders[i])) if '.py' in pathlib.Path(f).suffixes and '__init__' not in f] importlib.invalidate_caches() - # get library layout object + # Get library layout object tech_name = tech_names[i] library_name = library_names[i] library = pya.Library().library_by_name(library_name,tech_name) - # With self hosted runner, EBeam library is not being initialized, skip over it - if library == None: - break; - layout = library.layout() - # check that the library is registered in klayout + # Check that the library is registered in klayout try: if layout == None: raise LibraryNotRegistered(library_name) @@ -61,17 +56,17 @@ print("Caught {}: {}".format(type(e).__name__, str(e))) pya.Application.instance().exit(1) - # loop through all pcells from this library's folder + # Loop through all pcells from this library's folder for f in files: try: mm = f.replace('.py','') - # check that the pcell has been registered in the library's layout + # Check that the pcell has been registered in the library's layout if mm not in layout.pcell_names(): raise PCellRegistrationError(mm, library_name) - # instantiate pcell in a new layer and check that it contains polygons + # Instantiate pcell in a new layer and check that it contains polygons new_layout = pya.Layout() pcell_decl = layout.pcell_declaration(mm) new_layout.register_pcell(mm, pcell_decl) @@ -95,17 +90,3 @@ print("Complete. All pcells from {} folder were successfully registered in {} library".format(library_folders[i], library_names[i])) print("Complete. All pcells were succcessfully registered in all libraries.") - - - - - - - - - - - - - - From 5e9a4ae0e49761511c4ddbb9741fde6a5255a231 Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Sat, 11 Nov 2023 12:31:45 -0800 Subject: [PATCH 002/173] Pushed new image again to test latest version of SiEPIC repos --- .github/workflows/EBeam_Tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 693efbae..9e0acf6b 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -1,4 +1,3 @@ - name: EBeam Tests on: From 32d0635d0b9af64109f09847d605b439237b4b33 Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Sat, 11 Nov 2023 17:01:04 -0800 Subject: [PATCH 003/173] Adding libx11 packages to docker image and triggering workflow --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 9e0acf6b..c6a3c3a9 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -39,4 +39,4 @@ jobs: if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then echo "KLayout exited with non-zero exit code" exit 1 - fi + fi From 608b4cf21c23c57d06ceb478ec1949f83375b5e4 Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Sat, 11 Nov 2023 17:10:12 -0800 Subject: [PATCH 004/173] Adding xvfb steps in yaml file --- .github/workflows/EBeam_Tests.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index c6a3c3a9..cdaa26a2 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -15,10 +15,19 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 + + - name: Install Xvfb + run: sudo apt-get install -y xvfb - name: Pull siepic_klayout image run: docker pull ghcr.io/farihais/siepic_klayout:latest + - name: Start Xvfb + run: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & + + - name: Set display variable + run: export DISPLAY=:99 + - name: Run docker container from image run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/farihais/siepic_klayout:latest @@ -33,6 +42,9 @@ jobs: run: | docker stop ebeam_test docker rm ebeam_test + + - name: Stop Xvfb + run: killall Xvfb - name: Fail job if exit code is non-zero run: | From a53a842a814f857c8a9e5b4298144ae7b7c4cb41 Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Sat, 11 Nov 2023 17:25:21 -0800 Subject: [PATCH 005/173] Installing X11 dependencies inside yaml file --- .github/workflows/EBeam_Tests.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index cdaa26a2..2c11bb8c 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -16,8 +16,15 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: Install Xvfb - run: sudo apt-get install -y xvfb + - name: Install Xvfb and X11 dependencies + run: sudo apt-get install -y xvfb libx11-dev libxkbcommon-x11-0 + background: true + + - name: Debug Xvfb + run: | + export DISPLAY=:99 + echo $DISPLAY + ps aux | grep Xvfb - name: Pull siepic_klayout image run: docker pull ghcr.io/farihais/siepic_klayout:latest @@ -29,7 +36,7 @@ jobs: run: export DISPLAY=:99 - name: Run docker container from image - run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/farihais/siepic_klayout:latest + run: docker run -itd --name ebeam_test -e DISPLAY=:99 -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/farihais/siepic_klayout:latest - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros From 871d43455c5e782f48a3abecd2865e7a8b9f2cad Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Sat, 11 Nov 2023 17:26:33 -0800 Subject: [PATCH 006/173] Removed incorrect background setting in yaml file --- .github/workflows/EBeam_Tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 2c11bb8c..2cdc337d 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -18,7 +18,6 @@ jobs: - name: Install Xvfb and X11 dependencies run: sudo apt-get install -y xvfb libx11-dev libxkbcommon-x11-0 - background: true - name: Debug Xvfb run: | From 85952e73727728b7323738fa61d8bbaac40d71e4 Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Sat, 11 Nov 2023 17:34:36 -0800 Subject: [PATCH 007/173] Added xhost + command in yaml file --- .github/workflows/EBeam_Tests.yml | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 2cdc337d..66d8b653 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -16,26 +16,14 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: Install Xvfb and X11 dependencies - run: sudo apt-get install -y xvfb libx11-dev libxkbcommon-x11-0 - - - name: Debug Xvfb - run: | - export DISPLAY=:99 - echo $DISPLAY - ps aux | grep Xvfb - - name: Pull siepic_klayout image run: docker pull ghcr.io/farihais/siepic_klayout:latest - - name: Start Xvfb - run: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - - - name: Set display variable - run: export DISPLAY=:99 - + - name: Run xhost command + run: xhost +local:docker + - name: Run docker container from image - run: docker run -itd --name ebeam_test -e DISPLAY=:99 -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/farihais/siepic_klayout:latest + run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/farihais/siepic_klayout:latest - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros @@ -49,9 +37,6 @@ jobs: docker stop ebeam_test docker rm ebeam_test - - name: Stop Xvfb - run: killall Xvfb - - name: Fail job if exit code is non-zero run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then From 6fd0534760c84b67d444c68679cba8f47da94ff1 Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Sat, 11 Nov 2023 17:40:27 -0800 Subject: [PATCH 008/173] Adding xfvb run in exec command in yaml file --- .github/workflows/EBeam_Tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 66d8b653..83befd4f 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -21,7 +21,7 @@ jobs: - name: Run xhost command run: xhost +local:docker - + - name: Run docker container from image run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/farihais/siepic_klayout:latest @@ -29,7 +29,7 @@ jobs: run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros - name: Run KLayout Python script inside container and capture exit code - run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + run: docker exec ebeam_test xvfb-run -a -s "-screen 0 1024x768x24" klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true - name: Stop container and remove it From c50d1f68144715ebc5e9e8c5c60ff384ec95ae7b Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Sat, 11 Nov 2023 17:43:38 -0800 Subject: [PATCH 009/173] Removing xhost + command --- .github/workflows/EBeam_Tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 83befd4f..29c869cf 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -19,9 +19,6 @@ jobs: - name: Pull siepic_klayout image run: docker pull ghcr.io/farihais/siepic_klayout:latest - - name: Run xhost command - run: xhost +local:docker - - name: Run docker container from image run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/farihais/siepic_klayout:latest From dc197fa39ca5c1532fe32a530518b9350afd1192 Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Sat, 11 Nov 2023 18:02:56 -0800 Subject: [PATCH 010/173] Added xvfb package inside docker file --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 29c869cf..6d5aa309 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -1,4 +1,4 @@ -name: EBeam Tests +name: EBeam Tests on: push: From 670eea12012fa8221e8ad9f10c1a8cddac6a6465 Mon Sep 17 00:00:00 2001 From: jasminabrar Date: Tue, 14 Nov 2023 09:38:12 -0800 Subject: [PATCH 011/173] Dockerfile for testing on this repo --- Dockerfile | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..9a4fce58 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,23 @@ +FROM quay.io/centos/centos:stream8 + +# Update the system and install necessary tools +RUN dnf -y update && \ + dnf -y install wget bzip2 unzip git mesa-dri-drivers + +# Install the newest version of KLayout +RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm -O ~/klayout.rpm && \ + dnf -y localinstall ~/klayout.rpm && \ + rm ~/klayout.rpm + +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK +RUN mkdir -p /root/.klayout/salt && \ + cd /root/.klayout/salt && \ + git clone https://github.com/SiEPIC/SiEPIC-Tools.git && \ + git clone https://github.com/SiEPIC/SiEPIC_EBeam_PDK.git + +# Set the working directory +WORKDIR /home + +# Set PATH +ENV PATH="/usr/local/bin:${PATH}" +ENV QT_QPA_PLATFORM=minimal From bf20122b1a7efca846276ef8a77d4b454718c2d0 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Tue, 14 Nov 2023 09:54:09 -0800 Subject: [PATCH 012/173] Delete Dockerfile --- Dockerfile | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 9a4fce58..00000000 --- a/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM quay.io/centos/centos:stream8 - -# Update the system and install necessary tools -RUN dnf -y update && \ - dnf -y install wget bzip2 unzip git mesa-dri-drivers - -# Install the newest version of KLayout -RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm -O ~/klayout.rpm && \ - dnf -y localinstall ~/klayout.rpm && \ - rm ~/klayout.rpm - -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK -RUN mkdir -p /root/.klayout/salt && \ - cd /root/.klayout/salt && \ - git clone https://github.com/SiEPIC/SiEPIC-Tools.git && \ - git clone https://github.com/SiEPIC/SiEPIC_EBeam_PDK.git - -# Set the working directory -WORKDIR /home - -# Set PATH -ENV PATH="/usr/local/bin:${PATH}" -ENV QT_QPA_PLATFORM=minimal From 72a494c6acc1f1f3041ac5bafe2059cc61ea3e23 Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Tue, 14 Nov 2023 10:39:05 -0800 Subject: [PATCH 013/173] Reverting test script to last actions passing version --- .../EBeam/pymacros/EBeam_Lib_PCellTests.py | 58 +++++++++---------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py index 37303b0c..02c175d2 100644 --- a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py +++ b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py @@ -6,7 +6,7 @@ #import pcells_EBeam ### folder name ### import importlib -# Equivalent to 'from custom_exceptions_path import *' +# Equivalent to from custom_exceptions_path import * current_directory = os.path.dirname(os.path.abspath(__file__)) custom_exceptions_path = os.path.join(current_directory, 'custom_exceptions.py') exec(open(custom_exceptions_path).read()) @@ -16,40 +16,42 @@ To run this script from the command line: '{path to klayout} -e -r {path to this script/EBeam_Lib_PCellTests.py}'. This script can also be run within KLayout. -s + This is a preliminary test script and will be implemented using GitHub Actions to be run every time a new Pcell is added to the code base. by Jasmina Brar 2023/08 == Change log == -2023/10/30, Jasmina Brar. +2023/10/30, Jasmina Brar - raise exceptions when errors occur and exits under these conditions - tests successful pcell registration in all libraries """ -library_folders = ["pcells_EBeam", "pcells_EBeam_Beta", "pcells_SiN","pcells_EBeam_Dream"] -library_names = ["EBeam", "EBeam_Beta", "EBeam-SiN", "EBeam-Dream"] -tech_names = ["EBeam", "EBeam", "EBeam","EBeam"] +library_folders = ["pcells_EBeam", "pcells_EBeam_Beta", "pcells_SiN"] +library_names = ["EBeam", "EBeam_Beta", "EBeam-SiN"] +tech_names = ["EBeam", "EBeam", "EBeam"] for i in range(len(library_folders)): - # Get all .py files in library folder + # get all .py files in library folder files = [f for f in os.listdir(os.path.join(os.path.dirname( os.path.realpath(__file__)),library_folders[i])) if '.py' in pathlib.Path(f).suffixes and '__init__' not in f] - + importlib.invalidate_caches() - - # Get library layout object + + # get library layout object tech_name = tech_names[i] library_name = library_names[i] library = pya.Library().library_by_name(library_name,tech_name) - - print('*** Testing library: %s' % library_name) - + + # With self hosted runner, EBeam library is not being initialized, skip over it + if library == None: + break; + layout = library.layout() - - # Check that the library is registered in klayout + + # check that the library is registered in klayout try: if layout == None: raise LibraryNotRegistered(library_name) @@ -57,44 +59,38 @@ except LibraryNotRegistered as e: print("Caught {}: {}".format(type(e).__name__, str(e))) pya.Application.instance().exit(1) - - # Loop through all pcells from this library's folder + + # loop through all pcells from this library's folder for f in files: try: mm = f.replace('.py','') - - print(' * Testing cell: %s' % mm) - # Check that the pcell has been registered in the library's layout + # check that the pcell has been registered in the library's layout if mm not in layout.pcell_names(): raise PCellRegistrationError(mm, library_name) - # Instantiate pcell in a new layer and check that it contains polygons + # instantiate pcell in a new layer and check that it contains polygons new_layout = pya.Layout() pcell_decl = layout.pcell_declaration(mm) new_layout.register_pcell(mm, pcell_decl) parameter_decl = pcell_decl.get_parameters() - + all_params = {} for p in parameter_decl: all_params[p.name] = p.default - + pcell = new_layout.create_cell(mm, all_params) - if pcell.is_empty() or pcell.bbox().area() == 0: - raise PCellInstantiationError(mm, library_name) - - #topcell = new_layout.create_cell("top") - #t = Trans(Trans.R0, 0,0) - #inst = topcell.insert(CellInstArray(pcell.cell_index(), t)) - + if pcell.is_empty(): + if mm != 'phc_test': + raise PCellInstantiationError(mm, library_name) except (PCellRegistrationError, PCellInstantiationError) as e: print("Caught {}: {}".format(type(e).__name__, str(e))) pya.Application.instance().exit(1) - + print("Complete. All pcells from {} folder were successfully registered in {} library".format(library_folders[i], library_names[i])) print("Complete. All pcells were succcessfully registered in all libraries.") From e13f2dfd95e181d114530bf7fbd6e95d7f3345a8 Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Tue, 14 Nov 2023 10:54:25 -0800 Subject: [PATCH 014/173] Fixed missing library name ebeam dream --- .../EBeam/pymacros/EBeam_Lib_PCellTests.py | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py index 02c175d2..5548cca9 100644 --- a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py +++ b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py @@ -6,7 +6,7 @@ #import pcells_EBeam ### folder name ### import importlib -# Equivalent to from custom_exceptions_path import * +# Equivalent to "from custom_exceptions_path import *" current_directory = os.path.dirname(os.path.abspath(__file__)) custom_exceptions_path = os.path.join(current_directory, 'custom_exceptions.py') exec(open(custom_exceptions_path).read()) @@ -28,55 +28,57 @@ - tests successful pcell registration in all libraries """ -library_folders = ["pcells_EBeam", "pcells_EBeam_Beta", "pcells_SiN"] -library_names = ["EBeam", "EBeam_Beta", "EBeam-SiN"] -tech_names = ["EBeam", "EBeam", "EBeam"] +library_folders = ["pcells_EBeam", "pcells_EBeam_Beta", "pcells_SiN", "pcells_EBeam_Dream"] +library_names = ["EBeam", "EBeam_Beta", "EBeam-SiN", "EBeam-Dream"] +tech_names = ["EBeam", "EBeam", "EBeam", "EBeam"] for i in range(len(library_folders)): - # get all .py files in library folder + # Get all .py files in library folder files = [f for f in os.listdir(os.path.join(os.path.dirname( os.path.realpath(__file__)),library_folders[i])) if '.py' in pathlib.Path(f).suffixes and '__init__' not in f] importlib.invalidate_caches() - - # get library layout object + + # Get library layout object tech_name = tech_names[i] library_name = library_names[i] library = pya.Library().library_by_name(library_name,tech_name) - + + print('*** Testing library: %s' % library_name) + # With self hosted runner, EBeam library is not being initialized, skip over it if library == None: break; layout = library.layout() - - # check that the library is registered in klayout + + # Check that the library is registered in klayout try: if layout == None: raise LibraryNotRegistered(library_name) - + except LibraryNotRegistered as e: print("Caught {}: {}".format(type(e).__name__, str(e))) pya.Application.instance().exit(1) - - # loop through all pcells from this library's folder + + # Loop through all pcells from this library's folder for f in files: - + try: mm = f.replace('.py','') - - # check that the pcell has been registered in the library's layout + + # Check that the pcell has been registered in the library's layout if mm not in layout.pcell_names(): raise PCellRegistrationError(mm, library_name) - - # instantiate pcell in a new layer and check that it contains polygons + + # Instantiate pcell in a new layer and check that it contains polygons new_layout = pya.Layout() pcell_decl = layout.pcell_declaration(mm) new_layout.register_pcell(mm, pcell_decl) - + parameter_decl = pcell_decl.get_parameters() - + all_params = {} for p in parameter_decl: all_params[p.name] = p.default @@ -90,7 +92,7 @@ except (PCellRegistrationError, PCellInstantiationError) as e: print("Caught {}: {}".format(type(e).__name__, str(e))) pya.Application.instance().exit(1) - - print("Complete. All pcells from {} folder were successfully registered in {} library".format(library_folders[i], library_names[i])) + print("Complete. All pcells from {} folder were successfully registered in {} library".format(library_folders[i], library_names[i])) + print("Complete. All pcells were succcessfully registered in all libraries.") From 896b8d3c09dfb2344063f358f741fe1bc232e527 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Tue, 14 Nov 2023 10:59:33 -0800 Subject: [PATCH 015/173] Adding comments --- klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py index 5548cca9..610ec6f8 100644 --- a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py +++ b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py @@ -25,7 +25,7 @@ == Change log == 2023/10/30, Jasmina Brar - raise exceptions when errors occur and exits under these conditions - - tests successful pcell registration in all libraries + - tests successful pcell registration in all libraries except 'EBeam' """ library_folders = ["pcells_EBeam", "pcells_EBeam_Beta", "pcells_SiN", "pcells_EBeam_Dream"] @@ -47,7 +47,7 @@ print('*** Testing library: %s' % library_name) - # With self hosted runner, EBeam library is not being initialized, skip over it + # With cloud hosted runner, EBeam library is not being initialized, skip over it if library == None: break; @@ -86,7 +86,7 @@ pcell = new_layout.create_cell(mm, all_params) if pcell.is_empty(): - if mm != 'phc_test': + if mm != 'phc_test': # this pcell has an empty python script, skip over it raise PCellInstantiationError(mm, library_name) except (PCellRegistrationError, PCellInstantiationError) as e: From e239b6ef9e43141bd15166be81db44507e328338 Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Tue, 14 Nov 2023 11:03:05 -0800 Subject: [PATCH 016/173] Removing ebeam dream from libnames temporarily from test script --- klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py index 5548cca9..e75a3fca 100644 --- a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py +++ b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py @@ -28,9 +28,9 @@ - tests successful pcell registration in all libraries """ -library_folders = ["pcells_EBeam", "pcells_EBeam_Beta", "pcells_SiN", "pcells_EBeam_Dream"] -library_names = ["EBeam", "EBeam_Beta", "EBeam-SiN", "EBeam-Dream"] -tech_names = ["EBeam", "EBeam", "EBeam", "EBeam"] +library_folders = ["pcells_EBeam", "pcells_EBeam_Beta", "pcells_SiN"] +library_names = ["EBeam", "EBeam_Beta", "EBeam-SiN"] +tech_names = ["EBeam", "EBeam", "EBeam"] for i in range(len(library_folders)): @@ -94,5 +94,5 @@ pya.Application.instance().exit(1) print("Complete. All pcells from {} folder were successfully registered in {} library".format(library_folders[i], library_names[i])) - + print("Complete. All pcells were succcessfully registered in all libraries.") From 199b2c89b09529b5f4883e3bb8603de3e1a356e0 Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Tue, 14 Nov 2023 11:07:27 -0800 Subject: [PATCH 017/173] Adding redundant period to trigger workflow; ebeam dream still temporarily removed --- klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py index 545bead5..f5ce5897 100644 --- a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py +++ b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py @@ -23,7 +23,7 @@ 2023/08 == Change log == -2023/10/30, Jasmina Brar +2023/10/30, Jasmina Brar. - raise exceptions when errors occur and exits under these conditions - tests successful pcell registration in all libraries except 'EBeam' """ From cad1ccc9e1f50d0f0e1cc45d273756d2fba16efe Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Tue, 14 Nov 2023 11:25:50 -0800 Subject: [PATCH 018/173] Pulling reverted version of image --- .github/workflows/EBeam_Tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 6d5aa309..72f89268 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -17,10 +17,10 @@ jobs: uses: actions/checkout@v3 - name: Pull siepic_klayout image - run: docker pull ghcr.io/farihais/siepic_klayout:latest + run: docker pull ghcr.io/farihais/siepic_klayout:1.0 - name: Run docker container from image - run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/farihais/siepic_klayout:latest + run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/farihais/siepic_klayout:1.0 - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros From 01c0af62160dfb266dad2e88392f5442cabd4392 Mon Sep 17 00:00:00 2001 From: Fariha Shaikh Date: Tue, 14 Nov 2023 11:30:38 -0800 Subject: [PATCH 019/173] Removing xvfb part of klayout exec command --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 72f89268..dd091399 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -26,7 +26,7 @@ jobs: run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros - name: Run KLayout Python script inside container and capture exit code - run: docker exec ebeam_test xvfb-run -a -s "-screen 0 1024x768x24" klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true - name: Stop container and remove it From abcca18d8030882ae3aded6141ae6af3cead3d47 Mon Sep 17 00:00:00 2001 From: jasminabrar Date: Wed, 15 Nov 2023 09:08:22 -0800 Subject: [PATCH 020/173] for building docker image on github actions --- Dockerfile | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..9a4fce58 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,23 @@ +FROM quay.io/centos/centos:stream8 + +# Update the system and install necessary tools +RUN dnf -y update && \ + dnf -y install wget bzip2 unzip git mesa-dri-drivers + +# Install the newest version of KLayout +RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm -O ~/klayout.rpm && \ + dnf -y localinstall ~/klayout.rpm && \ + rm ~/klayout.rpm + +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK +RUN mkdir -p /root/.klayout/salt && \ + cd /root/.klayout/salt && \ + git clone https://github.com/SiEPIC/SiEPIC-Tools.git && \ + git clone https://github.com/SiEPIC/SiEPIC_EBeam_PDK.git + +# Set the working directory +WORKDIR /home + +# Set PATH +ENV PATH="/usr/local/bin:${PATH}" +ENV QT_QPA_PLATFORM=minimal From 3f1df8e82ee93a9c96e0ab93b217aebe5cec17e0 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 09:12:49 -0800 Subject: [PATCH 021/173] Create docker-image.yml New GitHub actions workflow to build docker image --- .github/workflows/docker-image.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 00000000..390fba0a --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,18 @@ +name: Docker Image CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Build the Docker image + run: docker build . --file Dockerfile --1.0 siepic_klayout:$(date +%s) From 8972d302bdbf2e242a77f232ab49a9663554244f Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 09:15:31 -0800 Subject: [PATCH 022/173] Update docker-image.yml updating tag --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 390fba0a..2ac1e52e 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -15,4 +15,4 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build the Docker image - run: docker build . --file Dockerfile --1.0 siepic_klayout:$(date +%s) + run: docker build . --file Dockerfile --latest siepic_klayout:$(date +%s) From 4b444a16bdb6b4c76d19e4dfd2701b56105730ba Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 09:17:02 -0800 Subject: [PATCH 023/173] Update docker-image.yml changing back to --tag --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 2ac1e52e..8ed9c1fe 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -15,4 +15,4 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build the Docker image - run: docker build . --file Dockerfile --latest siepic_klayout:$(date +%s) + run: docker build . --file Dockerfile --tag siepic_klayout:$(date +%s) From c40fcc36b2fedef8795603086bb393052e7c8020 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 09:28:32 -0800 Subject: [PATCH 024/173] Use new docker image built using GitHub actions --- .github/workflows/EBeam_Tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index dd091399..6f5487da 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -17,7 +17,8 @@ jobs: uses: actions/checkout@v3 - name: Pull siepic_klayout image - run: docker pull ghcr.io/farihais/siepic_klayout:1.0 + run: docker pull docker.io/library/siepic_klayout:1700068664 + #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 - name: Run docker container from image run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/farihais/siepic_klayout:1.0 From d374e3fdb276d3d718912476d1a938608aa3a0d3 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 09:38:59 -0800 Subject: [PATCH 025/173] Adding Docker Hub login --- .github/workflows/EBeam_Tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 6f5487da..e94fe40f 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -16,6 +16,9 @@ jobs: - name: Checkout code uses: actions/checkout@v3 + - name: Login to Docker Hub + run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }} + - name: Pull siepic_klayout image run: docker pull docker.io/library/siepic_klayout:1700068664 #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 From 913cfce566e4c0c85bd2b161c524481ae8d5edfb Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 10:02:04 -0800 Subject: [PATCH 026/173] Update to build and push image to container registry --- .github/workflows/docker-image.yml | 37 +++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 8ed9c1fe..45cd1b30 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,18 +1,39 @@ -name: Docker Image CI +name: Create and Publish Docker image on: push: branches: [ "master" ] pull_request: branches: [ "master" ] + +env: + REGISTRY: ghcr.io + IMAGE_NAME: siepic_klayout jobs: - - build: - + build-and-push-image: runs-on: ubuntu-latest - + permissions: + contents: read + packages: write steps: - - uses: actions/checkout@v3 - - name: Build the Docker image - run: docker build . --file Dockerfile --tag siepic_klayout:$(date +%s) + - name: Checkout repository + uses: actions/checkout@v4 + - name: Log in to the container registry + uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + - name: Build and push Docker image + uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4 + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From fd04a9dd242fee54e395bd9801488e5464b53b3a Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 10:08:01 -0800 Subject: [PATCH 027/173] Fix name error --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 45cd1b30..6bcc83f7 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -8,7 +8,7 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: siepic_klayout + IMAGE_NAME: ${{ github.repository }}/siepic_klayout jobs: build-and-push-image: From 16cf738c30b08823d396fb2a9c38b018e5df3468 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 10:15:23 -0800 Subject: [PATCH 028/173] Use new docker image uploaded to my account --- .github/workflows/EBeam_Tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index e94fe40f..2185f4d8 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -16,11 +16,11 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: Login to Docker Hub - run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }} + #- name: Login to Docker Hub + # run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }} - name: Pull siepic_klayout image - run: docker pull docker.io/library/siepic_klayout:1700068664 + run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 - name: Run docker container from image From fe594cc3df0655b61eaec5854c33593d5d67e168 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 11:02:08 -0800 Subject: [PATCH 029/173] Update EBeam_Lib_PCellTests.py Update to match main --- .../EBeam/pymacros/EBeam_Lib_PCellTests.py | 51 +++++++++++-------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py index 7032f6b8..bb91e786 100644 --- a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py +++ b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py @@ -6,7 +6,7 @@ #import pcells_EBeam ### folder name ### import importlib -# Equivalent to "from custom_exceptions_path import *" +# Equivalent to from custom_exceptions_path import * current_directory = os.path.dirname(os.path.abspath(__file__)) custom_exceptions_path = os.path.join(current_directory, 'custom_exceptions.py') exec(open(custom_exceptions_path).read()) @@ -26,69 +26,76 @@ == Change log == 2023/10/30, Jasmina Brar. - raise exceptions when errors occur and exits under these conditions - - tests successful pcell registration in all libraries except 'EBeam' + - tests successful pcell registration in all libraries + """ -library_folders = ["pcells_EBeam", "pcells_EBeam_Beta", "pcells_SiN"] -library_names = ["EBeam", "EBeam_Beta", "EBeam-SiN"] -tech_names = ["EBeam", "EBeam", "EBeam"] +library_folders = ["pcells_EBeam", "pcells_EBeam_Beta", "pcells_SiN","pcells_EBeam_Dream"] +library_names = ["EBeam", "EBeam_Beta", "EBeam-SiN", "EBeam-Dream"] +tech_names = ["EBeam", "EBeam", "EBeam","EBeam"] for i in range(len(library_folders)): - # Get all .py files in library folder + # get all .py files in library folder files = [f for f in os.listdir(os.path.join(os.path.dirname( os.path.realpath(__file__)),library_folders[i])) if '.py' in pathlib.Path(f).suffixes and '__init__' not in f] - + importlib.invalidate_caches() - # Get library layout object + # get library layout object tech_name = tech_names[i] library_name = library_names[i] library = pya.Library().library_by_name(library_name,tech_name) print('*** Testing library: %s' % library_name) - # With cloud hosted runner, EBeam library is not being initialized, skip over it + # With self hosted runner, EBeam library is not being initialized, skip over it if library == None: - break; + raise LibraryNotRegistered(library_name) layout = library.layout() - # Check that the library is registered in klayout + # check that the library is registered in klayout try: if layout == None: raise LibraryNotRegistered(library_name) - + except LibraryNotRegistered as e: print("Caught {}: {}".format(type(e).__name__, str(e))) pya.Application.instance().exit(1) - # Loop through all pcells from this library's folder + # loop through all pcells from this library's folder for f in files: - + try: mm = f.replace('.py','') - # Check that the pcell has been registered in the library's layout + print(' * Testing cell: %s' % mm) + + # check that the pcell has been registered in the library's layout if mm not in layout.pcell_names(): raise PCellRegistrationError(mm, library_name) - - # Instantiate pcell in a new layer and check that it contains polygons + + # instantiate pcell in a new layer and check that it contains polygons new_layout = pya.Layout() pcell_decl = layout.pcell_declaration(mm) new_layout.register_pcell(mm, pcell_decl) - + parameter_decl = pcell_decl.get_parameters() all_params = {} for p in parameter_decl: all_params[p.name] = p.default - + pcell = new_layout.create_cell(mm, all_params) - if pcell.is_empty(): - if mm != 'phc_test': # this pcell has an empty python script, skip over it - raise PCellInstantiationError(mm, library_name) + if pcell.is_empty() or pcell.bbox().area() == 0: + raise PCellInstantiationError(mm, library_name) + + #topcell = new_layout.create_cell("top") + #t = Trans(Trans.R0, 0,0) + #inst = topcell.insert(CellInstArray(pcell.cell_index(), t)) + except (PCellRegistrationError, PCellInstantiationError) as e: print("Caught {}: {}".format(type(e).__name__, str(e))) From 5ae6400128d2f0dd6d37f8d2d150311f48e30a43 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 11:03:06 -0800 Subject: [PATCH 030/173] remove on push so this action is not triggered for now --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 6bcc83f7..69a6ca9d 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,8 +1,8 @@ name: Create and Publish Docker image on: - push: - branches: [ "master" ] + #push: + #branches: [ "master" ] pull_request: branches: [ "master" ] From 4f278daa35bb921a575b4632d997d3ada3f00a84 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 11:38:27 -0800 Subject: [PATCH 031/173] Update docker run command --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 2185f4d8..2f331528 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -24,7 +24,7 @@ jobs: #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 - name: Run docker container from image - run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/farihais/siepic_klayout:1.0 + run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros From db9277d15228e6f77e39f720f66f67de64194157 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 11:41:34 -0800 Subject: [PATCH 032/173] remove x11 forwarding in docker run command --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 2f331528..3f4766d6 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -24,7 +24,7 @@ jobs: #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 - name: Run docker container from image - run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master + run: docker run -itd --name ebeam_test --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros From 3bc3ce1cb489e06859c848db92973da3a560b6f1 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 12:25:35 -0800 Subject: [PATCH 033/173] use a virtual display attempt to fix qwidget error --- Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index 9a4fce58..feeeeb1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,12 @@ FROM quay.io/centos/centos:stream8 RUN dnf -y update && \ dnf -y install wget bzip2 unzip git mesa-dri-drivers +# Set up virtual display +ENV DISPLAY=:99 + +# Start Xvfb +CMD ["Xvfb", ":99", "-ac"] + # Install the newest version of KLayout RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm -O ~/klayout.rpm && \ dnf -y localinstall ~/klayout.rpm && \ From 9cb168e9d28713fcbeca6ca845e1cd866ea27fc5 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 12:27:41 -0800 Subject: [PATCH 034/173] build new image + add date to tag --- .github/workflows/docker-image.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 69a6ca9d..766e9747 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,8 +1,8 @@ name: Create and Publish Docker image on: - #push: - #branches: [ "master" ] + push: + branches: [ "master" ] pull_request: branches: [ "master" ] @@ -35,5 +35,5 @@ jobs: with: context: . push: true - tags: ${{ steps.meta.outputs.tags }} + tags: ${{ steps.meta.outputs.tags }}-${{ steps.date.outputs.date }} labels: ${{ steps.meta.outputs.labels }} From b04f77a80e93771a567b0bafc7d5f8b117bf54a4 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 12:33:06 -0800 Subject: [PATCH 035/173] use xvfb and new docker image that includes xvfb in attempt to fix qwidget error --- .github/workflows/EBeam_Tests.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 3f4766d6..28ab63b7 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -20,17 +20,20 @@ jobs: # run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }} - name: Pull siepic_klayout image - run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master + run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master- #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 - name: Run docker container from image - run: docker run -itd --name ebeam_test --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master + run: docker run -itd --name ebeam_test --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master- - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros + - name: Run Xvfb + run: Xvfb :99 -ac + - name: Run KLayout Python script inside container and capture exit code - run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + run: docker exec -e DISPLAY=.99 ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true - name: Stop container and remove it From dcdc4446af4323cd1d19276dd26b4de95c47d25f Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 12:35:40 -0800 Subject: [PATCH 036/173] Add install Xvfb --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index feeeeb1b..80f99091 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM quay.io/centos/centos:stream8 # Update the system and install necessary tools RUN dnf -y update && \ - dnf -y install wget bzip2 unzip git mesa-dri-drivers + dnf -y install wget bzip2 unzip git mesa-dri-drivers Xvfb # Set up virtual display ENV DISPLAY=:99 From 4eb9a244fb5466863de88f933714169e9ebc96a0 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 12:39:48 -0800 Subject: [PATCH 037/173] add period to trigger GitHub action with updated docker image --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 28ab63b7..3dcba1d6 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - #- name: Login to Docker Hub + #- name: Login to Docker Hub. # run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }} - name: Pull siepic_klayout image From e090d8685aef0b37a9d53378d2a619e7dbe49698 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 12:43:34 -0800 Subject: [PATCH 038/173] remove period to trigger GitHub action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 3dcba1d6..28ab63b7 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - #- name: Login to Docker Hub. + #- name: Login to Docker Hub # run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }} - name: Pull siepic_klayout image From 1e06685051f8658540bc2606a4cb03c7db83ecda Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 12:50:41 -0800 Subject: [PATCH 039/173] remove xvfb --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 80f99091..c8428d16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,10 +5,10 @@ RUN dnf -y update && \ dnf -y install wget bzip2 unzip git mesa-dri-drivers Xvfb # Set up virtual display -ENV DISPLAY=:99 +#ENV DISPLAY=:99 # Start Xvfb -CMD ["Xvfb", ":99", "-ac"] +#CMD ["Xvfb", ":99", "-ac"] # Install the newest version of KLayout RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm -O ~/klayout.rpm && \ From 15e3d735d62f0e724e311ef4110cbbf561df8c62 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 12:51:04 -0800 Subject: [PATCH 040/173] remove on push --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 766e9747..8a38c4d1 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,8 +1,8 @@ name: Create and Publish Docker image on: - push: - branches: [ "master" ] + #push: + #branches: [ "master" ] pull_request: branches: [ "master" ] From 9a40a80dede556cb93afaf96623118c5e5b42234 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 12:51:57 -0800 Subject: [PATCH 041/173] remove xvfb --- .github/workflows/EBeam_Tests.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 28ab63b7..9f2d96fa 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -29,11 +29,12 @@ jobs: - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros - - name: Run Xvfb - run: Xvfb :99 -ac + #- name: Run Xvfb + # run: Xvfb :99 -ac - name: Run KLayout Python script inside container and capture exit code - run: docker exec -e DISPLAY=.99 ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + #run: docker exec -e DISPLAY=.99 ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true - name: Stop container and remove it From 9e0f25e01587567747c672873e2e4feb47a38463 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 13:08:31 -0800 Subject: [PATCH 042/173] clone old version of siepic tools --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c8428d16..5290b277 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm # Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ - git clone https://github.com/SiEPIC/SiEPIC-Tools.git && \ + git clone --branch v0.4.5 https://github.com/SiEPIC/SiEPIC-Tools.git && \ git clone https://github.com/SiEPIC/SiEPIC_EBeam_PDK.git # Set the working directory From a9e3e447377d8067d598bb16c063e8ca17b8cb4b Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 13:09:26 -0800 Subject: [PATCH 043/173] Updating tag to reflect using v0.4.5 siepic tools --- .github/workflows/docker-image.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 8a38c4d1..35a0333e 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,8 +1,8 @@ name: Create and Publish Docker image on: - #push: - #branches: [ "master" ] + push: + branches: [ "master" ] pull_request: branches: [ "master" ] @@ -35,5 +35,5 @@ jobs: with: context: . push: true - tags: ${{ steps.meta.outputs.tags }}-${{ steps.date.outputs.date }} + tags: ${{ steps.meta.outputs.tags }}-siepic_tools_v0.4.5 labels: ${{ steps.meta.outputs.labels }} From 571c61541a63152b0b57092111f2dd556dc10896 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 13:13:31 -0800 Subject: [PATCH 044/173] Use docker image with siepic tools v0.4.5 --- .github/workflows/EBeam_Tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 9f2d96fa..f91b2c25 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -20,11 +20,11 @@ jobs: # run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }} - name: Pull siepic_klayout image - run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master- + run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 - name: Run docker container from image - run: docker run -itd --name ebeam_test --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master- + run: docker run -itd --name ebeam_test --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros From 7bbd5074f23a64ecf74c66af0552e4ab1446b99b Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 13:21:29 -0800 Subject: [PATCH 045/173] Remove install xvfb --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5290b277..ec784c5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM quay.io/centos/centos:stream8 # Update the system and install necessary tools RUN dnf -y update && \ - dnf -y install wget bzip2 unzip git mesa-dri-drivers Xvfb + dnf -y install wget bzip2 unzip git mesa-dri-drivers # Set up virtual display #ENV DISPLAY=:99 From 7b0850c573978a504ebd59d0f7aadfd5072ffea2 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 13:21:56 -0800 Subject: [PATCH 046/173] remove on push --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 35a0333e..9a9cf3d3 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,8 +1,8 @@ name: Create and Publish Docker image on: - push: - branches: [ "master" ] + #push: + #branches: [ "master" ] pull_request: branches: [ "master" ] From 3eee5a81bd64fcd4ecbd1d5eb964f3e0bea9b8a9 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 13:27:58 -0800 Subject: [PATCH 047/173] add x11 forwarding back into docker exec command --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index f91b2c25..8e245698 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -34,7 +34,7 @@ jobs: - name: Run KLayout Python script inside container and capture exit code #run: docker exec -e DISPLAY=.99 ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + run: docker exec -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true - name: Stop container and remove it From ea151c40e16645107ea50a3c573fa5441ed33b26 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 15 Nov 2023 19:06:03 -0800 Subject: [PATCH 048/173] Only run when Dockerfile is modified --- .github/workflows/docker-image.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 9a9cf3d3..b9b1b42c 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,10 +1,14 @@ name: Create and Publish Docker image on: - #push: - #branches: [ "master" ] + push: + branches: [ "master" ] + paths: + - 'Dockerfile' pull_request: branches: [ "master" ] + paths: + - 'Dockerfile' env: REGISTRY: ghcr.io From 958eed723958f7effd7eb702cf8e9db9e34fcbf3 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 10:16:08 -0800 Subject: [PATCH 049/173] Run when new versions of siepic repos are released + update tag --- .github/workflows/docker-image.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index b9b1b42c..2c48b114 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,6 +1,13 @@ name: Create and Publish Docker image on: + release: + types: + - created + repository: + - 'SiEPIC/SiEPIC_EBeam_PDK' + - 'SiEPIC/SiEPIC-Tools' + push: branches: [ "master" ] paths: @@ -23,21 +30,28 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + + - name: Get the current date + id: date + run: echo "::set-output name=date::$(date +%Y%m%d)" + - name: Log in to the container registry uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Extract metadata (tags, labels) for Docker + + - name: Extract metadata (labels) for Docker id: meta uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + - name: Build and push Docker image uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4 with: context: . push: true - tags: ${{ steps.meta.outputs.tags }}-siepic_tools_v0.4.5 + tags: "${{ steps.date.outputs.date }}.${{ github.run_number }}" labels: ${{ steps.meta.outputs.labels }} From 56da49f7bd18d44395a4c4f4c79c68cf9dc11d10 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 10:16:43 -0800 Subject: [PATCH 050/173] Revert back to cloning newest siepic repos --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ec784c5e..d72e1a7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm # Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ - git clone --branch v0.4.5 https://github.com/SiEPIC/SiEPIC-Tools.git && \ + git clone https://github.com/SiEPIC/SiEPIC-Tools.git && \ git clone https://github.com/SiEPIC/SiEPIC_EBeam_PDK.git # Set the working directory From 8a476b08892c007574b79d8d27ad6ba0b0b9fa38 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 10:24:57 -0800 Subject: [PATCH 051/173] Attempt to fix insufficient scope error --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 2c48b114..03c1b160 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -42,7 +42,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Extract metadata (labels) for Docker + - name: Extract metadata (tags, labels) for Docker id: meta uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 with: @@ -53,5 +53,5 @@ jobs: with: context: . push: true - tags: "${{ steps.date.outputs.date }}.${{ github.run_number }}" + tags: "${{ steps.meta.outputs.tags }}.${{ steps.date.outputs.date }}.${{ github.run_number }}" labels: ${{ steps.meta.outputs.labels }} From 2608deaf56ef631d5bc65eeb7df0e25530eedb90 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 10:25:30 -0800 Subject: [PATCH 052/173] Add period to trigger docker image build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d72e1a7a..ce0b5bdd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM quay.io/centos/centos:stream8 -# Update the system and install necessary tools +# Update the system and install necessary tools. RUN dnf -y update && \ dnf -y install wget bzip2 unzip git mesa-dri-drivers From 5d00a3b49ed700f42401aec472c55f3e0575be8b Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 10:53:12 -0800 Subject: [PATCH 053/173] git clone jasminabrar siepic tools Added modifications to remove qwidget error --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ce0b5bdd..e3995c4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm # Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ - git clone https://github.com/SiEPIC/SiEPIC-Tools.git && \ + git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ git clone https://github.com/SiEPIC/SiEPIC_EBeam_PDK.git # Set the working directory From 6aad4eb4a7a818dfbd8dcc1a4606ec1a1a9cb714 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 10:59:08 -0800 Subject: [PATCH 054/173] Use new docker image with jasminabrar siepic tools repo --- .github/workflows/EBeam_Tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 8e245698..5890670f 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -20,11 +20,12 @@ jobs: # run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }} - name: Pull siepic_klayout image - run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 + run: docker pull docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.21 + #run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 - name: Run docker container from image - run: docker run -itd --name ebeam_test --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 + run: docker run -itd --name ebeam_test --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.21 - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros From 44b3f4e6d7b7dc5e6124df07ed01e3f829f755e4 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:00:00 -0800 Subject: [PATCH 055/173] remove extra 'docker pull' --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 5890670f..787e41d6 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -20,7 +20,7 @@ jobs: # run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }} - name: Pull siepic_klayout image - run: docker pull docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.21 + run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.21 #run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 From 70b1883a31a7f29f14a5273841e6336910c0f716 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:07:34 -0800 Subject: [PATCH 056/173] remove display from docker exec --- .github/workflows/EBeam_Tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 787e41d6..cd788e06 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -35,7 +35,8 @@ jobs: - name: Run KLayout Python script inside container and capture exit code #run: docker exec -e DISPLAY=.99 ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - run: docker exec -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + #run: docker exec -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + run: docker exec ebeam_test klayout -z -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true - name: Stop container and remove it From 7972365fcd426db886cca0b9d02c60d5593d9b4b Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:18:50 -0800 Subject: [PATCH 057/173] Rebuild Dockerfile without ENV variables --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e3995c4d..cd6121cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,5 +25,5 @@ RUN mkdir -p /root/.klayout/salt && \ WORKDIR /home # Set PATH -ENV PATH="/usr/local/bin:${PATH}" -ENV QT_QPA_PLATFORM=minimal +#ENV PATH="/usr/local/bin:${PATH}" +#ENV QT_QPA_PLATFORM=minimal From 04dfe7aee5888f8bcb8f71bbc2547d1523f95270 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:25:36 -0800 Subject: [PATCH 058/173] use new docker image --- .github/workflows/EBeam_Tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index cd788e06..6f9990f3 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -20,12 +20,12 @@ jobs: # run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }} - name: Pull siepic_klayout image - run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.21 + run: docker pull docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.22 #run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 - name: Run docker container from image - run: docker run -itd --name ebeam_test --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.21 + run: docker run -itd --name ebeam_test --security-opt label=type:container_runtime_t docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.22 - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros @@ -36,7 +36,7 @@ jobs: - name: Run KLayout Python script inside container and capture exit code #run: docker exec -e DISPLAY=.99 ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV #run: docker exec -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - run: docker exec ebeam_test klayout -z -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + run: docker exec -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix ebeam_test klayout -z -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true - name: Stop container and remove it From 3ae6031b913cd01e607f16cea506cf87546ae806 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:27:41 -0800 Subject: [PATCH 059/173] Update EBeam_Tests.yml --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 6f9990f3..351ca9db 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -20,7 +20,7 @@ jobs: # run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }} - name: Pull siepic_klayout image - run: docker pull docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.22 + run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.22 #run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 From 05d256fba41dae8bf5b68e8470c11801722b33fc Mon Sep 17 00:00:00 2001 From: jasminabrar Date: Thu, 16 Nov 2023 11:28:04 -0800 Subject: [PATCH 060/173] catch general pcell exceptions --- klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py index bb91e786..aa37a8b2 100644 --- a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py +++ b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py @@ -97,7 +97,7 @@ #inst = topcell.insert(CellInstArray(pcell.cell_index(), t)) - except (PCellRegistrationError, PCellInstantiationError) as e: + except (PCellRegistrationError, PCellInstantiationError, Exception) as e: print("Caught {}: {}".format(type(e).__name__, str(e))) pya.Application.instance().exit(1) From dd68e21af267d8c3f78efe4eaf37b68e55a88a89 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:29:55 -0800 Subject: [PATCH 061/173] remove x11 display --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 351ca9db..1d8d67fe 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -36,7 +36,7 @@ jobs: - name: Run KLayout Python script inside container and capture exit code #run: docker exec -e DISPLAY=.99 ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV #run: docker exec -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - run: docker exec -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix ebeam_test klayout -z -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + run: docker exec ebeam_test klayout -z -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true - name: Stop container and remove it From a36b9512942707c3fe4ca9191b510c25b197a7e5 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:31:45 -0800 Subject: [PATCH 062/173] add back in ENV variables --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cd6121cc..e3995c4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,5 +25,5 @@ RUN mkdir -p /root/.klayout/salt && \ WORKDIR /home # Set PATH -#ENV PATH="/usr/local/bin:${PATH}" -#ENV QT_QPA_PLATFORM=minimal +ENV PATH="/usr/local/bin:${PATH}" +ENV QT_QPA_PLATFORM=minimal From c3a99d30fca6e34a7a47181738a09358d7f550c7 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:33:01 -0800 Subject: [PATCH 063/173] use v21 docker image --- .github/workflows/EBeam_Tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 1d8d67fe..3f175eec 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -20,12 +20,12 @@ jobs: # run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }} - name: Pull siepic_klayout image - run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.22 + run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.21 #run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 - name: Run docker container from image - run: docker run -itd --name ebeam_test --security-opt label=type:container_runtime_t docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.22 + run: docker run -itd --name ebeam_test --security-opt label=type:container_runtime_t docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.21 - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros @@ -36,7 +36,7 @@ jobs: - name: Run KLayout Python script inside container and capture exit code #run: docker exec -e DISPLAY=.99 ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV #run: docker exec -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - run: docker exec ebeam_test klayout -z -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + run: docker exec -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix ebeam_test klayout -z -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true - name: Stop container and remove it From dccc3d8ace14c75a889e1061c575fedb91b6bbaa Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:35:11 -0800 Subject: [PATCH 064/173] move display to docker run --- .github/workflows/EBeam_Tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 3f175eec..5ad8a71a 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -25,7 +25,7 @@ jobs: #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 - name: Run docker container from image - run: docker run -itd --name ebeam_test --security-opt label=type:container_runtime_t docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.21 + run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.21 - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros @@ -36,7 +36,7 @@ jobs: - name: Run KLayout Python script inside container and capture exit code #run: docker exec -e DISPLAY=.99 ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV #run: docker exec -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - run: docker exec -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix ebeam_test klayout -z -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + run: docker exec ebeam_test klayout -z -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true - name: Stop container and remove it From 7e85db28e926411e2d21fa8b906dda881173212d Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:37:43 -0800 Subject: [PATCH 065/173] add -zz --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 5ad8a71a..638e204a 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -36,7 +36,7 @@ jobs: - name: Run KLayout Python script inside container and capture exit code #run: docker exec -e DISPLAY=.99 ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV #run: docker exec -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - run: docker exec ebeam_test klayout -z -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true - name: Stop container and remove it From dd716d1265e02f85eef058fa2bd35d0a29ac01c3 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:46:00 -0800 Subject: [PATCH 066/173] remove 'docker pull --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 638e204a..38c85ba2 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -25,7 +25,7 @@ jobs: #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 - name: Run docker container from image - run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.21 + run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.21 - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros From 06b58130886c4c2cc7cc7f428b370d799e6f926e Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:48:52 -0800 Subject: [PATCH 067/173] use v22 docker image --- .github/workflows/EBeam_Tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 38c85ba2..84ea0e61 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -20,12 +20,12 @@ jobs: # run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }} - name: Pull siepic_klayout image - run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.21 + run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.22 #run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 - name: Run docker container from image - run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.21 + run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.22 - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros From 5e2505e511e4243782cfb50458df87ff6c406a23 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:55:52 -0800 Subject: [PATCH 068/173] use docker image with v0.4.5 siepic tools for now as it works --- .github/workflows/EBeam_Tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 84ea0e61..55481363 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -20,12 +20,12 @@ jobs: # run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }} - name: Pull siepic_klayout image - run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.22 + run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 #run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 - name: Run docker container from image - run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master.20231116.22 + run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros From 54596f5dd7c30b6a5a6349f87caf2c29ac7321d6 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:56:56 -0800 Subject: [PATCH 069/173] Push docker image as 'latest' and with a unique tag So that in our other test scripts we can simple pull the 'latest' version but we will still have a backlog of all docker image versions --- .github/workflows/docker-image.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 03c1b160..08ab6e4e 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -48,7 +48,15 @@ jobs: with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - name: Build and push Docker image + - name: Build and push Docker image as latest image + uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4 + with: + context: . + push: true + tags: latest + labels: ${{ steps.meta.outputs.labels }} + + - name: Build and push Docker image as unique image uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4 with: context: . From c690683539845ceb210c802d9d4d714d1ae91cdc Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:57:28 -0800 Subject: [PATCH 070/173] Trigger docker image build To test if it will push as a unique image + latest image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e3995c4d..31e98e28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM quay.io/centos/centos:stream8 -# Update the system and install necessary tools. +# Update the system and install necessary tools RUN dnf -y update && \ dnf -y install wget bzip2 unzip git mesa-dri-drivers From 01b0775fe15c4da4cb6260347ef0205fb95f67d4 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:12:33 -0800 Subject: [PATCH 071/173] fix build error --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 08ab6e4e..06dc310a 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -53,7 +53,7 @@ jobs: with: context: . push: true - tags: latest + tags: ${{ steps.meta.outputs.tags }}:latest labels: ${{ steps.meta.outputs.labels }} - name: Build and push Docker image as unique image From d2c6684a12a968dc72e9d27c8d0fb487b503ff60 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:13:04 -0800 Subject: [PATCH 072/173] trigger build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 31e98e28..e3995c4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM quay.io/centos/centos:stream8 -# Update the system and install necessary tools +# Update the system and install necessary tools. RUN dnf -y update && \ dnf -y install wget bzip2 unzip git mesa-dri-drivers From ae22ebc76bb7005be7bbd58ed96e6237245683d4 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:16:03 -0800 Subject: [PATCH 073/173] update tag --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 06dc310a..a2344862 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -53,7 +53,7 @@ jobs: with: context: . push: true - tags: ${{ steps.meta.outputs.tags }}:latest + tags: master:latest labels: ${{ steps.meta.outputs.labels }} - name: Build and push Docker image as unique image From 98196d529d0ae2d5ebf07ffaf21ec180acd64993 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:16:18 -0800 Subject: [PATCH 074/173] trigger build image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e3995c4d..31e98e28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM quay.io/centos/centos:stream8 -# Update the system and install necessary tools. +# Update the system and install necessary tools RUN dnf -y update && \ dnf -y install wget bzip2 unzip git mesa-dri-drivers From 0951087bb6c337937a90afd04d4c3b9ceab33b56 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:17:41 -0800 Subject: [PATCH 075/173] clone v0.4.5 siepic tools --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 31e98e28..90c837ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm # Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ - git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ + git clone --branch v0.4.5 https://github.com/jasminabrar/SiEPIC-Tools.git && \ git clone https://github.com/SiEPIC/SiEPIC_EBeam_PDK.git # Set the working directory From f03f102e556fe0678ac8642207bcd14d41822df1 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:21:42 -0800 Subject: [PATCH 076/173] clone SiEPIC SiEPIC_Tools not jasminabrar --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 90c837ae..ec784c5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm # Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ - git clone --branch v0.4.5 https://github.com/jasminabrar/SiEPIC-Tools.git && \ + git clone --branch v0.4.5 https://github.com/SiEPIC/SiEPIC-Tools.git && \ git clone https://github.com/SiEPIC/SiEPIC_EBeam_PDK.git # Set the working directory From 63913c535ff5082442421d22e1b72d002ea4b7a7 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:26:45 -0800 Subject: [PATCH 077/173] Create docker_image_version_info To store information about the changes made between docker images --- docker_image_version_info | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 docker_image_version_info diff --git a/docker_image_version_info b/docker_image_version_info new file mode 100644 index 00000000..f5bc5ea4 --- /dev/null +++ b/docker_image_version_info @@ -0,0 +1,4 @@ +- master: original image with klayout and newest siepic tools and siepic ebeam_pdk +- master-siepic_tools_v0.4.5: uses v0.4.5 of siepic tools +- master.20231116.21: uses jasminabrar forked SiEPIC Tools repo with added QApplication line +- master.20231116.22: uses jasminabrar forked SiEPIC Tools repo with added QApplication line + ENV vars removed from docker file From 0fb2a3508b24b2efe2af2a1bc56c373c932b6953 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:31:41 -0800 Subject: [PATCH 078/173] update tag --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index a2344862..be6f22e5 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -53,7 +53,7 @@ jobs: with: context: . push: true - tags: master:latest + tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - name: Build and push Docker image as unique image From 14cd1bdcad6eda09cc482965bb0f44c0230db74e Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:32:01 -0800 Subject: [PATCH 079/173] trigger docker build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ec784c5e..791c7a74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM quay.io/centos/centos:stream8 -# Update the system and install necessary tools +# Update the system and install necessary tools. RUN dnf -y update && \ dnf -y install wget bzip2 unzip git mesa-dri-drivers From 5ed22a321fccbad39376707284bf1ffea1befa91 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:34:27 -0800 Subject: [PATCH 080/173] Update tag --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index be6f22e5..8c10ed5d 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -53,7 +53,7 @@ jobs: with: context: . push: true - tags: ${{ steps.meta.outputs.tags }} + tags: ${{ steps.meta.outputs.tags }}-latest labels: ${{ steps.meta.outputs.labels }} - name: Build and push Docker image as unique image From a6d68b4162fec69f5eba8cf90d971bc69718c32c Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:37:17 -0800 Subject: [PATCH 081/173] trigger build image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 791c7a74..ec784c5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM quay.io/centos/centos:stream8 -# Update the system and install necessary tools. +# Update the system and install necessary tools RUN dnf -y update && \ dnf -y install wget bzip2 unzip git mesa-dri-drivers From a7b73be81b40179718353bee84460f0453ea95c9 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:43:19 -0800 Subject: [PATCH 082/173] always use master-latest docker image --- .github/workflows/EBeam_Tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 55481363..9c0b8bb3 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -20,12 +20,12 @@ jobs: # run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }} - name: Pull siepic_klayout image - run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 + run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-latest #run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 - name: Run docker container from image - run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 + run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-latest - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros From e15651bfb0f57f4efdaf8f871ecddd1b9cefd634 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 16 Nov 2023 18:14:02 -0800 Subject: [PATCH 083/173] Check pull requests are merged before triggering workflow --- .github/workflows/docker-image.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 8c10ed5d..f67189c4 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -13,6 +13,8 @@ on: paths: - 'Dockerfile' pull_request: + types: + - closed branches: [ "master" ] paths: - 'Dockerfile' @@ -23,11 +25,19 @@ env: jobs: build-and-push-image: + runs-on: ubuntu-latest permissions: contents: read packages: write + steps: + - name: Check pull request was merged + if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == false + run: | + echo "Error: Pull request is not merged." + exit 1 + - name: Checkout repository uses: actions/checkout@v4 From 89380376f1509eb0c214aad406a41b36d88907ea Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:50:43 -0800 Subject: [PATCH 084/173] Updating comments --- klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py index aa37a8b2..88869962 100644 --- a/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py +++ b/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py @@ -12,7 +12,8 @@ exec(open(custom_exceptions_path).read()) """ -Python script to test that all Pcells are properly registered in their respective library and will display polygons when placed on a new layout. +Python script to test that all EBeam libraries are registered and all Pcells are properly registered in their respective library and +will display polygons when placed on a new layout. To run this script from the command line: '{path to klayout} -zz -r {path to this script/EBeam_Lib_PCellTests.py}'. From 6e63f30fb54b3d711c44e7cfd55209ac42277f9e Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:52:14 -0800 Subject: [PATCH 085/173] Cleaning up comments --- .github/workflows/EBeam_Tests.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 9c0b8bb3..093e0c14 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -16,26 +16,17 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - #- name: Login to Docker Hub - # run: docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASS }} - - name: Pull siepic_klayout image run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-latest - #run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-siepic_tools_v0.4.5 - #run: docker pull ghcr.io/farihais/siepic_klayout:1.0 - + - name: Run docker container from image run: docker run -itd --name ebeam_test -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix --security-opt label=type:container_runtime_t ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-latest - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros - #- name: Run Xvfb - # run: Xvfb :99 -ac - name: Run KLayout Python script inside container and capture exit code - #run: docker exec -e DISPLAY=.99 ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - #run: docker exec -e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true From 911f5ed299503978839db3d748f615048efaeca3 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:52:36 -0800 Subject: [PATCH 086/173] Cleaning up --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index f67189c4..bfa83108 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,4 +1,4 @@ -name: Create and Publish Docker image +name: Create and Publish Docker Image on: release: From 18b753f7c840ab25f3325cf9a5b56de2b394e907 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:53:06 -0800 Subject: [PATCH 087/173] Cleaning up --- Dockerfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index ec784c5e..5d9d27f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,12 +4,6 @@ FROM quay.io/centos/centos:stream8 RUN dnf -y update && \ dnf -y install wget bzip2 unzip git mesa-dri-drivers -# Set up virtual display -#ENV DISPLAY=:99 - -# Start Xvfb -#CMD ["Xvfb", ":99", "-ac"] - # Install the newest version of KLayout RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm -O ~/klayout.rpm && \ dnf -y localinstall ~/klayout.rpm && \ From 716dc14c45f62aa9656bbb1028e696ebe2dd0479 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Fri, 17 Nov 2023 14:17:35 -0800 Subject: [PATCH 088/173] add code coverage section --- .github/workflows/EBeam_Tests.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 093e0c14..d1767c71 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -9,6 +9,16 @@ on: - master jobs: + # this should be moved to after ebeam-lib-pcell-tests but for now since that job fails, it is above to trigger dashboard build + code-coverage: + runs-on: ubuntu-latest + + steps: + - name: Upload coverage reports to Codecov + uses: codecov/codecov-action@v3 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + ebeam-lib-pcell-test: runs-on: ubuntu-latest From 631a6dc81d8cd30f22cbdf7a94e2e46033c86d5a Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Fri, 17 Nov 2023 14:26:01 -0800 Subject: [PATCH 089/173] Update EBeam_Tests.yml --- .github/workflows/EBeam_Tests.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index d1767c71..4284e40c 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -8,17 +8,7 @@ on: branches: - master -jobs: - # this should be moved to after ebeam-lib-pcell-tests but for now since that job fails, it is above to trigger dashboard build - code-coverage: - runs-on: ubuntu-latest - - steps: - - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v3 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - +jobs: ebeam-lib-pcell-test: runs-on: ubuntu-latest @@ -44,6 +34,11 @@ jobs: run: | docker stop ebeam_test docker rm ebeam_test + + - name: Upload coverage reports to Codecov + uses: codecov/codecov-action@v3 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - name: Fail job if exit code is non-zero run: | From b9c6c1a64208f8964c166e83ad7aea1e97d35220 Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:00:03 -0800 Subject: [PATCH 090/173] Attempting to redo last commit and adding coverage upload step right after klayout run step --- .github/workflows/EBeam_Tests.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 4284e40c..0a443e27 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -25,21 +25,20 @@ jobs: - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros - - name: Run KLayout Python script inside container and capture exit code run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true - - name: Stop container and remove it - run: | - docker stop ebeam_test - docker rm ebeam_test - - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v3 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + - name: Stop container and remove it + run: | + docker stop ebeam_test + docker rm ebeam_test + - name: Fail job if exit code is non-zero run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then From 88e6904f4a429d3a121a4a2126f42eea2c927943 Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:04:16 -0800 Subject: [PATCH 091/173] Temporarily moving code coverage report upload to after stopping the container to create dashboard link --- .github/workflows/EBeam_Tests.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 0a443e27..88adf853 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -29,16 +29,16 @@ jobs: run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true - - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v3 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Stop container and remove it run: | docker stop ebeam_test docker rm ebeam_test + - name: Upload coverage reports to Codecov + uses: codecov/codecov-action@v3 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + - name: Fail job if exit code is non-zero run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then From 37d089dac53fa1cebf397de0f91acbd344515a83 Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:07:58 -0800 Subject: [PATCH 092/173] Created EBeam_Tests_Coverage.yml to trigger passing of actions containing coverage report upload --- .github/workflows/EBeam_Tests_Coverage.yml | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/EBeam_Tests_Coverage.yml diff --git a/.github/workflows/EBeam_Tests_Coverage.yml b/.github/workflows/EBeam_Tests_Coverage.yml new file mode 100644 index 00000000..516ad490 --- /dev/null +++ b/.github/workflows/EBeam_Tests_Coverage.yml @@ -0,0 +1,37 @@ +name: EBeam Tests Coverage + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + ebeam-tests-coverage: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.x' + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install coverage + + - name: Run KLayout Python script with coverage + run: | + coverage run --source=. $GITHUB_WORKSPACE/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py + continue-on-error: true + + - name: Upload coverage reports to Codecov + uses: codecov/codecov-action@v3 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} From 37cb489b0c7c3f4695f73deec1d3a116b8109aab Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:12:29 -0800 Subject: [PATCH 093/173] Renaming coverage actions and removing trigger for on pushes to master to stop triggering file each time --- .../{EBeam_Tests_Coverage.yml => Coverage_EBeam_Tests.yml} | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) rename .github/workflows/{EBeam_Tests_Coverage.yml => Coverage_EBeam_Tests.yml} (92%) diff --git a/.github/workflows/EBeam_Tests_Coverage.yml b/.github/workflows/Coverage_EBeam_Tests.yml similarity index 92% rename from .github/workflows/EBeam_Tests_Coverage.yml rename to .github/workflows/Coverage_EBeam_Tests.yml index 516ad490..3b5dc820 100644 --- a/.github/workflows/EBeam_Tests_Coverage.yml +++ b/.github/workflows/Coverage_EBeam_Tests.yml @@ -1,9 +1,6 @@ -name: EBeam Tests Coverage +name: Coverage EBeam Tests on: - push: - branches: - - master pull_request: branches: - master From dce3332a80a2d8d883932e549ca46aa7c48140e1 Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:26:45 -0800 Subject: [PATCH 094/173] Adding steps to run klayout script with coverage and temporarily commenting out fail-job-if-wrong-exit-code step --- .github/workflows/EBeam_Tests.yml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 88adf853..9314469a 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -25,8 +25,16 @@ jobs: - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros - - name: Run KLayout Python script inside container and capture exit code - run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + - name: Install coverage package inside the container + run: docker exec ebeam_test pip install coverage + + - name: Run KLayout Python script inside container and capture exit code + # run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + run: | + docker exec ebeam_test klayout -zz -r "coverage run --source=/home/pymacros pymacros/EBeam_Lib_PCellTests.py" || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml + docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml + echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true - name: Stop container and remove it @@ -39,9 +47,9 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Fail job if exit code is non-zero - run: | - if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then - echo "KLayout exited with non-zero exit code" - exit 1 - fi + # - name: Fail job if exit code is non-zero + # run: | + # if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then + # echo "KLayout exited with non-zero exit code" + # exit 1 + # fi From 1d09cebc4913e96b1de1416e4d2fa4675c63fb78 Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:31:30 -0800 Subject: [PATCH 095/173] Updating Dockerfile to include installation of pip --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5d9d27f8..1a1edba9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM quay.io/centos/centos:stream8 # Update the system and install necessary tools RUN dnf -y update && \ - dnf -y install wget bzip2 unzip git mesa-dri-drivers + dnf -y install wget bzip2 unzip git mesa-dri-drivers python3-pip # Install the newest version of KLayout RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm -O ~/klayout.rpm && \ @@ -19,5 +19,5 @@ RUN mkdir -p /root/.klayout/salt && \ WORKDIR /home # Set PATH -ENV PATH="/usr/local/bin:${PATH}" +ENV PATH="/usr/local/bin:${PATH}:/usr/local/bin/python3:/root/.local/bin" ENV QT_QPA_PLATFORM=minimal From 51bae22df35cdc9d382eeebb5e829b8fceb3b00a Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:40:36 -0800 Subject: [PATCH 096/173] Adding pip install coverage package inside Dockerfile --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 1a1edba9..a3790ac7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,9 @@ RUN mkdir -p /root/.klayout/salt && \ git clone --branch v0.4.5 https://github.com/SiEPIC/SiEPIC-Tools.git && \ git clone https://github.com/SiEPIC/SiEPIC_EBeam_PDK.git +# Install coverage package +RUN pip3 install coverage + # Set the working directory WORKDIR /home From bb41556ba0163f3b2354c4d2e79c42a7cee584c4 Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:41:39 -0800 Subject: [PATCH 097/173] Removing pip install coverage line from actions file as it is already part of dockerfile now --- .github/workflows/EBeam_Tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 9314469a..4fb375c6 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -25,9 +25,6 @@ jobs: - name: Copy pymacros folder to docker container run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros - - name: Install coverage package inside the container - run: docker exec ebeam_test pip install coverage - - name: Run KLayout Python script inside container and capture exit code # run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV run: | From 3c485a4528eee523fc1c935ad20245dc8750bbe0 Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:47:05 -0800 Subject: [PATCH 098/173] Removing space to trigger ebeam_tests action From c90e7b1387d3beb598ca8d0ec0c527a2873fba0d Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:53:12 -0800 Subject: [PATCH 099/173] Trying to add double quotes for exec command that uses coverage --- .github/workflows/EBeam_Tests.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 4fb375c6..64217cf8 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -28,10 +28,14 @@ jobs: - name: Run KLayout Python script inside container and capture exit code # run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV run: | - docker exec ebeam_test klayout -zz -r "coverage run --source=/home/pymacros pymacros/EBeam_Lib_PCellTests.py" || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml + docker exec ebeam_test sh -c "klayout -zz -r 'coverage run --source=/home/pymacros pymacros/EBeam_Lib_PCellTests.py'" + docker exec ebeam_test sh -c "coverage xml -o /home/pymacros/coverage.xml" docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + # docker exec ebeam_test klayout -zz -r "coverage run --source=/home/pymacros pymacros/EBeam_Lib_PCellTests.py" || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml + # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml + # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true - name: Stop container and remove it From e3c6a348b5230df38edd4215e45e8ed69838c3bd Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:55:08 -0800 Subject: [PATCH 100/173] Trying to add codecov badge to readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ad10fb93..9a069afd 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ # SiEPIC_EBeam_PDK +[![Code Coverage:](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK/main/graph/badge.svg)](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK) + - SiEPIC EBeam PDK, Library - for silicon photonics layout, design, verification and circuit simulation - by Lukas Chrostowski (lukasc-ubc), (c) 2015-2023, with contributions by: Zeqin Lu, Jaspreet Jhoja, Xu Wang, Jonas Flueckiger, Brett Poulsen (bpoulse). - Package in KLayout, klayout.de (version 0.28 +) From 8350edb80c4249e91d6fae104da9e31753574f65 Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:57:58 -0800 Subject: [PATCH 101/173] Trying to rename text of badge to 'coverage' --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a069afd..8392f647 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ # SiEPIC_EBeam_PDK -[![Code Coverage:](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK/main/graph/badge.svg)](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK) +[![coverage](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK/main/graph/badge.svg)](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK) - SiEPIC EBeam PDK, Library - for silicon photonics layout, design, verification and circuit simulation - by Lukas Chrostowski (lukasc-ubc), (c) 2015-2023, with contributions by: Zeqin Lu, Jaspreet Jhoja, Xu Wang, Jonas Flueckiger, Brett Poulsen (bpoulse). From ef84dde857d906b4847cf6109aaec95237a34dd1 Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:00:15 -0800 Subject: [PATCH 102/173] Trying (again) to rename the text to 'coverage' and not 'codecov' --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8392f647..4ecbd39d 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,8 @@ # SiEPIC_EBeam_PDK -[![coverage](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK/main/graph/badge.svg)](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK) +[![codecov](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK/main/graph/badge.svg)](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK) +**Coverage:** [![codecov](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK/main/graph/badge.svg)](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK) - SiEPIC EBeam PDK, Library - for silicon photonics layout, design, verification and circuit simulation - by Lukas Chrostowski (lukasc-ubc), (c) 2015-2023, with contributions by: Zeqin Lu, Jaspreet Jhoja, Xu Wang, Jonas Flueckiger, Brett Poulsen (bpoulse). From e10fc3f357bb11f3014f248e4a5177629a4289cc Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:01:17 -0800 Subject: [PATCH 103/173] Keeping the previous 'codecov' text on the badge as previous attempts were unsuccessful --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 4ecbd39d..d872e724 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,6 @@ # SiEPIC_EBeam_PDK [![codecov](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK/main/graph/badge.svg)](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK) -**Coverage:** [![codecov](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK/main/graph/badge.svg)](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK) - SiEPIC EBeam PDK, Library - for silicon photonics layout, design, verification and circuit simulation - by Lukas Chrostowski (lukasc-ubc), (c) 2015-2023, with contributions by: Zeqin Lu, Jaspreet Jhoja, Xu Wang, Jonas Flueckiger, Brett Poulsen (bpoulse). From 938bf1731f414e50681907bdc10c0d7ef5b7a5ee Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:05:45 -0800 Subject: [PATCH 104/173] Trying a different version of klayout coverage run commands --- .github/workflows/EBeam_Tests.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 64217cf8..a11783a8 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -28,10 +28,16 @@ jobs: - name: Run KLayout Python script inside container and capture exit code # run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV run: | - docker exec ebeam_test sh -c "klayout -zz -r 'coverage run --source=/home/pymacros pymacros/EBeam_Lib_PCellTests.py'" - docker exec ebeam_test sh -c "coverage xml -o /home/pymacros/coverage.xml" + docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/local/bin/klayout -zz -r pymacros/EBeam_Lib_PCellTests.py" + docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + + # docker exec ebeam_test sh -c "klayout -zz -r 'coverage run --source=/home/pymacros pymacros/EBeam_Lib_PCellTests.py'" + # docker exec ebeam_test sh -c "coverage xml -o /home/pymacros/coverage.xml" + # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml + # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + # docker exec ebeam_test klayout -zz -r "coverage run --source=/home/pymacros pymacros/EBeam_Lib_PCellTests.py" || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml From 5416b1a3705572bed390f076f9571f9cfd15c5d4 Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:08:30 -0800 Subject: [PATCH 105/173] Trying to dynamically locate klayout before running coverage command with klayout --- .github/workflows/EBeam_Tests.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index a11783a8..d67a658f 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -28,10 +28,15 @@ jobs: - name: Run KLayout Python script inside container and capture exit code # run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV run: | - docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/local/bin/klayout -zz -r pymacros/EBeam_Lib_PCellTests.py" + K_LAYOUT_BINARY=$(docker exec ebeam_test sh -c "which klayout") + docker exec ebeam_test sh -c "coverage run --source=/home/pymacros $K_LAYOUT_BINARY -zz -r pymacros/EBeam_Lib_PCellTests.py" docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/local/bin/klayout -zz -r pymacros/EBeam_Lib_PCellTests.py" + # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml + # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml + # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV # docker exec ebeam_test sh -c "klayout -zz -r 'coverage run --source=/home/pymacros pymacros/EBeam_Lib_PCellTests.py'" # docker exec ebeam_test sh -c "coverage xml -o /home/pymacros/coverage.xml" From 46a95c2f9ad159fb2dc380d468c1f4c46ac7805e Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:12:28 -0800 Subject: [PATCH 106/173] Trying to figure out klayout path for coverage run klayout command --- .github/workflows/EBeam_Tests.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index d67a658f..5bffee16 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -28,11 +28,17 @@ jobs: - name: Run KLayout Python script inside container and capture exit code # run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV run: | - K_LAYOUT_BINARY=$(docker exec ebeam_test sh -c "which klayout") - docker exec ebeam_test sh -c "coverage run --source=/home/pymacros $K_LAYOUT_BINARY -zz -r pymacros/EBeam_Lib_PCellTests.py" + docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/bin/klayout -zz -r pymacros/EBeam_Lib_PCellTests.py" docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + + # K_LAYOUT_BINARY=$(docker exec ebeam_test sh -c "which klayout") + # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros $K_LAYOUT_BINARY -zz -r pymacros/EBeam_Lib_PCellTests.py" + # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml + # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml + # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/local/bin/klayout -zz -r pymacros/EBeam_Lib_PCellTests.py" # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml From 22271cf5b249cef592f790918b164e3f1bb3d94a Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:44:58 -0800 Subject: [PATCH 107/173] Adding shell script to run klayout command --- .github/workflows/EBeam_Tests.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 5bffee16..a79d25ec 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -28,11 +28,17 @@ jobs: - name: Run KLayout Python script inside container and capture exit code # run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV run: | - docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/bin/klayout -zz -r pymacros/EBeam_Lib_PCellTests.py" + docker exec ebeam_test sh -c "echo '#!/bin/bash' > /usr/local/bin/run_klayout.sh && echo '/usr/bin/klayout -zz -r \$@' >> /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" + docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/bin/klayout -zz -r pymacros/EBeam_Lib_PCellTests.py" + # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml + # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml + # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + # K_LAYOUT_BINARY=$(docker exec ebeam_test sh -c "which klayout") # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros $K_LAYOUT_BINARY -zz -r pymacros/EBeam_Lib_PCellTests.py" # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml From b9b286b5d63be84c0158d88e24e97d6821758fee Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:50:00 -0800 Subject: [PATCH 108/173] Changing creation of shell script to be more explicit in actions file --- .github/workflows/EBeam_Tests.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index a79d25ec..9b8caed0 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -28,11 +28,17 @@ jobs: - name: Run KLayout Python script inside container and capture exit code # run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV run: | - docker exec ebeam_test sh -c "echo '#!/bin/bash' > /usr/local/bin/run_klayout.sh && echo '/usr/bin/klayout -zz -r \$@' >> /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" + docker exec ebeam_test sh -c "echo -e '#!/bin/bash\n/usr/bin/klayout -zz -r \$@' > /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + + # docker exec ebeam_test sh -c "echo '#!/bin/bash' > /usr/local/bin/run_klayout.sh && echo '/usr/bin/klayout -zz -r \$@' >> /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" + # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" + # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml + # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml + # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/bin/klayout -zz -r pymacros/EBeam_Lib_PCellTests.py" # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml From c9f95ca133869f1c8bd775585e6d1bd013091716 Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:53:12 -0800 Subject: [PATCH 109/173] Adding bash in front of run shell script command in actions file --- .github/workflows/EBeam_Tests.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 9b8caed0..1aa9ef0d 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -29,10 +29,17 @@ jobs: # run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV run: | docker exec ebeam_test sh -c "echo -e '#!/bin/bash\n/usr/bin/klayout -zz -r \$@' > /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" - docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" + docker exec ebeam_test bash -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + continue-on-error: true + + # docker exec ebeam_test sh -c "echo -e '#!/bin/bash\n/usr/bin/klayout -zz -r \$@' > /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" + # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" + # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml + # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml + # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV # docker exec ebeam_test sh -c "echo '#!/bin/bash' > /usr/local/bin/run_klayout.sh && echo '/usr/bin/klayout -zz -r \$@' >> /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" From a0de181b449f33551a08e5bc7d4ae13b6fe79aa7 Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:54:51 -0800 Subject: [PATCH 110/173] Removed syntax error; trying bash in front of shell script run command in yml file --- .github/workflows/EBeam_Tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 1aa9ef0d..8c8aa1fc 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -33,8 +33,7 @@ jobs: docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - continue-on-error: true - + # docker exec ebeam_test sh -c "echo -e '#!/bin/bash\n/usr/bin/klayout -zz -r \$@' > /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml From c020c53c3287eebc26c95d76e6d8d9db7c7c4dbc Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 16:59:40 -0800 Subject: [PATCH 111/173] Removing the sh -c from run klayout commands --- .github/workflows/EBeam_Tests.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 8c8aa1fc..8c515aa9 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -28,11 +28,16 @@ jobs: - name: Run KLayout Python script inside container and capture exit code # run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV run: | - docker exec ebeam_test sh -c "echo -e '#!/bin/bash\n/usr/bin/klayout -zz -r \$@' > /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" - docker exec ebeam_test bash -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" + docker exec ebeam_test coverage run --source=/home/pymacros /usr/bin/klayout -zz -r /home/pymacros/EBeam_Lib_PCellTests.py docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + + # docker exec ebeam_test sh -c "echo -e '#!/bin/bash\n/usr/bin/klayout -zz -r \$@' > /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" + # docker exec ebeam_test bash -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" + # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml + # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml + # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV # docker exec ebeam_test sh -c "echo -e '#!/bin/bash\n/usr/bin/klayout -zz -r \$@' > /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" From 81c83092fa6ebbf7ce001ee70e2bd46f1e4a7f44 Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Fri, 17 Nov 2023 17:09:01 -0800 Subject: [PATCH 112/173] Trying previous version of commands again --- .github/workflows/EBeam_Tests.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 8c515aa9..7aba4d45 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -28,16 +28,21 @@ jobs: - name: Run KLayout Python script inside container and capture exit code # run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV run: | - docker exec ebeam_test coverage run --source=/home/pymacros /usr/bin/klayout -zz -r /home/pymacros/EBeam_Lib_PCellTests.py - docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml - docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml - echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - - # docker exec ebeam_test sh -c "echo -e '#!/bin/bash\n/usr/bin/klayout -zz -r \$@' > /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" - # docker exec ebeam_test bash -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" - # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml - # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml - # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + docker exec ebeam_test sh -c "klayout -zz -r 'coverage run --source=/home/pymacros pymacros/EBeam_Lib_PCellTests.py'" + docker exec ebeam_test sh -c "coverage xml -o /home/pymacros/coverage.xml" + docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml + echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + + # docker exec ebeam_test coverage run --source=/home/pymacros /usr/bin/klayout -zz -r /home/pymacros/EBeam_Lib_PCellTests.py + # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml + # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml + # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + + # docker exec ebeam_test sh -c "echo -e '#!/bin/bash\n/usr/bin/klayout -zz -r \$@' > /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" + # docker exec ebeam_test bash -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" + # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml + # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml + # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV # docker exec ebeam_test sh -c "echo -e '#!/bin/bash\n/usr/bin/klayout -zz -r \$@' > /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" From 2e8c8f601121d8be21ed25cea5faecd4ab2a58c2 Mon Sep 17 00:00:00 2001 From: FarihaIS <70134554+FarihaIS@users.noreply.github.com> Date: Sat, 18 Nov 2023 14:12:18 -0800 Subject: [PATCH 113/173] Running without coverage command to get run actions with latest SiEPIC-Tools --- .github/workflows/EBeam_Tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 7aba4d45..49681001 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -26,12 +26,12 @@ jobs: run: docker cp $GITHUB_WORKSPACE/klayout/EBeam/pymacros ebeam_test:/home/pymacros - name: Run KLayout Python script inside container and capture exit code - # run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - run: | - docker exec ebeam_test sh -c "klayout -zz -r 'coverage run --source=/home/pymacros pymacros/EBeam_Lib_PCellTests.py'" - docker exec ebeam_test sh -c "coverage xml -o /home/pymacros/coverage.xml" - docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml - echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV + # run: | + # docker exec ebeam_test sh -c "klayout -zz -r 'coverage run --source=/home/pymacros pymacros/EBeam_Lib_PCellTests.py'" + # docker exec ebeam_test sh -c "coverage xml -o /home/pymacros/coverage.xml" + # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml + # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV # docker exec ebeam_test coverage run --source=/home/pymacros /usr/bin/klayout -zz -r /home/pymacros/EBeam_Lib_PCellTests.py # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml From 6606b3d1ee17acda95f68120f4e190e8f5c589ef Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Tue, 21 Nov 2023 15:23:53 -0800 Subject: [PATCH 114/173] use jasminabrar siepic tools with deleted qwidget file --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a3790ac7..8ca79156 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,8 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm # Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ - git clone --branch v0.4.5 https://github.com/SiEPIC/SiEPIC-Tools.git && \ + git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ + #git clone --branch v0.4.5 https://github.com/SiEPIC/SiEPIC-Tools.git && \ git clone https://github.com/SiEPIC/SiEPIC_EBeam_PDK.git # Install coverage package From 9a707fd8977bc90eb6d54ff52c1029be038f738d Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Tue, 21 Nov 2023 15:33:26 -0800 Subject: [PATCH 115/173] trigger action --- .github/workflows/EBeam_Tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 49681001..f86a79c9 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -93,9 +93,9 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - # - name: Fail job if exit code is non-zero - # run: | - # if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then - # echo "KLayout exited with non-zero exit code" - # exit 1 - # fi + - name: Fail job if exit code is non-zero + run: | + if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then + echo "KLayout exited with non-zero exit code" + exit 1 + fi From d8247af659f4e20acc85ba3f00a10ef3e3b33d32 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Tue, 21 Nov 2023 15:39:10 -0800 Subject: [PATCH 116/173] More changes made to jasminabrar siepic tools repo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8ca79156..6b249a48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN mkdir -p /root/.klayout/salt && \ git clone https://github.com/SiEPIC/SiEPIC_EBeam_PDK.git # Install coverage package -RUN pip3 install coverage +#RUN pip3 install coverage # Set the working directory WORKDIR /home From 35e126551720a6429f0d8904c6e46df35c2ade4d Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Tue, 21 Nov 2023 15:59:30 -0800 Subject: [PATCH 117/173] trigger build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6b249a48..fa05b4e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK . RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From b1a19820cd3991abb890872100a18d26f161ac08 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Tue, 21 Nov 2023 16:09:19 -0800 Subject: [PATCH 118/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index f86a79c9..cf97cf98 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -93,7 +93,7 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Fail job if exit code is non-zero + - name: Fail job if exit code is non-zero. run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then echo "KLayout exited with non-zero exit code" From bb361c70aadc17c52bf02dd066b35dbf688827f9 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Tue, 21 Nov 2023 16:21:49 -0800 Subject: [PATCH 119/173] use newest siepic tools --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fa05b4e5..849bae94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,8 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm # Clone SiEPIC-Tools and SiEPIC_EBeam_PDK . RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ - git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ - #git clone --branch v0.4.5 https://github.com/SiEPIC/SiEPIC-Tools.git && \ + #git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ + git clone https://github.com/SiEPIC/SiEPIC-Tools.git && \ git clone https://github.com/SiEPIC/SiEPIC_EBeam_PDK.git # Install coverage package From 9cc7158d0787b34c12d2418b8387f24500a3a1da Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Tue, 21 Nov 2023 16:26:56 -0800 Subject: [PATCH 120/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index cf97cf98..f86a79c9 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -93,7 +93,7 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Fail job if exit code is non-zero. + - name: Fail job if exit code is non-zero run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then echo "KLayout exited with non-zero exit code" From 181ec513a227748711ff1ca772943f0fbdb00ca2 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Tue, 21 Nov 2023 17:48:52 -0800 Subject: [PATCH 121/173] Use jasminabrar siepic tools 0.4.5 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 849bae94..1edade87 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,8 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm # Clone SiEPIC-Tools and SiEPIC_EBeam_PDK . RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ - #git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ - git clone https://github.com/SiEPIC/SiEPIC-Tools.git && \ + git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ + #git clone https://github.com/SiEPIC/SiEPIC-Tools.git && \ git clone https://github.com/SiEPIC/SiEPIC_EBeam_PDK.git # Install coverage package From fae92ee905377c9c6e89140d295e029dce4d02b8 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Tue, 21 Nov 2023 18:03:12 -0800 Subject: [PATCH 122/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index f86a79c9..cf97cf98 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -93,7 +93,7 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Fail job if exit code is non-zero + - name: Fail job if exit code is non-zero. run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then echo "KLayout exited with non-zero exit code" From 816c317e71f6088f4ff97495054e7e61363c84c6 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 09:27:11 -0800 Subject: [PATCH 123/173] build new image with layout.py using 0.4.6 code, rest of siepic tools is 0.4.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1edade87..811e2fd6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK . +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From 324ec5a6a089b24d424b73a04c3e05fff845f921 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 09:31:30 -0800 Subject: [PATCH 124/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index cf97cf98..f86a79c9 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -93,7 +93,7 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Fail job if exit code is non-zero. + - name: Fail job if exit code is non-zero run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then echo "KLayout exited with non-zero exit code" From cfa79edd0c1c1c921faa88fea10e06dadbbeecdf Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 09:34:20 -0800 Subject: [PATCH 125/173] build new image with layout.py + geometry.py using 0.4.6 code, rest of siepic tools is 0.4.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 811e2fd6..167bb501 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From 33a634f951cdc6ff8211ce57a334726ba4a740e1 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 09:38:51 -0800 Subject: [PATCH 126/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index f86a79c9..cf97cf98 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -93,7 +93,7 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Fail job if exit code is non-zero + - name: Fail job if exit code is non-zero. run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then echo "KLayout exited with non-zero exit code" From b611c11891031b43c651a49240ac180ed9f433e8 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 11:04:34 -0800 Subject: [PATCH 127/173] build new image with partial u 0.4.6 code layout.py. geometry.py, init.py update to 0.4.6, rest is 0.4.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 167bb501..ee749a6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From 5dd7fb50bdfa8f535f16b70a05804ac1c39e01f4 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 11:09:31 -0800 Subject: [PATCH 128/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index cf97cf98..f86a79c9 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -93,7 +93,7 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Fail job if exit code is non-zero. + - name: Fail job if exit code is non-zero run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then echo "KLayout exited with non-zero exit code" From a4a2a7d913a305b329486c0b5496f792531b266a Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 11:12:16 -0800 Subject: [PATCH 129/173] build new image using partial 0.4.6 code layout.py, geometry.py, init.py, update.py using 0.4.6 code, rest is 0.4.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ee749a6c..167bb501 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From 787cde9385939e397d46fa41b01d750ba6f4757c Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 11:17:33 -0800 Subject: [PATCH 130/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index f86a79c9..cf97cf98 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -93,7 +93,7 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Fail job if exit code is non-zero + - name: Fail job if exit code is non-zero. run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then echo "KLayout exited with non-zero exit code" From d4ece0215a6e1be6184f563f25b0e5d4537da321 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 11:43:18 -0800 Subject: [PATCH 131/173] update image to user partial 0.4.6 siepic tools layout.py, geometry.py, init.py, extend.py, _globals.py --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 167bb501..ee749a6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From 26f78144785a26fdd298b10b340a2625bbba8e14 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 11:48:18 -0800 Subject: [PATCH 132/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index cf97cf98..f86a79c9 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -93,7 +93,7 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Fail job if exit code is non-zero. + - name: Fail job if exit code is non-zero run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then echo "KLayout exited with non-zero exit code" From 048650f6c3e7feb1fa44c9f52dc63c73c3470080 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 11:52:54 -0800 Subject: [PATCH 133/173] build new image using partial 0.4.6 code layout.py, geometry.py, init.py, extend.py, global.py, siepic.lym --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ee749a6c..167bb501 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From 28b0906f071f54700ff25857fc343e9fc23c8c43 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 11:57:51 -0800 Subject: [PATCH 134/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index f86a79c9..cf97cf98 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -93,7 +93,7 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Fail job if exit code is non-zero + - name: Fail job if exit code is non-zero. run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then echo "KLayout exited with non-zero exit code" From 53f5ad7aff585a55bd7f7f1102bdfe7e9025d00b Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 12:01:29 -0800 Subject: [PATCH 135/173] build new image using partial 0.4.6 code layout.py, geometry.py, init.py, extend.py, globals.py, siepic.lym, add components.py & modify siepic-test environment.lym --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 167bb501..ee749a6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From a5cd9b27da700f1d198e06a877d8eacaf5f3173b Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 12:06:28 -0800 Subject: [PATCH 136/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index cf97cf98..f86a79c9 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -93,7 +93,7 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Fail job if exit code is non-zero. + - name: Fail job if exit code is non-zero run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then echo "KLayout exited with non-zero exit code" From fc656201098e6d92887dc15388cd75b441c777a7 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 12:10:31 -0800 Subject: [PATCH 137/173] update image to use all of 0.4.6 siepic tools layout.py, geometry.py, init.py, extend.py, globals.py, siepic.lym, add components.py & modify siepic-test environment.lym, make siepic component from cell.lym --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ee749a6c..167bb501 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From cf213b163da24ea7cbff463b255a48cff5e9a9b5 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 12:15:59 -0800 Subject: [PATCH 138/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index f86a79c9..cf97cf98 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -93,7 +93,7 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Fail job if exit code is non-zero + - name: Fail job if exit code is non-zero. run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then echo "KLayout exited with non-zero exit code" From 16555ddaac559a998e3cacc2ef8dc8e4c653d80c Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 12:46:36 -0800 Subject: [PATCH 139/173] build image using added change I missed in extend.py --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 167bb501..ee749a6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From 95daffc2a7fc693b43fc9f05d0383c81ddd1679b Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 12:51:08 -0800 Subject: [PATCH 140/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index cf97cf98..f86a79c9 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -93,7 +93,7 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Fail job if exit code is non-zero. + - name: Fail job if exit code is non-zero run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then echo "KLayout exited with non-zero exit code" From 1b432616b79867aca09aa8a505d1e879c39846dc Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 12:58:26 -0800 Subject: [PATCH 141/173] build with more updates to match 0.4.6 uncomment siepic verification line in siepic test environment .lym --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ee749a6c..167bb501 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From 208d8286223662a395594d39e6c6e603cd0b586d Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 13:06:54 -0800 Subject: [PATCH 142/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index f86a79c9..cf97cf98 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -93,7 +93,7 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Fail job if exit code is non-zero + - name: Fail job if exit code is non-zero. run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then echo "KLayout exited with non-zero exit code" From 50b95c492b6c9ad2292f32e9ad8f8911ccbc6932 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 13:16:48 -0800 Subject: [PATCH 143/173] updates siepic.lym in siepic tools repo to match 0.4.6 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 167bb501..ee749a6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From b496a45ee36dbf143c84d571c06317b406aaf9fc Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 13:22:35 -0800 Subject: [PATCH 144/173] Update EBeam_Tests.yml --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index cf97cf98..f7d52500 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -88,7 +88,7 @@ jobs: docker stop ebeam_test docker rm ebeam_test - - name: Upload coverage reports to Codecov + - name: Upload coverage reports to Codecov. uses: codecov/codecov-action@v3 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} From feda2a9c77fd405aba986dddc24489532d53bb2a Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 13:46:19 -0800 Subject: [PATCH 145/173] build new image with updated globals.py for 0.4.6 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ee749a6c..167bb501 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From 7a4d04d1a993a3ac2a3744f29b624d69897e920d Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 13:50:53 -0800 Subject: [PATCH 146/173] trigger build --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index f7d52500..47129ecc 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: Pull siepic_klayout image + - name: Pull siepic_klayout image. run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-latest - name: Run docker container from image From 8de4f400b52e5c3bf542ea695fcf29733ba33e81 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 18:29:08 -0800 Subject: [PATCH 147/173] build new image with changes to globals.py --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 167bb501..ee749a6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From e9c2b4fb2575c02657d0c557ff66738ecae95f55 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 18:34:25 -0800 Subject: [PATCH 148/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 47129ecc..1d32e441 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout code + - name: Checkout code. uses: actions/checkout@v3 - name: Pull siepic_klayout image. From 8541f0f000dd7a39c7017d2a5bf713357e71fb5e Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 18:38:58 -0800 Subject: [PATCH 149/173] build new image with more changes to global.py --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ee749a6c..167bb501 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From 77156b801571837a08505b8b785386572bae70dc Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 18:44:01 -0800 Subject: [PATCH 150/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 1d32e441..47129ecc 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout code. + - name: Checkout code uses: actions/checkout@v3 - name: Pull siepic_klayout image. From cc076ff9967f03c91db3b672151dcbb1a9758463 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 18:47:49 -0800 Subject: [PATCH 151/173] build new image with changes to global.py --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 167bb501..ee749a6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From 4304bc63b2e0db081d1cff1475472bed3958c66a Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 18:52:27 -0800 Subject: [PATCH 152/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 47129ecc..1d32e441 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout code + - name: Checkout code. uses: actions/checkout@v3 - name: Pull siepic_klayout image. From 8d44f21ba98735459d657abf5b8569fa710a39c6 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 18:55:08 -0800 Subject: [PATCH 153/173] build new image with updated global.oy --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ee749a6c..167bb501 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From 99a91c6871dfb21ec4083d84d3f1f5093072b611 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 18:59:27 -0800 Subject: [PATCH 154/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 1d32e441..47129ecc 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout code. + - name: Checkout code uses: actions/checkout@v3 - name: Pull siepic_klayout image. From 26c99b76b426a83a12907614f44dab8d007fcc49 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 19:02:29 -0800 Subject: [PATCH 155/173] build new image with updated global.py --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 167bb501..ee749a6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From d904339e678b47ceb3ed263738bc95074f41207c Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 19:07:43 -0800 Subject: [PATCH 156/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 47129ecc..1d32e441 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout code + - name: Checkout code. uses: actions/checkout@v3 - name: Pull siepic_klayout image. From 5b54e01dca0fdb9890260ff8d69953586d91b0bb Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 19:10:19 -0800 Subject: [PATCH 157/173] build new image with changes to _globals.py --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ee749a6c..167bb501 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From 3f06e22b45dfe600b8084a6f36b10bae5391da72 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 19:14:20 -0800 Subject: [PATCH 158/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 1d32e441..47129ecc 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout code. + - name: Checkout code uses: actions/checkout@v3 - name: Pull siepic_klayout image. From 87c99101d1d377f3918c10a43ff25e926d3a328e Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 19:16:51 -0800 Subject: [PATCH 159/173] new image with updated __globals.py --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 167bb501..ee749a6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From abeade3896c7275ad4f748d0d27e8aadbc11541e Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 19:21:41 -0800 Subject: [PATCH 160/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 47129ecc..1d32e441 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout code + - name: Checkout code. uses: actions/checkout@v3 - name: Pull siepic_klayout image. From d2266d2b6cd872cfaf04b28981f6720a5a741ae0 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 19:40:07 -0800 Subject: [PATCH 161/173] build image with newest siepic tools + installing numpy --- Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ee749a6c..119a2fee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,9 @@ FROM quay.io/centos/centos:stream8 RUN dnf -y update && \ dnf -y install wget bzip2 unzip git mesa-dri-drivers python3-pip +# Install Numpy +RUN pip3 install numpy + # Install the newest version of KLayout RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm -O ~/klayout.rpm && \ dnf -y localinstall ~/klayout.rpm && \ @@ -12,8 +15,8 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm # Clone SiEPIC-Tools and SiEPIC_EBeam_PDK RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ - git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ - #git clone https://github.com/SiEPIC/SiEPIC-Tools.git && \ + #git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ + git clone https://github.com/SiEPIC/SiEPIC-Tools.git && \ git clone https://github.com/SiEPIC/SiEPIC_EBeam_PDK.git # Install coverage package From f308aa63368ab3a38f7a50f374c13515ce332e92 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 19:44:20 -0800 Subject: [PATCH 162/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 1d32e441..47129ecc 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout code. + - name: Checkout code uses: actions/checkout@v3 - name: Pull siepic_klayout image. From bbc4f0d8f80645388c12081d23437582c27411e9 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 20:29:09 -0800 Subject: [PATCH 163/173] build new image with newest siepic tools that should have qwidget error fixed --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 119a2fee..fc472b71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm dnf -y localinstall ~/klayout.rpm && \ rm ~/klayout.rpm -# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK +# Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ #git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ From 437906daff5393c86c31468ca2a571f1d3b3cf92 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Wed, 22 Nov 2023 20:34:05 -0800 Subject: [PATCH 164/173] trigger action --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 47129ecc..f7d52500 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: Pull siepic_klayout image. + - name: Pull siepic_klayout image run: docker pull ghcr.io/jasminabrar/siepic_ebeam_pdk/siepic_klayout:master-latest - name: Run docker container from image From 266e7e1b17406b4418be138b7a52fee5ac083c3a Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 23 Nov 2023 08:43:17 -0800 Subject: [PATCH 165/173] Remove commented out lines and codecov step --- .github/workflows/EBeam_Tests.yml | 59 ------------------------------- 1 file changed, 59 deletions(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index f7d52500..59ccbcfe 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -27,60 +27,6 @@ jobs: - name: Run KLayout Python script inside container and capture exit code run: docker exec ebeam_test klayout -zz -r pymacros/EBeam_Lib_PCellTests.py || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - # run: | - # docker exec ebeam_test sh -c "klayout -zz -r 'coverage run --source=/home/pymacros pymacros/EBeam_Lib_PCellTests.py'" - # docker exec ebeam_test sh -c "coverage xml -o /home/pymacros/coverage.xml" - # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml - # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - - # docker exec ebeam_test coverage run --source=/home/pymacros /usr/bin/klayout -zz -r /home/pymacros/EBeam_Lib_PCellTests.py - # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml - # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml - # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - - # docker exec ebeam_test sh -c "echo -e '#!/bin/bash\n/usr/bin/klayout -zz -r \$@' > /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" - # docker exec ebeam_test bash -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" - # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml - # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml - # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - - # docker exec ebeam_test sh -c "echo -e '#!/bin/bash\n/usr/bin/klayout -zz -r \$@' > /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" - # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" - # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml - # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml - # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - - # docker exec ebeam_test sh -c "echo '#!/bin/bash' > /usr/local/bin/run_klayout.sh && echo '/usr/bin/klayout -zz -r \$@' >> /usr/local/bin/run_klayout.sh && chmod +x /usr/local/bin/run_klayout.sh" - # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/local/bin/run_klayout.sh pymacros/EBeam_Lib_PCellTests.py" - # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml - # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml - # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - - # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/bin/klayout -zz -r pymacros/EBeam_Lib_PCellTests.py" - # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml - # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml - # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - - # K_LAYOUT_BINARY=$(docker exec ebeam_test sh -c "which klayout") - # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros $K_LAYOUT_BINARY -zz -r pymacros/EBeam_Lib_PCellTests.py" - # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml - # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml - # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - - # docker exec ebeam_test sh -c "coverage run --source=/home/pymacros /usr/local/bin/klayout -zz -r pymacros/EBeam_Lib_PCellTests.py" - # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml - # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml - # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - - # docker exec ebeam_test sh -c "klayout -zz -r 'coverage run --source=/home/pymacros pymacros/EBeam_Lib_PCellTests.py'" - # docker exec ebeam_test sh -c "coverage xml -o /home/pymacros/coverage.xml" - # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml - # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - - # docker exec ebeam_test klayout -zz -r "coverage run --source=/home/pymacros pymacros/EBeam_Lib_PCellTests.py" || echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV - # docker exec ebeam_test coverage xml -o /home/pymacros/coverage.xml - # docker cp ebeam_test:/home/pymacros/coverage.xml $GITHUB_WORKSPACE/coverage.xml - # echo "KLAYOUT_EXIT_CODE=$?" >> $GITHUB_ENV continue-on-error: true - name: Stop container and remove it @@ -88,11 +34,6 @@ jobs: docker stop ebeam_test docker rm ebeam_test - - name: Upload coverage reports to Codecov. - uses: codecov/codecov-action@v3 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Fail job if exit code is non-zero. run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then From 1b9f76efd6f91f6891be7028aa7d29dcf2dca44e Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 23 Nov 2023 08:44:48 -0800 Subject: [PATCH 166/173] Delete .github/workflows/Coverage_EBeam_Tests.yml --- .github/workflows/Coverage_EBeam_Tests.yml | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 .github/workflows/Coverage_EBeam_Tests.yml diff --git a/.github/workflows/Coverage_EBeam_Tests.yml b/.github/workflows/Coverage_EBeam_Tests.yml deleted file mode 100644 index 3b5dc820..00000000 --- a/.github/workflows/Coverage_EBeam_Tests.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Coverage EBeam Tests - -on: - pull_request: - branches: - - master - -jobs: - ebeam-tests-coverage: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.x' - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install coverage - - - name: Run KLayout Python script with coverage - run: | - coverage run --source=. $GITHUB_WORKSPACE/klayout/EBeam/pymacros/EBeam_Lib_PCellTests.py - continue-on-error: true - - - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v3 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} From 80fd2f287f6d8917c8bdc7bc39f6443a5f5d1901 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 23 Nov 2023 08:45:52 -0800 Subject: [PATCH 167/173] Remove unnecessary period --- .github/workflows/EBeam_Tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/EBeam_Tests.yml b/.github/workflows/EBeam_Tests.yml index 59ccbcfe..7936cdb3 100644 --- a/.github/workflows/EBeam_Tests.yml +++ b/.github/workflows/EBeam_Tests.yml @@ -34,7 +34,7 @@ jobs: docker stop ebeam_test docker rm ebeam_test - - name: Fail job if exit code is non-zero. + - name: Fail job if exit code is non-zero run: | if [ $KLAYOUT_EXIT_CODE -ne 0 ]; then echo "KLayout exited with non-zero exit code" From 856e1aa0f63552cb7ce59fb92d5b6ad5de7abd4c Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 23 Nov 2023 08:47:37 -0800 Subject: [PATCH 168/173] Rename docker-image.yml to Docker_Image.yml --- .github/workflows/{docker-image.yml => Docker_Image.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{docker-image.yml => Docker_Image.yml} (100%) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/Docker_Image.yml similarity index 100% rename from .github/workflows/docker-image.yml rename to .github/workflows/Docker_Image.yml From 027ff19c63ce3754c97efd93f7d119a4ed5be36b Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 23 Nov 2023 08:49:42 -0800 Subject: [PATCH 169/173] Cleaning up Dockerfile --- Dockerfile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index fc472b71..7ec00701 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,6 @@ FROM quay.io/centos/centos:stream8 RUN dnf -y update && \ dnf -y install wget bzip2 unzip git mesa-dri-drivers python3-pip -# Install Numpy -RUN pip3 install numpy - # Install the newest version of KLayout RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm -O ~/klayout.rpm && \ dnf -y localinstall ~/klayout.rpm && \ @@ -15,13 +12,9 @@ RUN wget https://www.klayout.org/downloads/CentOS_8/klayout-0.28.12-0.x86_64.rpm # Clone SiEPIC-Tools and SiEPIC_EBeam_PDK. RUN mkdir -p /root/.klayout/salt && \ cd /root/.klayout/salt && \ - #git clone https://github.com/jasminabrar/SiEPIC-Tools.git && \ git clone https://github.com/SiEPIC/SiEPIC-Tools.git && \ git clone https://github.com/SiEPIC/SiEPIC_EBeam_PDK.git -# Install coverage package -#RUN pip3 install coverage - # Set the working directory WORKDIR /home From fce7cbde5335a527bc7184c3fdf32e1820eff2a8 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 23 Nov 2023 08:50:36 -0800 Subject: [PATCH 170/173] remove codecov button --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index d872e724..89cecff8 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,6 @@ # SiEPIC_EBeam_PDK -[![codecov](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK/main/graph/badge.svg)](https://codecov.io/gh/jasminabrar/SiEPIC_EBeam_PDK) - SiEPIC EBeam PDK, Library - for silicon photonics layout, design, verification and circuit simulation - by Lukas Chrostowski (lukasc-ubc), (c) 2015-2023, with contributions by: Zeqin Lu, Jaspreet Jhoja, Xu Wang, Jonas Flueckiger, Brett Poulsen (bpoulse). From 9f31829c60d99220e474b023b896c3fe6550b2fd Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 23 Nov 2023 08:51:06 -0800 Subject: [PATCH 171/173] remove extra line --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 89cecff8..ad10fb93 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,6 @@ # SiEPIC_EBeam_PDK - - SiEPIC EBeam PDK, Library - for silicon photonics layout, design, verification and circuit simulation - by Lukas Chrostowski (lukasc-ubc), (c) 2015-2023, with contributions by: Zeqin Lu, Jaspreet Jhoja, Xu Wang, Jonas Flueckiger, Brett Poulsen (bpoulse). - Package in KLayout, klayout.de (version 0.28 +) From 40ba776e872a8f442eeed52f1c1a45a658b5e94f Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 23 Nov 2023 08:52:01 -0800 Subject: [PATCH 172/173] Delete docker_image_version_info --- docker_image_version_info | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 docker_image_version_info diff --git a/docker_image_version_info b/docker_image_version_info deleted file mode 100644 index f5bc5ea4..00000000 --- a/docker_image_version_info +++ /dev/null @@ -1,4 +0,0 @@ -- master: original image with klayout and newest siepic tools and siepic ebeam_pdk -- master-siepic_tools_v0.4.5: uses v0.4.5 of siepic tools -- master.20231116.21: uses jasminabrar forked SiEPIC Tools repo with added QApplication line -- master.20231116.22: uses jasminabrar forked SiEPIC Tools repo with added QApplication line + ENV vars removed from docker file From 2d5b3d7654c658bef3e34657e1252e0284eefe47 Mon Sep 17 00:00:00 2001 From: jasminabrar <73445895+jasminabrar@users.noreply.github.com> Date: Thu, 23 Nov 2023 10:37:44 -0800 Subject: [PATCH 173/173] Add redundant period --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7ec00701..5e9cf57d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM quay.io/centos/centos:stream8 -# Update the system and install necessary tools +# Update the system and install necessary tools. RUN dnf -y update && \ dnf -y install wget bzip2 unzip git mesa-dri-drivers python3-pip