Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix numpy versions to < 2 #343

Merged
merged 4 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/glayout_opamp_sim.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 6 additions & 16 deletions .github/workflows/glayout_sky130.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 5 additions & 3 deletions openfasoc/generators/glayout/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
gdsfactory==7.7.0
prettyprint
prettyprinttree
numpy==1.23.5
nltk
torch
transformers
Expand All @@ -22,3 +20,7 @@ optimum
trl
langchain_huggingface
tensorboard
gdsfactory==7.7.0
prettyprint
prettyprinttree
gdstk
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ scikit-learn
matplotlib
scipy
seaborn
prettyprinttree
prettyprinttree
Loading