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

Use prebuilt what4-solvers binaries #1454

Merged
merged 24 commits into from
Oct 1, 2021
Merged

Use prebuilt what4-solvers binaries #1454

merged 24 commits into from
Oct 1, 2021

Conversation

atomb
Copy link
Contributor

@atomb atomb commented Sep 14, 2021

No description provided.

@atomb atomb added this to the 0.9 milestone Sep 21, 2021
@atomb atomb force-pushed the at-prebuilt-solvers branch 2 times, most recently from a351955 to 11ef202 Compare September 23, 2021 15:25
Copy link
Member

@kquick kquick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fairly straightforward, no concerns from me.

wait
(cd $BIN && curl -o bins.zip -sL "https://github.com/GaloisInc/what4-solvers/releases/download/$SOLVER_PKG_VERSION/$BIN_ZIP_FILE" && unzip -o bins.zip && rm bins.zip)
chmod +x $BIN/*
cp $BIN/yices_smt2$EXT $BIN/yices-smt2$EXT
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the purpose of this line?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I see now—this is changing from yices_smt2 (with an underscore) to yices-smt2 (with a hyphen). Is this something that should be done on what4-solvers' end, I wonder?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it ultimately should be done over there. But I'm waiting for a time when there are other changes that need to be made over there, too, because the build process takes a while.

@@ -71,8 +69,7 @@ jobs:

- uses: actions/checkout@v2
- run: |
git submodule update --init
git -C deps/abcBridge submodule update --init
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that we no longer invoke git -C deps/abcBridge submodule update --init, can we remove the abcBridge submodule?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, good point! I believe we can.

CMD [ "/bin/bash" ]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary whitespace change

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Z3_VERSION: "4.8.10"
CVC4_VERSION: "4.1.8"
YICES_VERSION: "2.6.2"
SOLVER_PKG_VERSION: "snapshot-20210917"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are the comments above this line (about the solver versions needing to be specified in other locations) still relevant?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the moment, those comments are still relevant. Ultimately, I want the what4-solvers repo to contain Dockerfiles to produce base Docker images that all those ones can build on top of. That's not done yet, though.

- shell: bash
working-directory: s2nTests
run: |
curl -o solvers-bin.zip -sL "https://github.com/GaloisInc/what4-solvers/releases/download/$SOLVER_PKG_VERSION/ubuntu-18.04-bin.zip"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does ci.sh's install_system_deps() function do this for you?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It unfortunately installs them in a different place. I'd like to refactor things so that's not true anymore, but for now I'm trying to make somewhat minimal changes.

@robdockins
Copy link
Contributor

I can't tell if this is related to the changes in this PR or not, but the two failing tests both seem to be infrastructure/setup failures of some kind.

@atomb atomb merged commit 5b6264b into master Oct 1, 2021
@mergify mergify bot deleted the at-prebuilt-solvers branch October 1, 2021 23:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants