Skip to content

Commit a316e2f

Browse files
Force installation of lower simplesat version (#2543)
This addresses broken simplesat v0.9.0 wheel. Co-authored-by: mszelwiga <mszelwiga@internships.antmicro.com>
1 parent 13705ab commit a316e2f

File tree

4 files changed

+18
-0
lines changed

4 files changed

+18
-0
lines changed

tests/ibex/Makefile.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ uhdm/synlig/synth-ibex: clean-build ${IBEX}/.gitpatch
1313
virtualenv ${root_dir}/venv-ibex
1414
(export PATH=${OUT_DIR}/bin:${PATH} && \
1515
. ${root_dir}/venv-ibex/bin/activate && \
16+
# https://github.com/enthought/sat-solver/issues/286 \
17+
pip install git+https://github.com/enthought/sat-solver.git@v0.8.2 && \
1618
pip install -r ${IBEX}/python-requirements.txt && \
1719
pip install git+https://github.com/antmicro/edalize@svplugin_support && \
1820
fusesoc --cores-root=${IBEX} run --build --tool synlig --target=synth lowrisc:ibex:top_artya7_surelog --SRAMInitFile="${curr_dir}/led.vmem")
@@ -21,6 +23,8 @@ uhdm/synlig/synth-ibex-build: clean-build ${IBEX}/.gitpatch
2123
virtualenv ${root_dir}/venv-ibex
2224
(export PATH=${OUT_DIR}/bin:${PATH} && \
2325
. ${root_dir}/venv-ibex/bin/activate && \
26+
# https://github.com/enthought/sat-solver/issues/286 \
27+
pip install git+https://github.com/enthought/sat-solver.git@v0.8.2 && \
2428
pip install -r ${IBEX}/python-requirements.txt && \
2529
pip install git+https://github.com/antmicro/edalize@svplugin_support && \
2630
fusesoc --cores-root=${IBEX} run --build --tool vivado --target=synth lowrisc:ibex:top_artya7_surelog --part xc7a35ticsg324-1L --SRAMInitFile="${curr_dir}/led.vmem")
@@ -78,6 +82,8 @@ ${REQUIREMENTS_FILE}: ${IBEX}/.requirementspatch
7882
# Install conda packages from f4pga/xc7 environment and set environment variables.
7983
env:: download-f4pga install-plugins
8084
${IN_CONDA_ENV} conda env update --name ${CONDA_ENV_NAME} --file ${root_dir}/env/f4pga/xc7_env/xc7_environment.yml </dev/null | cat
85+
# https://github.com/enthought/sat-solver/issues/286
86+
${IN_CONDA_ENV} pip install -I git+https://github.com/enthought/sat-solver.git@v0.8.2
8187
# Update edalize installed by Ibex to our own fork.
8288
${IN_CONDA_ENV} pip install \
8389
git+https://github.com/antmicro/edalize@symbiflow-read_verilog_with_uhdm \

tests/opentitan/Makefile.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ ${OPENTITAN_9d82960888}/.gitpatch:
1212
${VENV_OT_9d82960888}:
1313
virtualenv ${VENV_OT_9d82960888}
1414
. ${VENV_OT_9d82960888}/bin/activate && \
15+
# https://github.com/enthought/sat-solver/issues/286 \
16+
pip install -I git+https://github.com/enthought/sat-solver.git@v0.8.2 && \
1517
pip install -r ${OPENTITAN_9d82960888}/python-requirements.txt && \
1618
pip install git+https://github.com/antmicro/edalize@svplugin_support
1719

@@ -42,6 +44,8 @@ ${OPENTITAN}/.gitpatch_synth:
4244
${VENV_OT_SYNTH}: | ${OPENTITAN}/.gitpatch_synth
4345
virtualenv ${VENV_OT_SYNTH}
4446
(. ${VENV_OT_SYNTH}/bin/activate && \
47+
# https://github.com/enthought/sat-solver/issues/286 \
48+
pip install -I git+https://github.com/enthought/sat-solver.git@v0.8.2 && \
4549
pip install -r ${OPENTITAN}/python-requirements.txt && \
4650
pip install git+https://github.com/antmicro/edalize@svplugin_support)
4751

tests/opentitan/opentitan_parsing_test/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ env: ${VENV_DIR}
169169
${VENV_DIR} : | ${BUILD_DIR}
170170
virtualenv ${VENV_DIR}
171171
. ${VENV_DIR}/bin/activate
172+
# https://github.com/enthought/sat-solver/issues/286
173+
pip install -I git+https://github.com/enthought/sat-solver.git@v0.8.2
172174
pip install -r ${OPENTITAN_DIR}/python-requirements.txt
173175
pip install pygraphviz
174176
(

tests/veer/Makefile.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,26 @@ uhdm/synlig/veer: clean-build | ${VENV} ${DESIGN_DIR}/.gitpatch
1515
(export PATH=${OUT_DIR}/bin:${PATH} && \
1616
. ${VENV}/bin/activate && \
1717
pip install -I git+https://github.com/antmicro/edalize@svplugin_support && \
18+
# https://github.com/enthought/sat-solver/issues/286 \
19+
pip install -I git+https://github.com/enthought/sat-solver.git@v0.8.2 && \
1820
pip install git+https://github.com/lowRISC/fusesoc.git@ot && \
1921
fusesoc --cores-root=${DESIGN_DIR} run --build --tool synlig --target=synth chipsalliance.org:cores:VeeR_EH1:1.8)
2022

2123
uhdm/synlig/veer-build: clean-build | ${VENV} ${DESIGN_DIR}/.gitpatch
2224
(export PATH=${OUT_DIR}/bin:${PATH} && \
2325
. ${VENV}/bin/activate && \
2426
pip install -I git+https://github.com/antmicro/edalize@svplugin_support && \
27+
# https://github.com/enthought/sat-solver/issues/286 \
28+
pip install -I git+https://github.com/enthought/sat-solver.git@v0.8.2 && \
2529
pip install git+https://github.com/lowRISC/fusesoc.git@ot && \
2630
fusesoc --cores-root=${DESIGN_DIR} run --build --tool vivado --target=synth chipsalliance.org:cores:VeeR_EH1:1.8)
2731

2832
uhdm/sv2v/veer: clean-build | ${VENV}
2933
(export PATH=${OUT_DIR}/bin:${PATH} && \
3034
. ${VENV}/bin/activate && \
3135
pip install -I git+https://github.com/antmicro/edalize@svplugin_support && \
36+
# https://github.com/enthought/sat-solver/issues/286 \
37+
pip install -I git+https://github.com/enthought/sat-solver.git@v0.8.2 && \
3238
pip install git+https://github.com/lowRISC/fusesoc.git@ot && \
3339
fusesoc --cores-root=${DESIGN_DIR} run --build --tool sv2v --target=synth chipsalliance.org:cores:VeeR_EH1:1.8)
3440

0 commit comments

Comments
 (0)