From 44820cf3ceb4cbb03276a094f99c2d26267eae65 Mon Sep 17 00:00:00 2001 From: chetanyagoyal Date: Fri, 4 Oct 2024 09:44:36 +0000 Subject: [PATCH 1/4] fix numpy version to 1.23.5 --- .github/workflows/glayout_opamp_sim.yml | 2 -- .github/workflows/glayout_sky130.yml | 10 ---------- docker/conda/Dockerfile | 1 + .../glayout/tapeout/tapeout_and_RL/requirements.txt | 1 + requirements.txt | 2 +- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.github/workflows/glayout_opamp_sim.yml b/.github/workflows/glayout_opamp_sim.yml index 856a0c51a..cf9eb9fcf 100644 --- a/.github/workflows/glayout_opamp_sim.yml +++ b/.github/workflows/glayout_opamp_sim.yml @@ -41,8 +41,6 @@ jobs: pip3 install -r requirements.txt &&\ cd ./openfasoc/generators/glayout/tapeout/tapeout_and_RL/ &&\ pip3 install prettyprint prettyprinttree gdstk &&\ - python3 -m pip uninstall numpy -y &&\ - python3 -m pip install numpy==1.23.5 &&\ python3 test_glayout_ci.py --component opamp_parametric " && exit_code=$? | tee -a glayout.log if [ $? -ne 0 ]; then exit 1; fi diff --git a/.github/workflows/glayout_sky130.yml b/.github/workflows/glayout_sky130.yml index b2fb0f489..804087e31 100644 --- a/.github/workflows/glayout_sky130.yml +++ b/.github/workflows/glayout_sky130.yml @@ -41,8 +41,6 @@ jobs: cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/. &&\ cd ./openfasoc/generators/glayout &&\ pip3 install gdsfactory==7.7.0 prettyprint prettyprinttree gdstk &&\ - python3 -m pip uninstall numpy -y &&\ - python3 -m pip install numpy==1.23.5 &&\ python3 test_glayout_ci.py --component opamp " && exit_code=$? | tee -a glayout.log if [ $? -ne 0 ]; then exit 1; fi @@ -64,8 +62,6 @@ jobs: cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/. &&\ cd ./openfasoc/generators/glayout &&\ pip3 install gdsfactory==7.7.0 prettyprint prettyprinttree gdstk &&\ - python3 -m pip uninstall numpy -y &&\ - python3 -m pip install numpy==1.23.5 &&\ python3 test_glayout_ci.py --component pmos " && exit_code=$? | tee -a glayout.log if [ $? -ne 0 ]; then exit 1; fi @@ -86,8 +82,6 @@ jobs: cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/. &&\ cd ./openfasoc/generators/glayout &&\ pip3 install gdsfactory==7.7.0 prettyprint prettyprinttree gdstk &&\ - python3 -m pip uninstall numpy -y &&\ - python3 -m pip install numpy==1.23.5 &&\ python3 test_glayout_ci.py --component nmos " && exit_code=$? | tee -a glayout.log if [ $? -ne 0 ]; then exit 1; fi @@ -108,8 +102,6 @@ jobs: cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/. &&\ cd ./openfasoc/generators/glayout &&\ pip3 install gdsfactory==7.7.0 prettyprint prettyprinttree gdstk &&\ - python3 -m pip uninstall numpy -y &&\ - python3 -m pip install numpy==1.23.5 &&\ python3 test_glayout_ci.py --component diff_pair " && exit_code=$? | tee -a glayout.log if [ $? -ne 0 ]; then exit 1; fi @@ -130,8 +122,6 @@ jobs: cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/. &&\ cd ./openfasoc/generators/glayout &&\ pip3 install gdsfactory==7.7.0 prettyprint prettyprinttree gdstk &&\ - python3 -m pip uninstall numpy -y &&\ - python3 -m pip install numpy==1.23.5 &&\ python3 test_glayout_ci.py --component current_mirror " && exit_code=$? | tee -a glayout.log if [ $? -ne 0 ]; then exit 1; fi diff --git a/docker/conda/Dockerfile b/docker/conda/Dockerfile index 0ee98e006..3a1768ab5 100755 --- a/docker/conda/Dockerfile +++ b/docker/conda/Dockerfile @@ -27,6 +27,7 @@ ENV PDK_ROOT=/usr/bin/miniconda3/share/pdk/ RUN wget https://www.klayout.org/downloads/Ubuntu-22/klayout_0.28.17-1_amd64.deb RUN dpkg -i klayout_0.28.17-1_amd64.deb RUN pip install glayout +RUN pip install numpy==1.23.5 #RUN strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5 COPY ./scripts /scripts diff --git a/openfasoc/generators/glayout/tapeout/tapeout_and_RL/requirements.txt b/openfasoc/generators/glayout/tapeout/tapeout_and_RL/requirements.txt index 744a97091..91fa553fb 100644 --- a/openfasoc/generators/glayout/tapeout/tapeout_and_RL/requirements.txt +++ b/openfasoc/generators/glayout/tapeout/tapeout_and_RL/requirements.txt @@ -4,3 +4,4 @@ matplotlib scipy seaborn prettyprinttree +numpy==1.23.5 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index f48a42e9d..8dab2f16b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ pandas klayout -numpy +numpy==1.23.5 matplotlib gdsfactory==7.7.0 nbsphinx From 3b9af390bd8526c20838815db830465ba625bd96 Mon Sep 17 00:00:00 2001 From: chetanyagoyal Date: Fri, 4 Oct 2024 09:53:53 +0000 Subject: [PATCH 2/4] fix numpy version to 1.23.5 --- .github/workflows/glayout_opamp_sim.yml | 3 ++- docker/conda/Dockerfile | 1 - openfasoc/generators/glayout/requirements.txt | 1 + .../generators/glayout/tapeout/tapeout_and_RL/requirements.txt | 3 +-- requirements.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/glayout_opamp_sim.yml b/.github/workflows/glayout_opamp_sim.yml index cf9eb9fcf..bd6ce1a64 100644 --- a/.github/workflows/glayout_opamp_sim.yml +++ b/.github/workflows/glayout_opamp_sim.yml @@ -38,9 +38,10 @@ jobs: bash -c "\ cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/tapeout/tapeout_and_RL/. &&\ pip uninstall glayout -y &&\ - pip3 install -r requirements.txt &&\ + pip3 install -r ./openfasoc/generators/glayout/requirements.txt &&\ cd ./openfasoc/generators/glayout/tapeout/tapeout_and_RL/ &&\ pip3 install prettyprint prettyprinttree gdstk &&\ + pip3 install -r requirements.txt python3 test_glayout_ci.py --component opamp_parametric " && exit_code=$? | tee -a glayout.log if [ $? -ne 0 ]; then exit 1; fi diff --git a/docker/conda/Dockerfile b/docker/conda/Dockerfile index 3a1768ab5..0ee98e006 100755 --- a/docker/conda/Dockerfile +++ b/docker/conda/Dockerfile @@ -27,7 +27,6 @@ ENV PDK_ROOT=/usr/bin/miniconda3/share/pdk/ RUN wget https://www.klayout.org/downloads/Ubuntu-22/klayout_0.28.17-1_amd64.deb RUN dpkg -i klayout_0.28.17-1_amd64.deb RUN pip install glayout -RUN pip install numpy==1.23.5 #RUN strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5 COPY ./scripts /scripts diff --git a/openfasoc/generators/glayout/requirements.txt b/openfasoc/generators/glayout/requirements.txt index 02a3f6895..ec5462945 100644 --- a/openfasoc/generators/glayout/requirements.txt +++ b/openfasoc/generators/glayout/requirements.txt @@ -1,4 +1,5 @@ gdsfactory==7.7.0 +numpy==1.23.5 prettyprint prettyprinttree nltk diff --git a/openfasoc/generators/glayout/tapeout/tapeout_and_RL/requirements.txt b/openfasoc/generators/glayout/tapeout/tapeout_and_RL/requirements.txt index 91fa553fb..46fd69aa6 100644 --- a/openfasoc/generators/glayout/tapeout/tapeout_and_RL/requirements.txt +++ b/openfasoc/generators/glayout/tapeout/tapeout_and_RL/requirements.txt @@ -3,5 +3,4 @@ scikit-learn matplotlib scipy seaborn -prettyprinttree -numpy==1.23.5 \ No newline at end of file +prettyprinttree \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 8dab2f16b..f48a42e9d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ pandas klayout -numpy==1.23.5 +numpy matplotlib gdsfactory==7.7.0 nbsphinx From 5d51fef3bd9f32592a65509c1e9700791cd36f4c Mon Sep 17 00:00:00 2001 From: chetanyagoyal Date: Fri, 4 Oct 2024 13:00:26 +0000 Subject: [PATCH 3/4] force reinstall only for glayout dependencies --- .github/workflows/glayout_opamp_sim.yml | 4 ++-- .github/workflows/glayout_sky130.yml | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/glayout_opamp_sim.yml b/.github/workflows/glayout_opamp_sim.yml index bd6ce1a64..5445d2d55 100644 --- a/.github/workflows/glayout_opamp_sim.yml +++ b/.github/workflows/glayout_opamp_sim.yml @@ -37,11 +37,11 @@ jobs: $IMAGE_NAME \ bash -c "\ cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/tapeout/tapeout_and_RL/. &&\ - pip uninstall glayout -y &&\ + pip3 uninstall glayout -y &&\ pip3 install -r ./openfasoc/generators/glayout/requirements.txt &&\ cd ./openfasoc/generators/glayout/tapeout/tapeout_and_RL/ &&\ pip3 install prettyprint prettyprinttree gdstk &&\ - pip3 install -r requirements.txt + pip3 install --force-reinstall -v -r requirements.txt python3 test_glayout_ci.py --component opamp_parametric " && exit_code=$? | tee -a glayout.log if [ $? -ne 0 ]; then exit 1; fi diff --git a/.github/workflows/glayout_sky130.yml b/.github/workflows/glayout_sky130.yml index 804087e31..570af196c 100644 --- a/.github/workflows/glayout_sky130.yml +++ b/.github/workflows/glayout_sky130.yml @@ -40,6 +40,7 @@ jobs: pip uninstall glayout -y &&\ cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/. &&\ cd ./openfasoc/generators/glayout &&\ + pip3 install --force-reinstall -r requirements.txt &&\ pip3 install gdsfactory==7.7.0 prettyprint prettyprinttree gdstk &&\ python3 test_glayout_ci.py --component opamp " && exit_code=$? | tee -a glayout.log @@ -61,6 +62,7 @@ jobs: pip uninstall glayout -y &&\ cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/. &&\ cd ./openfasoc/generators/glayout &&\ + pip3 install --force-reinstall -r requirements.txt &&\ pip3 install gdsfactory==7.7.0 prettyprint prettyprinttree gdstk &&\ python3 test_glayout_ci.py --component pmos " && exit_code=$? | tee -a glayout.log @@ -81,6 +83,7 @@ jobs: pip uninstall glayout -y &&\ cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/. &&\ cd ./openfasoc/generators/glayout &&\ + pip3 install --force-reinstall -r requirements.txt &&\ pip3 install gdsfactory==7.7.0 prettyprint prettyprinttree gdstk &&\ python3 test_glayout_ci.py --component nmos " && exit_code=$? | tee -a glayout.log @@ -101,6 +104,7 @@ jobs: pip uninstall glayout -y &&\ cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/. &&\ cd ./openfasoc/generators/glayout &&\ + pip3 install --force-reinstall -r requirements.txt &&\ pip3 install gdsfactory==7.7.0 prettyprint prettyprinttree gdstk &&\ python3 test_glayout_ci.py --component diff_pair " && exit_code=$? | tee -a glayout.log @@ -121,6 +125,7 @@ jobs: pip uninstall glayout -y &&\ cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/. &&\ cd ./openfasoc/generators/glayout &&\ + pip3 install --force-reinstall -r requirements.txt &&\ pip3 install gdsfactory==7.7.0 prettyprint prettyprinttree gdstk &&\ python3 test_glayout_ci.py --component current_mirror " && exit_code=$? | tee -a glayout.log From f923d97e61c40a1fd041ca76b3f8323b78f3185d Mon Sep 17 00:00:00 2001 From: chetanyagoyal Date: Fri, 4 Oct 2024 14:00:42 +0000 Subject: [PATCH 4/4] fix all workflows --- .github/workflows/glayout_opamp_sim.yml | 5 ++--- .github/workflows/glayout_sky130.yml | 7 +------ openfasoc/generators/glayout/requirements.txt | 7 ++++--- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/glayout_opamp_sim.yml b/.github/workflows/glayout_opamp_sim.yml index 5445d2d55..9c6594a06 100644 --- a/.github/workflows/glayout_opamp_sim.yml +++ b/.github/workflows/glayout_opamp_sim.yml @@ -38,10 +38,9 @@ jobs: bash -c "\ cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/tapeout/tapeout_and_RL/. &&\ pip3 uninstall glayout -y &&\ - pip3 install -r ./openfasoc/generators/glayout/requirements.txt &&\ cd ./openfasoc/generators/glayout/tapeout/tapeout_and_RL/ &&\ - pip3 install prettyprint prettyprinttree gdstk &&\ - pip3 install --force-reinstall -v -r requirements.txt + pip3 install -r requirements.txt &&\ + pip3 install --force-reinstall -r ./../../requirements.txt &&\ python3 test_glayout_ci.py --component opamp_parametric " && exit_code=$? | tee -a glayout.log if [ $? -ne 0 ]; then exit 1; fi diff --git a/.github/workflows/glayout_sky130.yml b/.github/workflows/glayout_sky130.yml index 570af196c..e2968ef94 100644 --- a/.github/workflows/glayout_sky130.yml +++ b/.github/workflows/glayout_sky130.yml @@ -41,7 +41,6 @@ jobs: cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/. &&\ cd ./openfasoc/generators/glayout &&\ pip3 install --force-reinstall -r requirements.txt &&\ - pip3 install gdsfactory==7.7.0 prettyprint prettyprinttree gdstk &&\ python3 test_glayout_ci.py --component opamp " && exit_code=$? | tee -a glayout.log if [ $? -ne 0 ]; then exit 1; fi @@ -63,7 +62,6 @@ jobs: cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/. &&\ cd ./openfasoc/generators/glayout &&\ pip3 install --force-reinstall -r requirements.txt &&\ - pip3 install gdsfactory==7.7.0 prettyprint prettyprinttree gdstk &&\ python3 test_glayout_ci.py --component pmos " && exit_code=$? | tee -a glayout.log if [ $? -ne 0 ]; then exit 1; fi @@ -80,11 +78,10 @@ jobs: -w $PWD \ $IMAGE_NAME \ bash -c "\ - pip uninstall glayout -y &&\ + pip3 uninstall glayout -y &&\ cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/. &&\ cd ./openfasoc/generators/glayout &&\ pip3 install --force-reinstall -r requirements.txt &&\ - pip3 install gdsfactory==7.7.0 prettyprint prettyprinttree gdstk &&\ python3 test_glayout_ci.py --component nmos " && exit_code=$? | tee -a glayout.log if [ $? -ne 0 ]; then exit 1; fi @@ -105,7 +102,6 @@ jobs: cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/. &&\ cd ./openfasoc/generators/glayout &&\ pip3 install --force-reinstall -r requirements.txt &&\ - pip3 install gdsfactory==7.7.0 prettyprint prettyprinttree gdstk &&\ python3 test_glayout_ci.py --component diff_pair " && exit_code=$? | tee -a glayout.log if [ $? -ne 0 ]; then exit 1; fi @@ -126,7 +122,6 @@ jobs: cp ./.github/scripts/test_glayout_ci.py ./openfasoc/generators/glayout/. &&\ cd ./openfasoc/generators/glayout &&\ pip3 install --force-reinstall -r requirements.txt &&\ - pip3 install gdsfactory==7.7.0 prettyprint prettyprinttree gdstk &&\ python3 test_glayout_ci.py --component current_mirror " && exit_code=$? | tee -a glayout.log if [ $? -ne 0 ]; then exit 1; fi diff --git a/openfasoc/generators/glayout/requirements.txt b/openfasoc/generators/glayout/requirements.txt index ec5462945..97fc41cbc 100644 --- a/openfasoc/generators/glayout/requirements.txt +++ b/openfasoc/generators/glayout/requirements.txt @@ -1,7 +1,4 @@ -gdsfactory==7.7.0 numpy==1.23.5 -prettyprint -prettyprinttree nltk torch transformers @@ -23,3 +20,7 @@ optimum trl langchain_huggingface tensorboard +gdsfactory==7.7.0 +prettyprint +prettyprinttree +gdstk \ No newline at end of file