Merge pull request #343 from idea-fasoc/quickfixnumpy

Fix numpy versions to < 2
idea-fasoc · Oct 17, 2024 · db94caa · db94caa
2 parents 5e9f613 + f923d97
commit db94caa
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 25 deletions.
diff --git a/.github/workflows/glayout_opamp_sim.yml b/.github/workflows/glayout_opamp_sim.yml
@@ -37,12 +37,10 @@ jobs:
                       $IMAGE_NAME \
                       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 uninstall glayout -y &&\
                       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 &&\
+                      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
@@ -40,9 +40,7 @@ jobs:
                     pip uninstall glayout -y &&\
                     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 &&\
+                    pip3 install --force-reinstall -r requirements.txt &&\
                     python3 test_glayout_ci.py --component opamp
                   " && exit_code=$? | tee -a glayout.log
                 if [ $? -ne 0 ]; then exit 1; fi
@@ -63,9 +61,7 @@ jobs:
                     pip uninstall glayout -y &&\
                     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 &&\
+                    pip3 install --force-reinstall -r requirements.txt &&\
                     python3 test_glayout_ci.py --component pmos
                   " && exit_code=$? | tee -a glayout.log
                 if [ $? -ne 0 ]; then exit 1; fi
@@ -82,12 +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 gdsfactory==7.7.0 prettyprint prettyprinttree gdstk &&\
-                    python3 -m pip uninstall numpy -y &&\
-                    python3 -m pip install numpy==1.23.5 &&\
+                    pip3 install --force-reinstall -r requirements.txt &&\
                     python3 test_glayout_ci.py --component nmos
                   " && exit_code=$? | tee -a glayout.log
                 if [ $? -ne 0 ]; then exit 1; fi
@@ -107,9 +101,7 @@ jobs:
                     pip uninstall glayout -y &&\
                     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 &&\
+                    pip3 install --force-reinstall -r requirements.txt &&\
                     python3 test_glayout_ci.py --component diff_pair
                   " && exit_code=$? | tee -a glayout.log
                 if [ $? -ne 0 ]; then exit 1; fi
@@ -129,9 +121,7 @@ jobs:
                     pip uninstall glayout -y &&\
                     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 &&\
+                    pip3 install --force-reinstall -r requirements.txt &&\
                     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
@@ -1,6 +1,4 @@
-gdsfactory==7.7.0
-prettyprint
-prettyprinttree
+numpy==1.23.5
 nltk
 torch
 transformers
@@ -22,3 +20,7 @@ optimum
 trl
 langchain_huggingface
 tensorboard
+gdsfactory==7.7.0
+prettyprint
+prettyprinttree
+gdstk
diff --git a/openfasoc/generators/glayout/tapeout/tapeout_and_RL/requirements.txt b/openfasoc/generators/glayout/tapeout/tapeout_and_RL/requirements.txt
@@ -3,4 +3,4 @@ scikit-learn
 matplotlib
 scipy
 seaborn
-prettyprinttree
+prettyprinttree