solverforge 0.6.15__tar.gz → 0.7.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (86) hide show
  1. {solverforge-0.6.15 → solverforge-0.7.0}/Cargo.lock +13 -13
  2. {solverforge-0.6.15 → solverforge-0.7.0}/Cargo.toml +8 -8
  3. {solverforge-0.6.15 → solverforge-0.7.0}/PKG-INFO +40 -9
  4. {solverforge-0.6.15 → solverforge-0.7.0}/README.md +39 -8
  5. {solverforge-0.6.15 → solverforge-0.7.0}/pyproject.toml +1 -1
  6. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/__init__.py +1 -1
  7. {solverforge-0.6.15 → solverforge-0.7.0}/src/constraints/compiled_dispatch_tests.rs +2 -1
  8. {solverforge-0.6.15 → solverforge-0.7.0}/src/constraints/list_precedence.rs +1 -2
  9. {solverforge-0.6.15 → solverforge-0.7.0}/src/constraints/state.rs +5 -3
  10. {solverforge-0.6.15 → solverforge-0.7.0}/src/manager/candidate_trace.rs +1 -0
  11. {solverforge-0.6.15 → solverforge-0.7.0}/src/manager/events.rs +52 -24
  12. {solverforge-0.6.15 → solverforge-0.7.0}/src/score.rs +8 -16
  13. {solverforge-0.6.15 → solverforge-0.7.0}/src/solver/api.rs +26 -18
  14. {solverforge-0.6.15 → solverforge-0.7.0}/src/solver/solvable.rs +9 -4
  15. {solverforge-0.6.15 → solverforge-0.7.0}/LICENSE +0 -0
  16. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/_native.pyi +0 -0
  17. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/config.py +0 -0
  18. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/console.py +0 -0
  19. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/constraints.py +0 -0
  20. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/decorators.py +0 -0
  21. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/errors.py +0 -0
  22. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/events.py +0 -0
  23. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/fields.py +0 -0
  24. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/groups.py +0 -0
  25. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/joiner.py +0 -0
  26. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/manager.py +0 -0
  27. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/model.py +0 -0
  28. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/py.typed +0 -0
  29. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/score.py +0 -0
  30. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/solver.py +0 -0
  31. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/typing.py +0 -0
  32. {solverforge-0.6.15 → solverforge-0.7.0}/python/solverforge/ui.py +0 -0
  33. {solverforge-0.6.15 → solverforge-0.7.0}/rust-toolchain.toml +0 -0
  34. {solverforge-0.6.15 → solverforge-0.7.0}/src/bindings.rs +0 -0
  35. {solverforge-0.6.15 → solverforge-0.7.0}/src/callbacks/call.rs +0 -0
  36. {solverforge-0.6.15 → solverforge-0.7.0}/src/callbacks/mod.rs +0 -0
  37. {solverforge-0.6.15 → solverforge-0.7.0}/src/callbacks/registry.rs +0 -0
  38. {solverforge-0.6.15 → solverforge-0.7.0}/src/callbacks/threading.rs +0 -0
  39. {solverforge-0.6.15 → solverforge-0.7.0}/src/config.rs +0 -0
  40. {solverforge-0.6.15 → solverforge-0.7.0}/src/constraints/compiled.rs +0 -0
  41. {solverforge-0.6.15 → solverforge-0.7.0}/src/constraints/evaluate.rs +0 -0
  42. {solverforge-0.6.15 → solverforge-0.7.0}/src/constraints/incremental.rs +0 -0
  43. {solverforge-0.6.15 → solverforge-0.7.0}/src/constraints/list_precedence_tests.rs +0 -0
  44. {solverforge-0.6.15 → solverforge-0.7.0}/src/constraints/matches.rs +0 -0
  45. {solverforge-0.6.15 → solverforge-0.7.0}/src/constraints/mod.rs +0 -0
  46. {solverforge-0.6.15 → solverforge-0.7.0}/src/constraints/stream_plan.rs +0 -0
  47. {solverforge-0.6.15 → solverforge-0.7.0}/src/descriptor/extractor.rs +0 -0
  48. {solverforge-0.6.15 → solverforge-0.7.0}/src/descriptor/mod.rs +0 -0
  49. {solverforge-0.6.15 → solverforge-0.7.0}/src/descriptor/variable.rs +0 -0
  50. {solverforge-0.6.15 → solverforge-0.7.0}/src/error.rs +0 -0
  51. {solverforge-0.6.15 → solverforge-0.7.0}/src/intern.rs +0 -0
  52. {solverforge-0.6.15 → solverforge-0.7.0}/src/lib.rs +0 -0
  53. {solverforge-0.6.15 → solverforge-0.7.0}/src/manager/jobs.rs +0 -0
  54. {solverforge-0.6.15 → solverforge-0.7.0}/src/manager/mod.rs +0 -0
  55. {solverforge-0.6.15 → solverforge-0.7.0}/src/manager/provenance.rs +0 -0
  56. {solverforge-0.6.15 → solverforge-0.7.0}/src/proxy/entity.rs +0 -0
  57. {solverforge-0.6.15 → solverforge-0.7.0}/src/proxy/list.rs +0 -0
  58. {solverforge-0.6.15 → solverforge-0.7.0}/src/proxy/mod.rs +0 -0
  59. {solverforge-0.6.15 → solverforge-0.7.0}/src/proxy/solution.rs +0 -0
  60. {solverforge-0.6.15 → solverforge-0.7.0}/src/runtime/candidate_metric.rs +0 -0
  61. {solverforge-0.6.15 → solverforge-0.7.0}/src/runtime/dynamic_assignment_group.rs +0 -0
  62. {solverforge-0.6.15 → solverforge-0.7.0}/src/runtime/dynamic_provider.rs +0 -0
  63. {solverforge-0.6.15 → solverforge-0.7.0}/src/runtime/list_slots.rs +0 -0
  64. {solverforge-0.6.15 → solverforge-0.7.0}/src/runtime/mod.rs +0 -0
  65. {solverforge-0.6.15 → solverforge-0.7.0}/src/runtime/scalar_slots.rs +0 -0
  66. {solverforge-0.6.15 → solverforge-0.7.0}/src/schema/build.rs +0 -0
  67. {solverforge-0.6.15 → solverforge-0.7.0}/src/schema/compiled.rs +0 -0
  68. {solverforge-0.6.15 → solverforge-0.7.0}/src/schema/mod.rs +0 -0
  69. {solverforge-0.6.15 → solverforge-0.7.0}/src/schema/parse.rs +0 -0
  70. {solverforge-0.6.15 → solverforge-0.7.0}/src/schema/python.rs +0 -0
  71. {solverforge-0.6.15 → solverforge-0.7.0}/src/schema/runtime_plan.rs +0 -0
  72. {solverforge-0.6.15 → solverforge-0.7.0}/src/schema/types.rs +0 -0
  73. {solverforge-0.6.15 → solverforge-0.7.0}/src/schema/validate.rs +0 -0
  74. {solverforge-0.6.15 → solverforge-0.7.0}/src/solver/console.rs +0 -0
  75. {solverforge-0.6.15 → solverforge-0.7.0}/src/solver/mod.rs +0 -0
  76. {solverforge-0.6.15 → solverforge-0.7.0}/src/solver/progress.rs +0 -0
  77. {solverforge-0.6.15 → solverforge-0.7.0}/src/solver/result.rs +0 -0
  78. {solverforge-0.6.15 → solverforge-0.7.0}/src/state/callback_view.rs +0 -0
  79. {solverforge-0.6.15 → solverforge-0.7.0}/src/state/clone.rs +0 -0
  80. {solverforge-0.6.15 → solverforge-0.7.0}/src/state/entity_table.rs +0 -0
  81. {solverforge-0.6.15 → solverforge-0.7.0}/src/state/marshal.rs +0 -0
  82. {solverforge-0.6.15 → solverforge-0.7.0}/src/state/mod.rs +0 -0
  83. {solverforge-0.6.15 → solverforge-0.7.0}/src/state/solution.rs +0 -0
  84. {solverforge-0.6.15 → solverforge-0.7.0}/src/state/variables.rs +0 -0
  85. {solverforge-0.6.15 → solverforge-0.7.0}/src/ui.rs +0 -0
  86. {solverforge-0.6.15 → solverforge-0.7.0}/src/value.rs +0 -0
@@ -560,9 +560,9 @@ checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
560
560
 
561
561
  [[package]]
562
562
  name = "solverforge-bridge"
563
- version = "0.22.0"
563
+ version = "0.23.0"
564
564
  source = "registry+https://github.com/rust-lang/crates.io-index"
565
- checksum = "10a8b3542f9fe9095706ab7129e96340256ebc5a8ba5b0b525e8413430deb55e"
565
+ checksum = "6bd1dda3257839fcacecc67fc58b16f3eac7a169f1d3c5b28ccf62abc75dd239"
566
566
  dependencies = [
567
567
  "solverforge-config",
568
568
  "solverforge-core",
@@ -572,9 +572,9 @@ dependencies = [
572
572
 
573
573
  [[package]]
574
574
  name = "solverforge-config"
575
- version = "0.22.0"
575
+ version = "0.23.0"
576
576
  source = "registry+https://github.com/rust-lang/crates.io-index"
577
- checksum = "5c4b11c28fa8b660ab6c493ca52f60ce7f07028551e844600f47a0965e42ad7c"
577
+ checksum = "3c4ed3b8dee6c738b333e6a024b191fa1267d792080eb077ac4266b67c2dedc0"
578
578
  dependencies = [
579
579
  "serde",
580
580
  "serde_yaml",
@@ -585,9 +585,9 @@ dependencies = [
585
585
 
586
586
  [[package]]
587
587
  name = "solverforge-console"
588
- version = "0.22.0"
588
+ version = "0.23.0"
589
589
  source = "registry+https://github.com/rust-lang/crates.io-index"
590
- checksum = "cbbf0df18e2fa4c1fad4eed15ed839e564fe1a7f5e26c59ebac1f29ae10d84bc"
590
+ checksum = "401790d0c582cc2a64c88ddd6f9b7cc2fb93287649fb6149ab1c5c2b72f4b852"
591
591
  dependencies = [
592
592
  "num-format",
593
593
  "owo-colors",
@@ -597,18 +597,18 @@ dependencies = [
597
597
 
598
598
  [[package]]
599
599
  name = "solverforge-core"
600
- version = "0.22.0"
600
+ version = "0.23.0"
601
601
  source = "registry+https://github.com/rust-lang/crates.io-index"
602
- checksum = "b72049ea42fd8b8eaaed48d100305de32f1908446005d5e8d87c6a50c0b9dbb0"
602
+ checksum = "cafa2e7c3d678293c65480b9c7175ca793a406dac9096bec24f325081a35d7c3"
603
603
  dependencies = [
604
604
  "thiserror",
605
605
  ]
606
606
 
607
607
  [[package]]
608
608
  name = "solverforge-scoring"
609
- version = "0.22.0"
609
+ version = "0.23.0"
610
610
  source = "registry+https://github.com/rust-lang/crates.io-index"
611
- checksum = "98c9fd597079a4304465cf9a9e063192aba0b80edb8139fa3acb279e6bd4a894"
611
+ checksum = "86b9db4cb90c12e516a88f60657bd673a4493efca62a987d9a57ab92b81ac42f"
612
612
  dependencies = [
613
613
  "solverforge-core",
614
614
  "thiserror",
@@ -616,9 +616,9 @@ dependencies = [
616
616
 
617
617
  [[package]]
618
618
  name = "solverforge-solver"
619
- version = "0.22.0"
619
+ version = "0.23.0"
620
620
  source = "registry+https://github.com/rust-lang/crates.io-index"
621
- checksum = "32ca80e9a2ab255ef01aad85e175e4b2e121e84f44787baa494df8645ed786c2"
621
+ checksum = "932e9af2c810aeafd313819620e2b7802a9cee735a9a9f1bd4897c0e78917d77"
622
622
  dependencies = [
623
623
  "rand",
624
624
  "rand_chacha",
@@ -644,7 +644,7 @@ dependencies = [
644
644
 
645
645
  [[package]]
646
646
  name = "solverforge_py"
647
- version = "0.6.15"
647
+ version = "0.7.0"
648
648
  dependencies = [
649
649
  "indexmap",
650
650
  "once_cell",
@@ -1,6 +1,6 @@
1
1
  [package]
2
2
  name = "solverforge_py"
3
- version = "0.6.15"
3
+ version = "0.7.0"
4
4
  edition = "2021"
5
5
  license = "Apache-2.0"
6
6
  rust-version = "1.95"
@@ -26,7 +26,7 @@ name = "solverforge_py"
26
26
  crate-type = ["cdylib", "rlib"]
27
27
 
28
28
  [package.metadata.solverforge]
29
- version = "0.22.0"
29
+ version = "0.23.0"
30
30
 
31
31
  [dependencies]
32
32
  indexmap = "2.12.1"
@@ -42,12 +42,12 @@ toml = "0.9.8"
42
42
  tracing = "0.1.44"
43
43
  tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
44
44
 
45
- solverforge-config = { version = "=0.22.0" }
46
- solverforge-bridge = { version = "=0.22.0" }
47
- solverforge-console = { version = "=0.22.0", features = ["verbose-logging"] }
48
- solverforge-core = { version = "=0.22.0" }
49
- solverforge-scoring = { version = "=0.22.0" }
50
- solverforge-solver = { version = "=0.22.0" }
45
+ solverforge-config = { version = "=0.23.0" }
46
+ solverforge-bridge = { version = "=0.23.0" }
47
+ solverforge-console = { version = "=0.23.0", features = ["verbose-logging"] }
48
+ solverforge-core = { version = "=0.23.0" }
49
+ solverforge-scoring = { version = "=0.23.0" }
50
+ solverforge-solver = { version = "=0.23.0" }
51
51
  solverforge-ui = { version = "=0.9.0", default-features = false }
52
52
 
53
53
  [dev-dependencies]
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: solverforge
3
- Version: 0.6.15
3
+ Version: 0.7.0
4
4
  Classifier: Development Status :: 3 - Alpha
5
5
  Classifier: Intended Audience :: Developers
6
6
  Classifier: Intended Audience :: Science/Research
@@ -40,7 +40,7 @@ clone, mutate, and snapshot solutions safely. Python callbacks are the single
40
40
  constraint authoring surface.
41
41
 
42
42
  The package targets CPython 3.14 and Rust 1.95.0. This release-preparation
43
- checkout pins the six published SolverForge Rust dependencies to `0.22.0` and
43
+ checkout pins the six published SolverForge Rust dependencies to `0.23.0` and
44
44
  `solverforge-ui` to `0.9.0` through exact crates.io requirements in
45
45
  `Cargo.toml` and registry checksums in `Cargo.lock`. There is no local path or
46
46
  Git dependency override. The `solverforge` `0.6.x` line is the current dynamic
@@ -51,12 +51,12 @@ requirements, and other APIs that are not part of this package.
51
51
 
52
52
  ## Installation
53
53
 
54
- The package version prepared by this checkout is `solverforge` `0.6.15`, targeting
55
- the published and registry-locked SolverForge Rust `0.22.0` dependency base.
54
+ The package version prepared by this checkout is `solverforge` `0.7.0`, targeting
55
+ the published and registry-locked SolverForge Rust `0.23.0` dependency base.
56
56
  Install the matching package after its Python release with:
57
57
 
58
58
  ```sh
59
- python3.14 -m pip install "solverforge==0.6.15"
59
+ python3.14 -m pip install "solverforge==0.7.0"
60
60
  ```
61
61
 
62
62
  The installable wheel contains the core `solverforge` package, native extension,
@@ -76,12 +76,12 @@ make deliveries-run PORT=7861
76
76
  ```
77
77
 
78
78
  The same source-checkout examples can be run against the matching published
79
- package once `0.6.15` is released, without `PYTHONPATH` or an editable checkout:
79
+ package once `0.7.0` is released, without `PYTHONPATH` or an editable checkout:
80
80
 
81
81
  ```sh
82
82
  python3.14 -m venv .venv-examples
83
83
  . .venv-examples/bin/activate
84
- python -m pip install "solverforge[examples]==0.6.15"
84
+ python -m pip install "solverforge[examples]==0.7.0"
85
85
  python examples/nqueens.py
86
86
  python -m examples.solverforge_hospital
87
87
  python -m examples.solverforge_deliveries
@@ -209,8 +209,11 @@ Run `make help` for focused targets such as `make test-hospital`,
209
209
  state and does not expose an incomplete solution snapshot.
210
210
  Retained event payloads read current score from the attached solution snapshot
211
211
  when present. Long-running phases publish progress at the shared upstream
212
- cadence, and telemetry includes the current phase type, index, counters, and
213
- generation/evaluation time. `telemetry_detail(job_id)` returns one atomic
212
+ cadence. Telemetry carries run totals, including `moves_speculative`, plus a
213
+ `phases` list with one entry per phase started so far, in execution order:
214
+ phase type, index, step/move/score counters, `moves_speculative`, and
215
+ generation/evaluation time. The last entry of a progress event is the phase
216
+ still running. `telemetry_detail(job_id)` returns one atomic
214
217
  `status` with detailed telemetry plus an optional `candidate_trace`; ordinary
215
218
  status/event polling remains compact.
216
219
  - Candidate tracing is an opt-in retained-job diagnostic configured as
@@ -431,6 +434,34 @@ solution state, safe to run concurrently, and treat solution-level lookup contex
431
434
  as immutable for the duration of a solve. Third-party Python extension modules
432
435
  used inside callbacks may still impose their own synchronization constraints.
433
436
 
437
+ ### Parallel Move Evaluation
438
+
439
+ Acceptor-forager local search, including the default local search, can
440
+ evaluate candidate moves on several cores within one solve.
441
+ Set `{"move_thread_count": {"count": 4}}` in a config dict, or
442
+ `move_thread_count = { count = 4 }` in `solver.toml`, to run each step's trials
443
+ on up to four evaluators while one coordinator keeps the sequential acceptance
444
+ order. Upstream SolverForge bounds the count by the solve's Rayon threads and by
445
+ 32, the size of one evaluation window. `"none"` disables parallel evaluation;
446
+ the default, `"auto"`, currently stays sequential. Construction and variable
447
+ neighborhood descent phases always run sequentially.
448
+
449
+ Every evaluator owns its own constraint set, built from the same compiled
450
+ schema and callbacks as the working solution, and scores a replica of the
451
+ working state on a Rayon worker thread. Constraint, filter, weight, and other
452
+ scoring callbacks therefore run concurrently on those workers, which is why
453
+ they must be deterministic and free of shared mutable state. Results are
454
+ reproducible at fixed work: the same seed and step budget produce the same
455
+ assignments and score for any thread count. Wall-clock limits still end a solve
456
+ wherever it is. `Solver.solve` releases the GIL for the whole solve so the
457
+ workers can attach to Python; on a GIL build of CPython the callbacks then
458
+ serialize on the GIL, so real speedup needs the free-threaded interpreter.
459
+
460
+ Candidates a worker evaluated ahead of the decision point and then discarded
461
+ are reported as `moves_speculative` in run and per-phase telemetry, and as the
462
+ `discarded_speculative` disposition in candidate traces. Sequential solves
463
+ report zero.
464
+
434
465
  ## License
435
466
 
436
467
  SolverForge Python is licensed under the Apache License, Version 2.0. See
@@ -9,7 +9,7 @@ clone, mutate, and snapshot solutions safely. Python callbacks are the single
9
9
  constraint authoring surface.
10
10
 
11
11
  The package targets CPython 3.14 and Rust 1.95.0. This release-preparation
12
- checkout pins the six published SolverForge Rust dependencies to `0.22.0` and
12
+ checkout pins the six published SolverForge Rust dependencies to `0.23.0` and
13
13
  `solverforge-ui` to `0.9.0` through exact crates.io requirements in
14
14
  `Cargo.toml` and registry checksums in `Cargo.lock`. There is no local path or
15
15
  Git dependency override. The `solverforge` `0.6.x` line is the current dynamic
@@ -20,12 +20,12 @@ requirements, and other APIs that are not part of this package.
20
20
 
21
21
  ## Installation
22
22
 
23
- The package version prepared by this checkout is `solverforge` `0.6.15`, targeting
24
- the published and registry-locked SolverForge Rust `0.22.0` dependency base.
23
+ The package version prepared by this checkout is `solverforge` `0.7.0`, targeting
24
+ the published and registry-locked SolverForge Rust `0.23.0` dependency base.
25
25
  Install the matching package after its Python release with:
26
26
 
27
27
  ```sh
28
- python3.14 -m pip install "solverforge==0.6.15"
28
+ python3.14 -m pip install "solverforge==0.7.0"
29
29
  ```
30
30
 
31
31
  The installable wheel contains the core `solverforge` package, native extension,
@@ -45,12 +45,12 @@ make deliveries-run PORT=7861
45
45
  ```
46
46
 
47
47
  The same source-checkout examples can be run against the matching published
48
- package once `0.6.15` is released, without `PYTHONPATH` or an editable checkout:
48
+ package once `0.7.0` is released, without `PYTHONPATH` or an editable checkout:
49
49
 
50
50
  ```sh
51
51
  python3.14 -m venv .venv-examples
52
52
  . .venv-examples/bin/activate
53
- python -m pip install "solverforge[examples]==0.6.15"
53
+ python -m pip install "solverforge[examples]==0.7.0"
54
54
  python examples/nqueens.py
55
55
  python -m examples.solverforge_hospital
56
56
  python -m examples.solverforge_deliveries
@@ -178,8 +178,11 @@ Run `make help` for focused targets such as `make test-hospital`,
178
178
  state and does not expose an incomplete solution snapshot.
179
179
  Retained event payloads read current score from the attached solution snapshot
180
180
  when present. Long-running phases publish progress at the shared upstream
181
- cadence, and telemetry includes the current phase type, index, counters, and
182
- generation/evaluation time. `telemetry_detail(job_id)` returns one atomic
181
+ cadence. Telemetry carries run totals, including `moves_speculative`, plus a
182
+ `phases` list with one entry per phase started so far, in execution order:
183
+ phase type, index, step/move/score counters, `moves_speculative`, and
184
+ generation/evaluation time. The last entry of a progress event is the phase
185
+ still running. `telemetry_detail(job_id)` returns one atomic
183
186
  `status` with detailed telemetry plus an optional `candidate_trace`; ordinary
184
187
  status/event polling remains compact.
185
188
  - Candidate tracing is an opt-in retained-job diagnostic configured as
@@ -400,6 +403,34 @@ solution state, safe to run concurrently, and treat solution-level lookup contex
400
403
  as immutable for the duration of a solve. Third-party Python extension modules
401
404
  used inside callbacks may still impose their own synchronization constraints.
402
405
 
406
+ ### Parallel Move Evaluation
407
+
408
+ Acceptor-forager local search, including the default local search, can
409
+ evaluate candidate moves on several cores within one solve.
410
+ Set `{"move_thread_count": {"count": 4}}` in a config dict, or
411
+ `move_thread_count = { count = 4 }` in `solver.toml`, to run each step's trials
412
+ on up to four evaluators while one coordinator keeps the sequential acceptance
413
+ order. Upstream SolverForge bounds the count by the solve's Rayon threads and by
414
+ 32, the size of one evaluation window. `"none"` disables parallel evaluation;
415
+ the default, `"auto"`, currently stays sequential. Construction and variable
416
+ neighborhood descent phases always run sequentially.
417
+
418
+ Every evaluator owns its own constraint set, built from the same compiled
419
+ schema and callbacks as the working solution, and scores a replica of the
420
+ working state on a Rayon worker thread. Constraint, filter, weight, and other
421
+ scoring callbacks therefore run concurrently on those workers, which is why
422
+ they must be deterministic and free of shared mutable state. Results are
423
+ reproducible at fixed work: the same seed and step budget produce the same
424
+ assignments and score for any thread count. Wall-clock limits still end a solve
425
+ wherever it is. `Solver.solve` releases the GIL for the whole solve so the
426
+ workers can attach to Python; on a GIL build of CPython the callbacks then
427
+ serialize on the GIL, so real speedup needs the free-threaded interpreter.
428
+
429
+ Candidates a worker evaluated ahead of the decision point and then discarded
430
+ are reported as `moves_speculative` in run and per-phase telemetry, and as the
431
+ `discarded_speculative` disposition in candidate traces. Sequential solves
432
+ report zero.
433
+
403
434
  ## License
404
435
 
405
436
  SolverForge Python is licensed under the Apache License, Version 2.0. See
@@ -4,7 +4,7 @@ build-backend = "maturin"
4
4
 
5
5
  [project]
6
6
  name = "solverforge"
7
- version = "0.6.15"
7
+ version = "0.7.0"
8
8
  description = "Dynamic Python bindings for the SolverForge constraint solver."
9
9
  readme = "README.md"
10
10
  license = { text = "Apache-2.0" }
@@ -41,7 +41,7 @@ from .manager import JobHandle, SolverManager
41
41
  from .score import HardMediumSoftScore, HardSoftDecimalScore, HardSoftScore, SoftScore
42
42
  from .solver import Solver
43
43
 
44
- __version__ = "0.6.15"
44
+ __version__ = "0.7.0"
45
45
 
46
46
  __all__ = [
47
47
  "CallbackError",
@@ -94,7 +94,8 @@ fn compiled_precedence_never_decodes_generic_rows_or_plan_fields() {
94
94
  let baseline = set.initialize_all(&solution);
95
95
  assert_eq!(baseline, DynamicScore::hard_soft(0, -5));
96
96
  assert!(set.cached_rows.is_none());
97
- assert_eq!(set.on_retract_all(&solution, 0, 0), DynamicScore::zero());
97
+ // Scoring reads no family, so this thread needs no solve scope.
98
+ assert_eq!(set.on_retract_all(&solution, 0, 0), DynamicScore::ZERO);
98
99
  // A cached delta must not parse even precedence-specific immutable fields.
99
100
  let plan = set.compiled.plans()[0]
100
101
  .python_plan()
@@ -1013,8 +1013,7 @@ fn precedence_score_for_family(
1013
1013
  let soft = makespan.saturating_neg();
1014
1014
  match score_family {
1015
1015
  "soft" => DynamicScore::soft(soft.saturating_add(hard)),
1016
- "hard_soft_decimal" => DynamicScore::hard_soft_decimal(hard, soft),
1017
- "hard_medium_soft" => DynamicScore::hard_medium_soft(hard, 0, soft),
1016
+ "hard_medium_soft" => DynamicScore::of(hard, 0, soft),
1018
1017
  _ => DynamicScore::hard_soft(hard, soft),
1019
1018
  }
1020
1019
  }
@@ -15,7 +15,7 @@ use super::compiled::{
15
15
  use super::evaluate;
16
16
  use super::list_precedence::{self, ListPrecedenceDeltaMode, ListPrecedenceStateCache};
17
17
  use crate::error::{panic_with_py_err, py_err};
18
- use crate::score::{dynamic_score_from_native, DynamicScore};
18
+ use crate::score::{dynamic_score_from_native, score_family_from_name, DynamicScore};
19
19
  use crate::state::PyDynamicSolution;
20
20
  use crate::value::DynamicValue;
21
21
 
@@ -354,8 +354,11 @@ impl PyDynamicConstraintSet {
354
354
  }
355
355
 
356
356
  pub fn from_solution(py: Python<'_>, solution: &PyDynamicSolution) -> PyResult<Self> {
357
+ // Rejects an undeclared family before any constraint is compiled.
358
+ score_family_from_name(&solution.schema().score_family)?;
359
+ let compiled = CompiledConstraintSet::from_solution(py, solution)?;
357
360
  Ok(Self {
358
- compiled: CompiledConstraintSet::from_solution(py, solution)?,
361
+ compiled,
359
362
  cached_rows: None,
360
363
  join_key_cache: JoinKeyCache::new(),
361
364
  join_index_cache: JoinIndexCache::new(),
@@ -806,7 +809,6 @@ fn key_from_value(value: &DynamicValue) -> PyResult<Option<JoinKey>> {
806
809
  fn score_times(score: DynamicScore, count: usize) -> DynamicScore {
807
810
  let count = i64::try_from(count).unwrap_or(i64::MAX);
808
811
  DynamicScore {
809
- family: score.family,
810
812
  hard: score.hard.saturating_mul(count),
811
813
  medium: score.medium.saturating_mul(count),
812
814
  soft: score.soft.saturating_mul(count),
@@ -384,5 +384,6 @@ fn disposition_name(disposition: CandidateTraceDisposition) -> &'static str {
384
384
  CandidateTraceDisposition::ForagerIgnored => "forager_ignored",
385
385
  CandidateTraceDisposition::Selected => "selected",
386
386
  CandidateTraceDisposition::Applied => "applied",
387
+ CandidateTraceDisposition::DiscardedSpeculative => "discarded_speculative",
387
388
  }
388
389
  }
@@ -132,6 +132,7 @@ fn telemetry_to_python(py: Python<'_>, telemetry: &SolverTelemetry) -> PyResult<
132
132
  dict.set_item("step_count", telemetry.step_count)?;
133
133
  dict.set_item("moves_generated", telemetry.moves_generated)?;
134
134
  dict.set_item("moves_evaluated", telemetry.moves_evaluated)?;
135
+ dict.set_item("moves_speculative", telemetry.moves_speculative)?;
135
136
  dict.set_item("moves_accepted", telemetry.moves_accepted)?;
136
137
  dict.set_item("moves_applied", telemetry.moves_applied)?;
137
138
  dict.set_item("moves_score_improving", telemetry.moves_score_improving)?;
@@ -179,7 +180,10 @@ fn telemetry_to_python(py: Python<'_>, telemetry: &SolverTelemetry) -> PyResult<
179
180
  )?;
180
181
  dict.set_item("generation_ms", duration_millis(telemetry.generation_time))?;
181
182
  dict.set_item("evaluation_ms", duration_millis(telemetry.evaluation_time))?;
182
- if let Some(phase) = &telemetry.phase {
183
+ // Every phase started so far, in execution order; the last entry of a
184
+ // progress snapshot is the phase still running.
185
+ let phases = PyList::empty(py);
186
+ for phase in &telemetry.phases {
183
187
  let phase_dict = PyDict::new(py);
184
188
  phase_dict.set_item("phase_index", phase.phase_index)?;
185
189
  phase_dict.set_item("phase_type", &phase.phase_type)?;
@@ -187,6 +191,7 @@ fn telemetry_to_python(py: Python<'_>, telemetry: &SolverTelemetry) -> PyResult<
187
191
  phase_dict.set_item("step_count", phase.step_count)?;
188
192
  phase_dict.set_item("moves_generated", phase.moves_generated)?;
189
193
  phase_dict.set_item("moves_evaluated", phase.moves_evaluated)?;
194
+ phase_dict.set_item("moves_speculative", phase.moves_speculative)?;
190
195
  phase_dict.set_item("moves_accepted", phase.moves_accepted)?;
191
196
  phase_dict.set_item("moves_applied", phase.moves_applied)?;
192
197
  phase_dict.set_item("moves_score_improving", phase.moves_score_improving)?;
@@ -194,10 +199,9 @@ fn telemetry_to_python(py: Python<'_>, telemetry: &SolverTelemetry) -> PyResult<
194
199
  phase_dict.set_item("score_calculations", phase.score_calculations)?;
195
200
  phase_dict.set_item("generation_ms", duration_millis(phase.generation_time))?;
196
201
  phase_dict.set_item("evaluation_ms", duration_millis(phase.evaluation_time))?;
197
- dict.set_item("phase", phase_dict)?;
198
- } else {
199
- dict.set_item("phase", py.None())?;
202
+ phases.append(phase_dict)?;
200
203
  }
204
+ dict.set_item("phases", phases)?;
201
205
  dict.set_item(
202
206
  "moves_per_second",
203
207
  whole_units_per_second(telemetry.moves_evaluated, telemetry.elapsed),
@@ -395,7 +399,7 @@ mod tests {
395
399
  use super::detailed_telemetry_to_python;
396
400
 
397
401
  #[test]
398
- fn telemetry_maps_current_phase() {
402
+ fn telemetry_maps_every_phase_in_order() {
399
403
  Python::initialize();
400
404
  let telemetry = SolverTelemetry {
401
405
  moves_applied: 5,
@@ -441,33 +445,57 @@ mod tests {
441
445
  hard_feasible_after: true,
442
446
  ..AppliedMoveTelemetry::default()
443
447
  }],
444
- phase: Some(PhaseTelemetry {
445
- phase_index: 1,
446
- phase_type: "Local Search".to_string(),
447
- elapsed: Duration::from_millis(1_250),
448
- step_count: 3,
449
- moves_generated: 12,
450
- moves_evaluated: 10,
451
- moves_accepted: 2,
452
- moves_applied: 1,
453
- moves_score_improving: 1,
454
- moves_applied_improving: 1,
455
- score_calculations: 11,
456
- generation_time: Duration::from_millis(4),
457
- evaluation_time: Duration::from_millis(8),
458
- }),
448
+ phases: vec![
449
+ PhaseTelemetry {
450
+ phase_index: 0,
451
+ phase_type: "Construction Heuristic".to_string(),
452
+ step_count: 2,
453
+ ..PhaseTelemetry::default()
454
+ },
455
+ PhaseTelemetry {
456
+ phase_index: 1,
457
+ phase_type: "Local Search".to_string(),
458
+ elapsed: Duration::from_millis(1_250),
459
+ step_count: 3,
460
+ moves_generated: 12,
461
+ moves_evaluated: 10,
462
+ moves_speculative: 4,
463
+ moves_accepted: 2,
464
+ moves_applied: 1,
465
+ moves_score_improving: 1,
466
+ moves_applied_improving: 1,
467
+ score_calculations: 11,
468
+ generation_time: Duration::from_millis(4),
469
+ evaluation_time: Duration::from_millis(8),
470
+ },
471
+ ],
459
472
  ..SolverTelemetry::default()
460
473
  };
461
474
 
462
475
  Python::attach(|py| {
463
476
  let payload = detailed_telemetry_to_python(py, &telemetry).expect("telemetry payload");
464
477
  let payload = payload.bind(py).cast::<PyDict>().expect("telemetry dict");
465
- let phase = payload
466
- .get_item("phase")
467
- .expect("phase lookup")
468
- .expect("phase payload")
478
+ let phases = payload
479
+ .get_item("phases")
480
+ .expect("phases lookup")
481
+ .expect("phases payload")
482
+ .cast_into::<PyList>()
483
+ .expect("phases list");
484
+ assert_eq!(phases.len(), 2);
485
+ let phase = phases
486
+ .get_item(1)
487
+ .expect("running phase entry")
469
488
  .cast_into::<PyDict>()
470
489
  .expect("phase dict");
490
+ assert_eq!(
491
+ phase
492
+ .get_item("moves_speculative")
493
+ .expect("moves speculative lookup")
494
+ .expect("moves speculative")
495
+ .extract::<u64>()
496
+ .expect("moves speculative count"),
497
+ 4
498
+ );
471
499
  assert_eq!(
472
500
  phase
473
501
  .get_item("phase_type")
@@ -1,6 +1,5 @@
1
1
  use pyo3::prelude::*;
2
2
  use pyo3::types::{PyDict, PyList, PyTuple};
3
- use solverforge_core::score::Score;
4
3
 
5
4
  use crate::error::py_err;
6
5
 
@@ -42,7 +41,7 @@ pub fn dynamic_score_from_dict(dict: &Bound<'_, PyDict>) -> PyResult<DynamicScor
42
41
  .iter()
43
42
  .map(|item| item.extract::<i64>())
44
43
  .collect::<PyResult<Vec<_>>>()?;
45
- score_from_levels(family.as_deref(), numbers.as_slice(), None)
44
+ score_from_levels(family.as_deref(), numbers.as_slice())
46
45
  }
47
46
 
48
47
  fn dynamic_score_from_sequence<'py>(
@@ -51,21 +50,17 @@ fn dynamic_score_from_sequence<'py>(
51
50
  let numbers = items
52
51
  .map(|item| item.extract::<i64>())
53
52
  .collect::<PyResult<Vec<_>>>()?;
54
- score_from_levels(None, numbers.as_slice(), Some(DynamicScore::zero().family))
53
+ score_from_levels(None, numbers.as_slice())
55
54
  }
56
55
 
57
- fn score_from_levels(
58
- family: Option<&str>,
59
- numbers: &[i64],
60
- preferred_family: Option<ScoreFamily>,
61
- ) -> PyResult<DynamicScore> {
56
+ fn score_from_levels(family: Option<&str>, numbers: &[i64]) -> PyResult<DynamicScore> {
62
57
  Ok(match (family, numbers) {
63
58
  (Some("soft"), [soft]) => DynamicScore::soft(*soft),
64
- (Some("hard_soft"), [hard, soft]) => DynamicScore::hard_soft(*hard, *soft),
65
- (Some("hard_soft_decimal"), [hard, soft]) => DynamicScore::hard_soft_decimal(*hard, *soft),
66
- (Some("hard_medium_soft"), [hard, medium, soft]) => {
67
- DynamicScore::hard_medium_soft(*hard, *medium, *soft)
59
+ // Decimal levels arrive already scaled; they share the two-level value.
60
+ (Some("hard_soft" | "hard_soft_decimal"), [hard, soft]) => {
61
+ DynamicScore::hard_soft(*hard, *soft)
68
62
  }
63
+ (Some("hard_medium_soft"), [hard, medium, soft]) => DynamicScore::of(*hard, *medium, *soft),
69
64
  (Some(family), _) => {
70
65
  return Err(py_err(format!(
71
66
  "score family `{family}` is incompatible with {} levels",
@@ -73,11 +68,8 @@ fn score_from_levels(
73
68
  )));
74
69
  }
75
70
  (None, [soft]) => DynamicScore::soft(*soft),
76
- (None, [hard, soft]) if preferred_family == Some(ScoreFamily::HardSoftDecimal) => {
77
- DynamicScore::hard_soft_decimal(*hard, *soft)
78
- }
79
71
  (None, [hard, soft]) => DynamicScore::hard_soft(*hard, *soft),
80
- (None, [hard, medium, soft]) => DynamicScore::hard_medium_soft(*hard, *medium, *soft),
72
+ (None, [hard, medium, soft]) => DynamicScore::of(*hard, *medium, *soft),
81
73
  (None, other) => {
82
74
  return Err(py_err(format!(
83
75
  "unsupported dynamic score level count {}",
@@ -12,6 +12,7 @@ use crate::error::{panic_to_py_err, py_err};
12
12
  use crate::runtime::dynamic_assignment_group::validate_assignment_construction_groups;
13
13
  use crate::schema::compiled::CompiledSchema;
14
14
  use crate::score::{scoped_dynamic_score_family, score_family_from_name, DynamicScorePythonExt};
15
+ use crate::solver::solvable::dynamic_constraints;
15
16
  use crate::state::marshal::{export_solution, import_solution};
16
17
  use crate::state::PyDynamicSolution;
17
18
 
@@ -58,28 +59,35 @@ pub fn solve(
58
59
  let py_solution = solution.bind(py);
59
60
  let mut imported = import_solution(py_solution, Arc::clone(&plan))?;
60
61
  let descriptor = plan.descriptor().clone();
61
- let constraints = PyDynamicConstraintSet::from_solution(py, &imported)?;
62
62
  validate_assignment_construction_groups(&solver_config, parsed)?;
63
63
  imported.solver_config = solver_config.clone();
64
64
  let score_family = score_family_from_name(&parsed.score_family)?;
65
- let mut solved = catch_unwind(AssertUnwindSafe(|| {
66
- scoped_dynamic_score_family(score_family, || {
67
- try_run_dynamic_solver_with_config_parts(
68
- imported,
69
- constraints,
70
- descriptor,
71
- dynamic_entity_count,
72
- SolverRuntime::detached(),
73
- solver_config,
74
- 30,
75
- dynamic_log_scale,
76
- None,
77
- plan.model().clone(),
78
- )
79
- .map_err(|error| py_err(error.to_string()))
65
+ let model = plan.model().clone();
66
+ // The solve runs without the GIL: parallel evaluation scores evaluator
67
+ // replicas on Rayon workers that attach to Python themselves, and a
68
+ // calling thread that kept the GIL while waiting on them would never let
69
+ // them in.
70
+ let mut solved = py
71
+ .detach(|| {
72
+ catch_unwind(AssertUnwindSafe(|| {
73
+ scoped_dynamic_score_family(score_family, || {
74
+ try_run_dynamic_solver_with_config_parts(
75
+ imported,
76
+ dynamic_constraints,
77
+ descriptor,
78
+ dynamic_entity_count,
79
+ SolverRuntime::detached(),
80
+ solver_config,
81
+ 30,
82
+ dynamic_log_scale,
83
+ None,
84
+ model,
85
+ )
86
+ .map_err(|error| py_err(error.to_string()))
87
+ })
88
+ }))
80
89
  })
81
- }))
82
- .map_err(panic_to_py_err)??;
90
+ .map_err(panic_to_py_err)??;
83
91
  solved.refresh_all_shadows()?;
84
92
  export_solution(py_solution, &solved)?;
85
93
  if let Some(score) = solved.score {
@@ -21,15 +21,12 @@ impl Solvable for PyDynamicSolution {
21
21
  let descriptor = runtime_plan.descriptor().clone();
22
22
  let model = runtime_plan.model().clone();
23
23
  let default_time_limit_secs = runtime_plan.default_time_limit_secs();
24
- let constraints = pyo3::Python::attach(|py| {
25
- PyDynamicConstraintSet::from_solution(py, &self).unwrap_or_else(panic_with_py_err)
26
- });
27
24
  let score_family = score_family_from_name(&runtime_plan.schema().score_family)
28
25
  .unwrap_or_else(panic_with_py_err);
29
26
  let result = scoped_dynamic_score_family(score_family, || {
30
27
  try_run_dynamic_solver_with_config_parts(
31
28
  self,
32
- constraints,
29
+ dynamic_constraints,
33
30
  descriptor,
34
31
  dynamic_entity_count,
35
32
  runtime,
@@ -44,6 +41,14 @@ impl Solvable for PyDynamicSolution {
44
41
  }
45
42
  }
46
43
 
44
+ /// Builds the constraint set for one solution: the working solution and every
45
+ /// evaluator replica use this same constructor.
46
+ pub(crate) fn dynamic_constraints(solution: &PyDynamicSolution) -> PyDynamicConstraintSet {
47
+ pyo3::Python::attach(|py| {
48
+ PyDynamicConstraintSet::from_solution(py, solution).unwrap_or_else(panic_with_py_err)
49
+ })
50
+ }
51
+
47
52
  fn dynamic_entity_count(solution: &PyDynamicSolution, descriptor_index: usize) -> usize {
48
53
  solution.entity_count(descriptor_index)
49
54
  }
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes