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