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

Jump to bottom

MathSAT update to 5.5.1 and windows support #453

Merged
merged 4 commits into from Dec 13, 2017
Merged

MathSAT update to 5.5.1 and windows support #453

merged 4 commits into from Dec 13, 2017

Conversation

mikand
Copy link
Contributor

@mikand mikand commented Oct 31, 2017 •
edited

This PR updates teh MathSAT version to 5.5.1 and adds installation support and CI under windows

@mikand mikand self-assigned this Oct 31, 2017
@mikand mikand force-pushed the msat-win branch 2 times, most recently from eef548c to ec37ab7 Compare November 4, 2017 12:27
@mikand mikand assigned marcogario and unassigned mikand Nov 19, 2017
marcogario
marcogario requested changes Nov 20, 2017
View reviewed changes
Copy link
Contributor

@marcogario marcogario left a comment

Choose a reason for hiding this comment

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

  • Clarify Py 3.5+ with appveyor support.
  • Post-pone merge to after upgrade to 5.5.0

pysmt/cmd/installers/msat.py Outdated
def compile(self):
# Patching the swig wrapper
Copy link
Contributor

Choose a reason for hiding this comment

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

Not a fan of patching the solver here. The first change should go away after upgrading to 5.5.0. What about the new setup.py? We have a dedicated repo to store patches for the solvers, that is the preferred way of doing this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, done

appveyor.yml Outdated
PYTHON_ARCH: "64"
PYSMT_SOLVER: "msat"

# There is a problem with python 3.5+ with the compilation of
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you report this issue to appveyor?

@mikand mikand assigned mikand and unassigned marcogario Dec 10, 2017
@mikand mikand changed the title MathSAT installation and CI under windows MathSAT update to 5.5.0 and windows support Dec 10, 2017
@mikand
Copy link
Contributor Author

mikand commented Dec 10, 2017

Update.

  • I managed to resolve the problem with AppVeyor. The issue was in the "run_with_env.ps1" script that was forcing a wrong version of Visual Studio for Python 3.6. Since the new version of setuptools is clever enough, I could simply remove this script.

  • I moved the patched setup.py in the solver_patches repo

  • I updated the version of MathSAT, but there are still some issues under Windows (need to patch the C wrapper and crash on test_hr_parsing.py)

@mikand
Implemented support for mathsat installation under Windows
6486e04 
* Fixed installer to work with MSVC under windows

* Added msat in Appveyor CI
@mikand
* Cleaned msat installer and added some comments
981e085 
* Cleaned and commented appveyor yml file
@mikand
* Updated MathSAT to 5.5.0
baf2523 
* Removed patch from installers package, moving the setup.py in the dedicated repo

* Removed Win32 mathsat builds, because from 5.5.0 those are no longer supported.
@mikand mikand changed the title MathSAT update to 5.5.0 and windows support MathSAT update to 5.5.1 and windows support Dec 11, 2017
@mikand mikand assigned marcogario and unassigned mikand Dec 11, 2017
@mikand
Copy link
Contributor Author

mikand commented Dec 11, 2017

@agriggio Updated MathSAT to 5.5.1 and now the tests are passing!

@marcogario For me the PR is ready, can you have a look and give feedback?

@mikand
Copy link
Contributor Author

mikand commented Dec 12, 2017

@marcogario The tests on travis are failing due to #465 that has nothing to do with this PR. Do you think we can merge this?

@marcogario marcogario merged commit 120cc08 into master Dec 13, 2017
@marcogario marcogario deleted the msat-win branch December 13, 2017 01:42
@marcogario marcogario added this to the 0.7.5 milestone Dec 13, 2017
@marcogario marcogario mentioned this pull request Dec 23, 2017
Closed
nbailluet pushed a commit to nbailluet/pysmt that referenced this pull request Mar 14, 2024
Merge pull request pysmt#453 from pysmt/msat-win
e16513d 
MathSAT update to 5.5.1 and windows support
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marcogario marcogario marcogario approved these changes

Assignees

@marcogario marcogario

Labels
None yet
Projects
None yet
Milestone
0.7.5
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mikand @marcogario