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

Upgrade Z3 (restores linux/arm64 support) #3057

Merged
merged 4 commits into from
Jan 4, 2025
Merged

Upgrade Z3 (restores linux/arm64 support) #3057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4268ea
Update Z3
thpani Jan 3, 2025
cae2215
Remove Z3 param "seed"
thpani Jan 3, 2025
cdaa756
Add changelog
thpani Jan 3, 2025
4d89d2b
Remove Z3 seed parameter from SMT log
thpani Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .unreleased/breaking-changes/3057-z3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade Z3 to 4.13.4 (restores linux/arm64 support), see #3057
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ object Dependencies {
val tla2tools = "org.lamport" % "tla2tools" % "1.7.0-SNAPSHOT"
val ujson = "com.lihaoyi" %% "ujson" % "4.0.2"
val upickle = "com.lihaoyi" %% "upickle" % "4.0.2"
val z3 = "tools.aqua" % "z3-turnkey" % "4.12.6"
val z3 = "tools.aqua" % "z3-turnkey" % "4.13.4"
val zio = "dev.zio" %% "zio" % zioVersion
// Keep up to sync with version in plugins.sbt
val zioGrpcCodgen = "com.thesamet.scalapb.zio-grpc" %% "zio-grpc-codegen" % "0.6.0-test3" % "provided"
Expand Down
4 changes: 2 additions & 2 deletions test/tla/cli-integration-tests.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2065,7 +2065,7 @@ $ find ./test-out-dir/Counter.tla/* -type f -name log0.smt -exec cat {} \;
;; sat.random_seed = 0
;; sls.random_seed = 0
;; smt.random_seed = 0
;; (params seed 0 random_seed 0)
;; (params random_seed 0)
...
$ rm -rf ./test-out-dir
```
Expand All @@ -2082,7 +2082,7 @@ $ find ./test-out-dir/Counter.tla/* -type f -name log0.smt -exec cat {} \;
;; sat.random_seed = 4242
;; sls.random_seed = 4242
;; smt.random_seed = 4242
;; (params seed 4242 random_seed 4242)
;; (params random_seed 4242)
...
$ rm -rf ./test-out-dir
```
Expand Down
3 changes: 1 addition & 2 deletions tla-bmcmt/src/main/scala/at/forsyte/apalache/tla/bmcmt/smt/Z3SolverContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ class Z3SolverContext(val config: SolverConfig) extends SolverContext with LazyL
val params = z3context.mkParams()
// Set random seed. We are also setting it via global parameters above, but `Global.setParameter()` says:
// "When a Z3 module is initialized it will use the value of these parameters when Z3_params objects are not provided."
params.add("seed", config.randomSeed)
// When the user sets z3.smt.logic = QF_LIA, z3 complains about random_seed.
// Note: when the user sets z3.smt.logic = QF_LIA, z3 complains about random_seed.
// https://github.com/apalache-mc/apalache/issues/2989
params.add("random_seed", config.randomSeed)
config.z3Params.foreach { case (k, v) =>
Expand Down
Loading