cdclkit 0.1.5__tar.gz → 0.1.7__tar.gz

{cdclkit-0.1.5 → cdclkit-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdclkit
-Version: 0.1.5
+Version: 0.1.7
 Summary: A CDCL SAT solver, preprocessor, encoding library and modelling layer, written from scratch in readable Python. Every answer comes with a certificate.
 Author: Carlo Perassi
 License-Expression: Apache-2.0
@@ -23,9 +23,9 @@ Classifier: Topic :: Scientific/Engineering :: Mathematics
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: dratify>=0.1.7
+Requires-Dist: dratify>=0.1.9
 Provides-Extra: native
-Requires-Dist: cdclkit-native==0.1.5; extra == "native"
+Requires-Dist: cdclkit-native==0.1.7; extra == "native"
 Dynamic: license-file
 
 # cdclkit

{cdclkit-0.1.5 → cdclkit-0.1.7}/cdclkit/__init__.py

@@ -52,7 +52,7 @@ from .preprocess import Preprocessor, preprocess
 from dratify.proof import DRATChecker, MemoryProof, ProofWriter, check_proof
 from .solver import Config, SAT, Solver, Stats, UNKNOWN, UNSAT
 
-__version__ = "0.1.5"
+__version__ = "0.1.7"
 
 __all__ = [
     "CNF",

{cdclkit-0.1.5 → cdclkit-0.1.7}/cdclkit/cli.py

@@ -47,6 +47,26 @@ def _native_ok() -> bool:
     return native.available()
 
 
+def _pick_engine() -> str | None:
+    """The engine for `--adaptive` and `-j`; None after printing an error.
+
+    Native when it is installed: it is bit-exact with Python, so this changes
+    the speed and not the answer. CDCLKIT_ENGINE overrides it, which is how to
+    rule the native engine in or out of a suspect result. The plain sequential
+    path is always Python.
+    """
+    from . import native
+
+    try:
+        engine = native.engine_requested(
+            default="native" if _native_ok() else "python")
+    except RuntimeError as e:
+        print(f"c error: {e}", file=sys.stderr)
+        return None
+    print(f"c engine: {engine}")
+    return engine
+
+
 EXIT_SAT = 10
 EXIT_UNSAT = 20
 EXIT_UNKNOWN = 0
@@ -115,9 +135,12 @@ def cmd_solve(args) -> int:
                   "(workers race and their steps interleave); drop -j or drop "
                   "--proof/--self-check")
             return EXIT_ERROR
+        engine = _pick_engine()
+        if engine is None:
+            return EXIT_ERROR
         pr = solve_adaptive(
             f,
-            engine="native" if _native_ok() else "python",
+            engine=engine,
             config=cfg,
             jobs=jobs,
             proof=proof_sink,
@@ -146,7 +169,11 @@ def cmd_solve(args) -> int:
         # Parallel portfolio.  Only the winning worker's proof exists, and
         # because workers share no clauses it is a complete refutation on its
         # own -- see cdclkit/portfolio.py.
-        pr = solve_portfolio(f, jobs=jobs, want_proof=proof_sink is not None)
+        engine = _pick_engine()
+        if engine is None:
+            return EXIT_ERROR
+        pr = solve_portfolio(f, jobs=jobs, engine=engine,
+                             want_proof=proof_sink is not None)
         if not pr.finished:
             print("s UNKNOWN")
             return EXIT_UNKNOWN

{cdclkit-0.1.5 → cdclkit-0.1.7}/cdclkit/native.py

@@ -13,10 +13,13 @@ The contract, in both directions:
   full under a plain `python3` with no Rust toolchain anywhere. That property
   is tested, not assumed -- it is what lets the port proceed in small commits
   without the repo ever being in a broken state.
-* **If it is present, it is opt-in.** Nothing selects the native path on its
-  own. A caller asks for it explicitly (`--engine native`, or
-  `CDCLKIT_ENGINE=native`), because a silent switch between two implementations
-  is how differential bugs hide.
+* **If it is present, the plain solver still does not use it.** `Solver`,
+  `solve()` and `cdclkit solve` are Python. `solve_adaptive()`,
+  `solve_portfolio()` and `cdclkit solve --adaptive` / `-j N` use it when it is
+  installed. That is safe only because the two engines are bit-exact and tested
+  to stay that way. A silent switch between two implementations is how
+  differential bugs hide, so the CLI prints which engine ran and
+  `CDCLKIT_ENGINE` (read by `engine_requested()`) overrides the choice.
 
 Building it::
 
@@ -54,8 +57,7 @@ else:  # pragma: no cover - depends on whether the module was built
     #
     # This is not the silent engine switch the rest of this module warns about.
     # Two checkers must agree by construction -- if they ever disagree that is
-    # a bug worth surfacing, not a difference worth preserving. The solver is
-    # the thing that stays explicitly opt-in.
+    # a bug worth surfacing, not a difference worth preserving.
     try:
         import dratify as _dratify
         _dratify.register_native(_native)

{cdclkit-0.1.5 → cdclkit-0.1.7}/cdclkit/pyeq.py

@@ -198,8 +198,11 @@ class BitVec:
         return self.enc.and_gate(same)
 
     def slt(self, other: "BitVec") -> int:
-        """Signed less-than, via the sign of the difference with overflow
-        correction: a < b iff (a-b) is negative, XOR the signed-overflow flag."""
+        """Signed less-than: a < b iff a - b is negative.
+
+        Both operands are sign-extended by one bit before subtracting, so the
+        difference of two w-bit values always fits in w+1 bits and cannot
+        overflow. Its top bit is then the answer, with no overflow flag."""
         enc = self.enc
         w = max(self.width, other.width) + 1  # one extra bit kills the overflow case
         a, b = self.extend(w), other.extend(w)
@@ -451,10 +454,12 @@ class _Compiler(ast.NodeVisitor):
         self._fail(node, type(node).__name__)
 
     def assign(self, name: str, value: BitVec) -> None:
-        """Assign under the current path condition.
+        """Bind `name` to `value` in the current environment, unconditionally.
 
-        Inside a branch the assignment is conditional, so the variable becomes
-        a select between the new value and whatever it held before.
+        Branches stay correct without a select here: an `if` runs each arm on
+        its own copy of the environment and merges them afterwards, with one
+        select per variable that differs between the arms (see the `ast.If`
+        case of `stmt`).
         """
         self.env[name] = value
 

{cdclkit-0.1.5 → cdclkit-0.1.7}/cdclkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdclkit
-Version: 0.1.5
+Version: 0.1.7
 Summary: A CDCL SAT solver, preprocessor, encoding library and modelling layer, written from scratch in readable Python. Every answer comes with a certificate.
 Author: Carlo Perassi
 License-Expression: Apache-2.0
@@ -23,9 +23,9 @@ Classifier: Topic :: Scientific/Engineering :: Mathematics
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: dratify>=0.1.7
+Requires-Dist: dratify>=0.1.9
 Provides-Extra: native
-Requires-Dist: cdclkit-native==0.1.5; extra == "native"
+Requires-Dist: cdclkit-native==0.1.7; extra == "native"
 Dynamic: license-file
 
 # cdclkit

cdclkit-0.1.7/cdclkit.egg-info/requires.txt

@@ -0,0 +1,4 @@
+dratify>=0.1.9
+
+[native]
+cdclkit-native==0.1.7

{cdclkit-0.1.5 → cdclkit-0.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cdclkit"
-version = "0.1.5"
+version = "0.1.7"
 description = "A CDCL SAT solver, preprocessor, encoding library and modelling layer, written from scratch in readable Python. Every answer comes with a certificate."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -30,13 +30,13 @@ classifiers = [
 # The only dependency is the proof checker, which itself has none. The solver
 # uses it to check its own refutations, so the checker is exercised by every
 # test run here as well as by its own suite.
-dependencies = ["dratify>=0.1.7"]
+dependencies = ["dratify>=0.1.9"]
 
 [project.optional-dependencies]
 # The Rust accelerator, as abi3 wheels for Linux and macOS. Pinned exactly:
 # the two are bit-exact by construction and a mismatched pair is a divergence
 # nobody would look for. tests/test_packaging.py enforces the pin.
-native = ["cdclkit-native==0.1.5"]
+native = ["cdclkit-native==0.1.7"]
 
 [project.scripts]
 cdclkit = "cdclkit.__main__:main"

{cdclkit-0.1.5 → cdclkit-0.1.7}/tests/test_adaptive_proof.py

@@ -113,11 +113,14 @@ class TestAdaptiveEmitsACheckableProof(unittest.TestCase):
 class TestAdaptiveCLI(unittest.TestCase):
     """End to end, because the bug was in the wiring rather than the pipeline."""
 
-    def _cli(self, *args):
+    def _cli(self, *args, engine=None):
         root = pathlib.Path(__file__).resolve().parent.parent
         import os
 
         env = dict(os.environ)
+        env.pop("CDCLKIT_ENGINE", None)
+        if engine is not None:
+            env["CDCLKIT_ENGINE"] = engine
         # prepend, do not replace: a pure-Python checkout finds dratify on the
         # inherited path, and clobbering it made these fail for the wrong reason
         env["PYTHONPATH"] = os.pathsep.join(
@@ -156,6 +159,47 @@ class TestAdaptiveCLI(unittest.TestCase):
         self.assertEqual(r.returncode, 1)
         self.assertIn("interleave", r.stdout)
 
+    # AGENTS.md said CDCLKIT_ENGINE selected the engine. Nothing read it, and
+    # `--adaptive` picked native on its own whenever it was installed.
+
+    def _php(self, engine=None):
+        with tempfile.TemporaryDirectory() as d:
+            cnf = pathlib.Path(d) / "php.cnf"
+            cnf.write_text(PHP)
+            return self._cli("solve", str(cnf), "--adaptive", engine=engine)
+
+    def test_adaptive_uses_native_when_installed(self):
+        r = self._php()
+        self.assertEqual(r.returncode, 20, r.stdout + r.stderr)
+        want = "native" if native.available() else "python"
+        self.assertIn(f"c engine: {want}", r.stdout)
+
+    def test_cdclkit_engine_python_overrides_adaptive(self):
+        r = self._php(engine="python")
+        self.assertEqual(r.returncode, 20, r.stdout + r.stderr)
+        self.assertIn("c engine: python", r.stdout)
+
+    def test_cdclkit_engine_native_without_the_build_is_an_error(self):
+        if native.available():
+            self.skipTest("native engine is built here")
+        r = self._php(engine="native")
+        self.assertEqual(r.returncode, 1, r.stdout + r.stderr)
+        self.assertIn("CDCLKIT_ENGINE=native", r.stderr)
+        self.assertNotIn("Traceback", r.stderr)
+
+    def test_portfolio_honours_cdclkit_engine_too(self):
+        with tempfile.TemporaryDirectory() as d:
+            cnf = pathlib.Path(d) / "php.cnf"
+            cnf.write_text(PHP)
+            r = self._cli("solve", str(cnf), "-j", "2", engine="python")
+        self.assertEqual(r.returncode, 20, r.stdout + r.stderr)
+        self.assertIn("c engine: python", r.stdout)
+
+    def test_unknown_cdclkit_engine_is_an_error(self):
+        r = self._php(engine="quantum")
+        self.assertEqual(r.returncode, 1, r.stdout + r.stderr)
+        self.assertIn("unknown CDCLKIT_ENGINE", r.stderr)
+
 
 if __name__ == "__main__":
     unittest.main()

{cdclkit-0.1.5 → cdclkit-0.1.7}/tests/test_portfolio.py

@@ -151,6 +151,12 @@ class TestEngineSelection(unittest.TestCase):
     """The portfolio can run native workers; correctness must not depend on it."""
 
     def test_python_and_native_engines_agree(self):
+        from cdclkit import native
+
+        if not native.available():
+            # engine="native" falls back to Python, so this would compare
+            # Python against Python and pass
+            self.skipTest("native engine not built")
         rng = random.Random(fuzz_seed(13))
         for _ in range(15):
             f = random_cnf(rng, max_vars=9, ratio=4.8)

{cdclkit-0.1.5 → cdclkit-0.1.7}/tests/test_target_scaling.py

@@ -15,9 +15,16 @@ take 0.11 s. Since dratify 0.1.7 a header may declare up to 2^20 variables
 from a file of any length, so a 22-byte file cost hours of CPU.
 
 The test compares scaling rather than absolute time, which shared CI runners
-cannot be trusted with: quadrupling the variables should cost about 4x when
-the search is linear and about 16x when it is quadratic. The threshold sits
-between them, and each size takes the best of three runs to damp noise.
+cannot be trusted with. Multiplying the variables by 16 costs about 20x when
+the search is linear (measured 19-23x on both engines; arrays outgrowing the
+cache add a little) and about 256x when it is quadratic. The limit, 64, sits
+between them with room on both sides. The first version stepped by 4 with a
+limit of 8: linear is 4.5x there, and a macOS runner measured 8.3x on native
+runs of 4 and 32 ms, so the margin was too thin. Each size takes the best of
+five runs to damp noise.
+
+Run against cdclkit 0.1.4, from before the fix, this test measures 252x on
+native and 218x on Python, so it still fails where it should.
 """
 
 from __future__ import annotations
@@ -41,7 +48,7 @@ def _solve(nvars: int, engine: str) -> bool:
 
 def _seconds(nvars: int, engine: str) -> float:
     best = float("inf")
-    for _ in range(3):
+    for _ in range(5):
         t0 = time.perf_counter()
         sat = _solve(nvars, engine)
         best = min(best, time.perf_counter() - t0)
@@ -50,27 +57,29 @@ def _seconds(nvars: int, engine: str) -> float:
 
 
 class TestUnusedVariablesCostLinearTime(unittest.TestCase):
-    #: quadrupling: ~4x if linear, ~16x if quadratic
-    LIMIT = 8.0
+    #: 16x the variables: ~20x if linear, ~256x if quadratic
+    FACTOR = 16
+    LIMIT = 64.0
 
     def _check(self, engine: str, small: int):
         t_small = _seconds(small, engine)
-        t_large = _seconds(4 * small, engine)
+        t_large = _seconds(self.FACTOR * small, engine)
         ratio = t_large / max(t_small, 1e-4)
         self.assertLess(
             ratio, self.LIMIT,
             f"{engine}: {small:,} vars took {t_small:.3f}s and "
-            f"{4 * small:,} took {t_large:.3f}s, a {ratio:.1f}x increase for "
-            f"4x the variables. Linear is ~4x; this is closer to quadratic.")
+            f"{self.FACTOR * small:,} took {t_large:.3f}s, a {ratio:.1f}x "
+            f"increase for {self.FACTOR}x the variables. Linear is ~20x; "
+            f"quadratic is ~256x.")
 
     def test_python_engine(self):
-        self._check("python", 4096)
+        self._check("python", 1024)
 
     @unittest.skipUnless(native.available(),
                          "native engine not built for this interpreter")
     def test_native_engine(self):
-        # Rust is fast enough that the quadratic term only dominates at
-        # larger sizes.
+        # Rust is fast enough that smaller sizes finish in under a millisecond,
+        # which is timer noise rather than a measurement.
         self._check("native", 32768)
 
 

cdclkit-0.1.5/cdclkit.egg-info/requires.txt

@@ -1,4 +0,0 @@
-dratify>=0.1.7
-
-[native]
-cdclkit-native==0.1.5