cdclkit 0.1.6__tar.gz → 0.1.7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdclkit
-Version: 0.1.6
+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.6; extra == "native"
+Requires-Dist: cdclkit-native==0.1.7; extra == "native"
 Dynamic: license-file
 
 # cdclkit

{cdclkit-0.1.6 → 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.6"
+__version__ = "0.1.7"
 
 __all__ = [
     "CNF",

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdclkit
-Version: 0.1.6
+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.6; 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.6 → cdclkit-0.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cdclkit"
-version = "0.1.6"
+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.6"]
+native = ["cdclkit-native==0.1.7"]
 
 [project.scripts]
 cdclkit = "cdclkit.__main__:main"

{cdclkit-0.1.6 → 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.6/cdclkit.egg-info/requires.txt

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