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.

Sign up for GitHub

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

Merge pycarl into stormpy #205

Merged
merged 433 commits into from
Mar 19, 2025
Merged

Merge pycarl into stormpy #205

merged 433 commits into from
Mar 19, 2025
+4,142 −92

Conversation

linusheck
Copy link
Contributor

This PR merges pycarl (alongside the complete history of pycarl) into stormpy.

volkm and others added 30 commits July 24, 2017 18:17
@volkm
Avoid problem with constant FactorizedPolynomials
538549b
@volkm
Make tests runs without cln
309c8ed
@volkm
Prefix 'Pycarl - ' in setup.py output
f5fd497
@volkm
Fixed typo
68ece85
@volkm
Test build without cln in travis as well
ff5b27f
@volkm
Auto-format python files
a79fd01
@volkm
Disable Debian builds in Travis as Ubuntu suffices for now
2038e64
@volkm
Auto-format python files
40e2249
@volkm
Updated changelog
1b4c85c
@volkm
Fixed some typos
f54f6f5
@volkm
Fixed folding command in travis
f584add
@volkm
Conversions for int and float
c4b81ac
@sjunges
use smt2lib compatible negation in formula to smt2
c412cad
@sjunges
Use polynomialWithCoeffficient
a27299f
@sjunges
fix typo in pycarl installation guide
926b283
@sjunges
adapted style for pycarl
d6e437c
@sjunges
Fix typo in carl dir option
45cd4f1
@sjunges
Report the location of carl if an outdated version is used.
2fdce3b
@volkm
Test support in setup.py
c723396
@volkm
Travis uses setup.py test now
9d59457
@sjunges
pycarl.inf
720b081
@sjunges
fixed typo (storm should be carl)
e0ce381
@sjunges
arithmetic operations with infinity, added missing import sys for eq …
b967ec6 
…checking
@sjunges
support for hashing pycarl.inf
9cb54a9
@sjunges
Pycarl requires carl version 17.08 at least.
7eaea69
@sjunges
update version information
b1a17ed
@volkm
Small updated in README
f12bf44
@sjunges
Constant and constant_part methods for rational functions
48ad559
@sjunges
Added two common constructors for rational functions
d75bd26
@sjunges
rational_function(): Factorized rational function to rational functio…
4bccea3 
…n, similar to polynomial()
@linusheck
Copy link
Contributor Author

How does pycarl now get the carl installation? It depends on an individually installed carl ?

Indeed, it's the same as before

@linusheck linusheck marked this pull request as ready for review February 24, 2025 16:14
@sjunges
Copy link
Contributor

sjunges commented Mar 10, 2025

LGTM.

@volkm what do you think? Shall we merge it?

For the record, the intended installation procedure is now to have carl and storm built from source, then install stormpy.

From here onwards, there are two paths for compiling: Stormpy fetches storm and compiles it as part of the project, or stormpy finds an installed storm and runs with that.

Shipping binaries is one step further down the line, i guess.

@volkm
Copy link
Contributor

volkm commented Mar 10, 2025

I have not looked at all details in the PR yet, I will review it in the next days.

volkm
volkm requested changes Mar 11, 2025
View reviewed changes
Copy link
Contributor

@volkm volkm left a comment

Choose a reason for hiding this comment

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

Thanks for integrating pycarl into stormpy. Overall, it looks good to me. I mostly have minor comments.

linusheck and others added 12 commits March 17, 2025 14:46
@linusheck @volkm
Update CHANGELOG.md
e0f356c 
Co-authored-by: Matthias Volk <volkm@users.noreply.github.com>
@linusheck @volkm
Update CHANGELOG.md
bb92d52 
Co-authored-by: Matthias Volk <volkm@users.noreply.github.com>
@linusheck @volkm
Update Dockerfile
dd65e83 
Co-authored-by: Matthias Volk <volkm@users.noreply.github.com>
@linusheck @volkm
Update Dockerfile
59dcb24 
Co-authored-by: Matthias Volk <volkm@users.noreply.github.com>
@linusheck @volkm
Update cmake/CMakeLists.txt
b2bbe29 
Co-authored-by: Matthias Volk <volkm@users.noreply.github.com>
@linusheck @volkm
Update cmake/CMakeLists.txt
f9113cd 
Co-authored-by: Matthias Volk <volkm@users.noreply.github.com>
@linusheck @volkm
Update cmake/CMakeLists.txt
c3d31ec 
Co-authored-by: Matthias Volk <volkm@users.noreply.github.com>
@linusheck @volkm
Update README.md
1ecb567 
Co-authored-by: Matthias Volk <volkm@users.noreply.github.com>
@linusheck @volkm
Update setup.py
d6c8b47 
Co-authored-by: Matthias Volk <volkm@users.noreply.github.com>
@linusheck @volkm
Update pyproject.toml
e43b27b 
Co-authored-by: Matthias Volk <volkm@users.noreply.github.com>
@glatteis
Matthias suggestions
c49db87
@glatteis
Merge branch 'storm-compilation' of github.com:moves-rwth/stormpy int…
58f87fa 
…o storm-compilation
@linusheck
Copy link
Contributor Author

If this runs through, what would be left to do is just point two in #205 (comment)

@sjunges
Copy link
Contributor

sjunges commented Mar 17, 2025

I think that resolving that point is currently not yet possible as storm did not export the carl target ? I have a version of that running on my laptop though. I thinkm we can merge either way, even if it is midly annoying that we still need to export cmake files for carl. This PR does not worsen the situation.

volkm
volkm approved these changes Mar 18, 2025
View reviewed changes
Copy link
Contributor

@volkm volkm left a comment

Choose a reason for hiding this comment

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

Thanks for addressing all my comments. LGTM

@volkm volkm merged commit dc51088 into master Mar 19, 2025
11 checks passed
@volkm volkm mentioned this pull request Mar 20, 2025
Open
@volkm volkm deleted the storm-compilation branch March 20, 2025 11:20
@volkm volkm mentioned this pull request Mar 24, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sjunges sjunges

@volkm volkm

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@linusheck @sjunges @volkm @nafur @dbasgoeze @tquatmann @glatteis @lukovdm