cpsat-js 1.0.0 → 1.2.0

package/dist/solver/cp-solver.js

@@ -2,6 +2,26 @@ import { create, toBinary, fromBinary } from '@bufbuild/protobuf';
 import { CpModelProtoSchema, CpSolverResponseSchema, CpSolverStatus, } from '../generated/cp_model_pb.js';
 import { SatParametersSchema, } from '../generated/sat_parameters_pb.js';
 export { CpSolverStatus };
+let glueLoader;
+let glueIsThreaded = false;
+/** @internal — called by the package entry point (index.threaded / index.portable). */
+export function setGlueLoader(loader, threaded) {
+    glueLoader = loader;
+    glueIsThreaded = threaded;
+}
+/** Build the caller-facing view of a response. Shared by results and incumbents. */
+function readResponse(response) {
+    return {
+        status: response.status,
+        objectiveValue: response.objectiveValue,
+        bestObjectiveBound: response.bestObjectiveBound,
+        wallTime: response.wallTime,
+        value(variable) {
+            return Number(response.solution[variable.index]);
+        },
+        response,
+    };
+}
 /**
  * Loads the WASM module and solves CP-SAT models.
  *
@@ -15,8 +35,12 @@ export class CpSolver {
         this.module = module;
     }
     static async create(options) {
-        // Dynamic import of the Emscripten-generated JS glue
-        const createModule = await loadWasmFactory(options?.locateFile);
+        if (!glueLoader) {
+            throw new Error("No WASM build was registered. Import the package entry point ('cpsat-js', " +
+                "'cpsat-js/threaded' or 'cpsat-js/portable') rather than a deep internal path.");
+        }
+        // The glue — and therefore the 6MB WASM — is only loaded here, on first create().
+        const createModule = await glueLoader(options?.locateFile);
         const module = await createModule();
         return new CpSolver(module);
     }
@@ -24,14 +48,21 @@ export class CpSolver {
         const modelProto = model.toProto();
         const modelBytes = toBinary(CpModelProtoSchema, modelProto);
         const satParams = create(SatParametersSchema, {});
-        // Force single worker for WASM (no threading support in MVP)
-        satParams.numWorkers = 1;
+        // CP-SAT's speed comes from its parallel subsolver portfolio, which only engages
+        // at >= 6 workers; 2 and 4 are measurably SLOWER than 1. The threaded WASM is
+        // built with a pre-spawned pthread pool, so 8 is both safe and the right default.
+        satParams.numWorkers = 8;
         if (params?.maxTimeInSeconds !== undefined) {
             satParams.maxTimeInSeconds = params.maxTimeInSeconds;
         }
         if (params?.numWorkers !== undefined) {
             satParams.numWorkers = params.numWorkers;
         }
+        // The portable build has no threads. Clamp to 1 rather than to some lower count:
+        // anything in 2..5 selects a degraded portfolio and is slower than a single worker.
+        if (!glueIsThreaded) {
+            satParams.numWorkers = 1;
+        }
         const paramsBytes = toBinary(SatParametersSchema, satParams);
         // Allocate WASM heap memory for model
         const modelPtr = this.module._malloc(modelBytes.length);
@@ -39,13 +70,34 @@ export class CpSolver {
         // Allocate WASM heap memory for params
         const paramsPtr = this.module._malloc(paramsBytes.length);
         this.module.HEAPU8.set(paramsBytes, paramsPtr);
+        const onSolution = params?.onSolution;
+        if (onSolution) {
+            this.module.__cpsatOnSolution = (bytes) => {
+                onSolution({ ...readResponse(fromBinary(CpSolverResponseSchema, bytes)), live: true });
+            };
+        }
         let resultLen;
         try {
-            resultLen = this.module._solve(modelPtr, modelBytes.length, paramsPtr, paramsBytes.length);
+            resultLen = this.module._solve(modelPtr, modelBytes.length, paramsPtr, paramsBytes.length, onSolution ? 1 : 0);
         }
         finally {
             this.module._free(modelPtr);
             this.module._free(paramsPtr);
+            delete this.module.__cpsatOnSolution;
+        }
+        // Incumbents the observer could only record, because it ran on a thread that
+        // cannot enter JS. Drained unconditionally: a live solve recorded nothing, so the
+        // count is zero and this does nothing. That way the 1-vs-many rule lives in one
+        // place — the C++ observer — and is never restated here to drift out of step.
+        if (onSolution) {
+            const recorded = this.module._solution_count();
+            for (let i = 0; i < recorded; i++) {
+                const ptr = this.module._solution_ptr(i);
+                const len = this.module._solution_len(i);
+                // Re-read HEAPU8 each time: growing the heap replaces the buffer.
+                const bytes = this.module.HEAPU8.slice(ptr, ptr + len);
+                onSolution({ ...readResponse(fromBinary(CpSolverResponseSchema, bytes)), live: false });
+            }
         }
         // Read result from WASM memory
         const resultPtr = this.module._get_result_ptr();
@@ -66,15 +118,20 @@ export class CpSolver {
         };
     }
 }
-async function loadWasmFactory(locateFile) {
-    const wasmUrl = new URL('../../build/cpsat.wasm', import.meta.url).href;
-    // @ts-expect-error Emscripten-generated ESM glue; no TS declarations.
-    const glue = await import('../../build/cpsat.mjs');
-    const factory = glue.default;
-    if (typeof factory !== 'function') {
-        throw new Error('cpsat glue did not export a factory function');
-    }
-    const resolvedLocate = locateFile ?? ((path) => (path.endsWith('.wasm') ? wasmUrl : path));
-    return (options) => factory({ ...options, locateFile: resolvedLocate });
+/**
+ * Shared plumbing for the per-variant glue loaders. Each caller passes its own
+ * statically-analysable import, so only that variant's WASM is ever emitted.
+ */
+export function makeGlueLoader(importGlue, wasmUrl) {
+    return async (locateFile) => {
+        const glue = await importGlue();
+        const factory = glue.default;
+        if (typeof factory !== 'function') {
+            throw new Error('cpsat glue did not export a factory function');
+        }
+        const url = wasmUrl();
+        const resolvedLocate = locateFile ?? ((path) => (path.endsWith('.wasm') ? url : path));
+        return (options) => factory({ ...options, locateFile: resolvedLocate });
+    };
 }
 //# sourceMappingURL=cp-solver.js.map

