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

Boolector: Upgrade to 3.0.0 #514

Merged
merged 8 commits into from Jan 27, 2019

Conversation

Projects
None yet
3 participants
@marcogario
Copy link
Contributor

marcogario commented Jul 14, 2018

Updated installer for boolector 3.0.0. This does not include any new feature.

@marcogario

This comment has been minimized.

Copy link
Contributor Author

marcogario commented Jul 14, 2018

I would wait to merge this until upstream accepts Boolector/boolector#9 .
Then we will need to change the installer into a git based installer.

I wanted to prepare the PR so that we can run all the tests, and maybe start looking into integrating some of the new features.

@marcogario marcogario force-pushed the upgrade/btor_3.0.0 branch from f961009 to 28f227a Jul 14, 2018

@aniemetz

This comment has been minimized.

Copy link

aniemetz commented Jul 24, 2018

Boolector/boolector#9 is merged in. Thanks for reporting and providing a fix!

@marcogario marcogario self-assigned this Aug 5, 2018

@marcogario marcogario force-pushed the upgrade/btor_3.0.0 branch from 9de709e to 17c243f Oct 13, 2018

@marcogario

This comment has been minimized.

Copy link
Contributor Author

marcogario commented Oct 21, 2018

The current CI fails because of the following error:

python -c "import pyboolector"
Traceback (most recent call last):
  File "<string>", line 1, in <module>
ImportError: /home/travis/virtualenv/python2.7.14/lib/python2.7/site-packages/pyboolector.so: undefined symbol: PyFPE_jbuf

I think this might be due to a mismatch between the system python and the venv python.

Edit: Indeed, the configure says:

-- Found PythonInterp: /home/travis/virtualenv/python2.7.14/bin/python (found version "2.7.14") 
-- Found PythonLibs: /usr/lib/x86_64-linux-gnu/libpython2.7.so (found version "2.7.6") 
-- Found Cython: /home/travis/virtualenv/python2.7.14/bin/cython  

@marcogario marcogario added this to the 0.7.6 milestone Oct 28, 2018

@marcogario

This comment has been minimized.

Copy link
Contributor Author

marcogario commented Oct 30, 2018

@mikand maybe you are more familiar with cmake, and have an idea of how to fix this? It might be the case that we need to fix it upstream, but it is such a niche case, that I would rather work-around it in Travis or provide a patch to the boolector team.

@marcogario

This comment has been minimized.

Copy link
Contributor Author

marcogario commented Nov 4, 2018

This seems to be a known issue. It mostly affects Mac users (due to the common usage of homebrew and other non-system versions of python). For us the easiest solution would be to call the cmake with the correct flags.

For Travis only, here is how another project solved it for linux.
SimonRit/RTK@689fa97

@mikand

This comment has been minimized.

Copy link
Contributor

mikand commented Nov 5, 2018

@marcogario Are you working on this? If you want I can try to fix the CI somehow...

@marcogario

This comment has been minimized.

Copy link
Contributor Author

marcogario commented Nov 5, 2018

I reported this to the Boolector team to identify a principled solution. What I was trying (and you can take over) was to modify the cmakecache from within our installer.

@marcogario marcogario force-pushed the upgrade/btor_3.0.0 branch 3 times, most recently from a6328c8 to 260eb2b Nov 10, 2018

@marcogario marcogario force-pushed the upgrade/btor_3.0.0 branch from 260eb2b to f751968 Nov 24, 2018

marcogario added some commits Jul 14, 2018

CI

@mikand mikand force-pushed the upgrade/btor_3.0.0 branch from f751968 to accad4c Jan 15, 2019

mikand added some commits Jan 15, 2019

@mikand

This comment has been minimized.

Copy link
Contributor

mikand commented Jan 16, 2019

The PR should be almost OK now, but tests are failing because it seems that CVC4 1.5 wrapper does not work on python 2.7 and swig3. My suggestion is to postpone the merge of this pr after #552 that should solve the issue with CVC4.

mikand added some commits Jan 21, 2019

@mikand mikand assigned marcogario and unassigned mikand Jan 22, 2019

@mikand

This comment has been minimized.

Copy link
Contributor

mikand commented Jan 22, 2019

@marcogario This is ready to merge for me, can you have a look and (if ok) go ahead and merge?

@marcogario marcogario merged commit 3798ed5 into master Jan 27, 2019

5 checks passed

clahub All contributors have signed the Contributor License Agreement.
Details
continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@marcogario marcogario deleted the upgrade/btor_3.0.0 branch Jan 27, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment