From f923d97e61c40a1fd041ca76b3f8323b78f3185d Mon Sep 17 00:00:00 2001 From: chetanyagoyal Date: Fri, 4 Oct 2024 14:00:42 +0000 Subject: [PATCH] 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