package/dist/solver/cp-solver.js.map

@@ -1 +1 @@
-{"version":3,"file":"cp-solver.js","sourceRoot":"","sources":["../../src/solver/cp-solver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cp-solver.js","sourceRoot":"","sources":["../../src/solver/cp-solver.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,21 +1,32 @@
 {
   "name": "cpsat-js",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "WebAssembly port of Google OR-Tools CP-SAT constraint programming solver",
   "type": "module",
-  "main": "dist/index.js",
+  "main": "dist/index.portable.js",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "browser": "./dist/index.portable.js",
+      "node": "./dist/index.threaded.js",
+      "default": "./dist/index.portable.js"
     },
-    "./cpsat.wasm": "./build/cpsat.wasm"
+    "./threaded": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.threaded.js"
+    },
+    "./portable": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.portable.js"
+    }
   },
   "files": [
     "dist/",
-    "build/cpsat.mjs",
-    "build/cpsat.wasm"
+    "build/threaded/cpsat.mjs",
+    "build/threaded/cpsat.wasm",
+    "build/portable/cpsat.mjs",
+    "build/portable/cpsat.wasm"
   ],
   "scripts": {
     "build:wasm": "./build.sh",
@@ -39,11 +50,11 @@
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/owen-lacey/ortools-wasm.git"
+    "url": "git+https://github.com/owen-lacey/cpsat-js.git"
   },
-  "homepage": "https://github.com/owen-lacey/ortools-wasm#readme",
+  "homepage": "https://github.com/owen-lacey/cpsat-js#readme",
   "bugs": {
-    "url": "https://github.com/owen-lacey/ortools-wasm/issues"
+    "url": "https://github.com/owen-lacey/cpsat-js/issues"
   },
   "dependencies": {
     "@bufbuild/protobuf": "^2.3.0"