discopt 0.2.3__tar.gz → 0.2.4__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 (126) hide show
  1. {discopt-0.2.3 → discopt-0.2.4}/PKG-INFO +2 -2
  2. {discopt-0.2.3 → discopt-0.2.4}/README.md +1 -1
  3. {discopt-0.2.3 → discopt-0.2.4}/pyproject.toml +1 -1
  4. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/__init__.py +1 -1
  5. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/cli.py +141 -0
  6. {discopt-0.2.3 → discopt-0.2.4}/Cargo.lock +0 -0
  7. {discopt-0.2.3 → discopt-0.2.4}/Cargo.toml +0 -0
  8. {discopt-0.2.3 → discopt-0.2.4}/LICENSE +0 -0
  9. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-core/Cargo.toml +0 -0
  10. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-core/src/bnb/branching.rs +0 -0
  11. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-core/src/bnb/mod.rs +0 -0
  12. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-core/src/bnb/node.rs +0 -0
  13. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-core/src/bnb/pool.rs +0 -0
  14. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-core/src/bnb/tree_manager.rs +0 -0
  15. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-core/src/expr.rs +0 -0
  16. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-core/src/lib.rs +0 -0
  17. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-core/src/nl_parser.rs +0 -0
  18. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-core/src/presolve/fbbt.rs +0 -0
  19. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-core/src/presolve/mod.rs +0 -0
  20. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-core/src/presolve/obbt.rs +0 -0
  21. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-core/src/presolve/probing.rs +0 -0
  22. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-core/src/presolve/simplify.rs +0 -0
  23. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-python/Cargo.toml +0 -0
  24. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-python/src/batch.rs +0 -0
  25. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-python/src/bnb_bindings.rs +0 -0
  26. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-python/src/expr_bindings.rs +0 -0
  27. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-python/src/lib.rs +0 -0
  28. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-python/src/nl_bindings.rs +0 -0
  29. {discopt-0.2.3 → discopt-0.2.4}/crates/discopt-python/src/ripopt_bindings.rs +0 -0
  30. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/PHASE3_MATH_NOTES.md +0 -0
  31. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/__init__.py +0 -0
  32. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/alphabb.py +0 -0
  33. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/batch_evaluator.py +0 -0
  34. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/convexity.py +0 -0
  35. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/cutting_planes.py +0 -0
  36. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/dag_compiler.py +0 -0
  37. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/differentiable.py +0 -0
  38. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/differentiable_lp.py +0 -0
  39. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/differentiable_qp.py +0 -0
  40. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/differentiable_solve.py +0 -0
  41. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/envelopes.py +0 -0
  42. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/gdp_reformulate.py +0 -0
  43. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/gnn_branching.py +0 -0
  44. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/gnn_policy.py +0 -0
  45. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/icnn.py +0 -0
  46. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/icnn_trainer.py +0 -0
  47. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/ipm.py +0 -0
  48. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/ipm_callbacks.py +0 -0
  49. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/ipm_iterative.py +0 -0
  50. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/learned_relaxations.py +0 -0
  51. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/lp_ipm.py +0 -0
  52. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/mccormick.py +0 -0
  53. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/mccormick_nlp.py +0 -0
  54. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/nl_evaluator.py +0 -0
  55. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/nl_reconstruction.py +0 -0
  56. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/nlp_evaluator.py +0 -0
  57. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/obbt.py +0 -0
  58. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/pcg.py +0 -0
  59. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/piecewise_mccormick.py +0 -0
  60. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/primal_heuristics.py +0 -0
  61. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/problem_classifier.py +0 -0
  62. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/problem_graph.py +0 -0
  63. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/qp_ipm.py +0 -0
  64. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/relaxation_compiler.py +0 -0
  65. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/sparse_ipm.py +0 -0
  66. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/sparse_jacobian.py +0 -0
  67. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/sparse_kkt.py +0 -0
  68. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/sparsity.py +0 -0
  69. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/_jax/strong_branching.py +0 -0
  70. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/benchmarks/__init__.py +0 -0
  71. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/benchmarks/metrics.py +0 -0
  72. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/benchmarks/runner.py +0 -0
  73. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/callbacks.py +0 -0
  74. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/constants.py +0 -0
  75. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/dae/__init__.py +0 -0
  76. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/dae/collocation.py +0 -0
  77. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/dae/finite_difference.py +0 -0
  78. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/dae/mol.py +0 -0
  79. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/dae/polynomials.py +0 -0
  80. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/export/__init__.py +0 -0
  81. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/export/_extract.py +0 -0
  82. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/export/lp.py +0 -0
  83. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/export/mps.py +0 -0
  84. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/interfaces/__init__.py +0 -0
  85. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/interfaces/cutest.py +0 -0
  86. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/llm/__init__.py +0 -0
  87. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/llm/advisor.py +0 -0
  88. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/llm/chat.py +0 -0
  89. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/llm/commentary.py +0 -0
  90. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/llm/diagnosis.py +0 -0
  91. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/llm/prompts.py +0 -0
  92. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/llm/provider.py +0 -0
  93. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/llm/reformulation.py +0 -0
  94. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/llm/safety.py +0 -0
  95. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/llm/serializer.py +0 -0
  96. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/llm/tools.py +0 -0
  97. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/modeling/__init__.py +0 -0
  98. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/modeling/core.py +0 -0
  99. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/modeling/examples.py +0 -0
  100. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/nn/__init__.py +0 -0
  101. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/nn/bounds.py +0 -0
  102. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/nn/formulations/__init__.py +0 -0
  103. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/nn/formulations/base.py +0 -0
  104. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/nn/formulations/full_space.py +0 -0
  105. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/nn/formulations/reduced_space.py +0 -0
  106. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/nn/formulations/relu_bigm.py +0 -0
  107. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/nn/formulations/tree_ensemble.py +0 -0
  108. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/nn/network.py +0 -0
  109. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/nn/predictor.py +0 -0
  110. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/nn/readers/__init__.py +0 -0
  111. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/nn/readers/onnx_reader.py +0 -0
  112. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/nn/readers/sklearn_reader.py +0 -0
  113. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/nn/readers/torch_reader.py +0 -0
  114. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/nn/scaling.py +0 -0
  115. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/nn/tree.py +0 -0
  116. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/solver.py +0 -0
  117. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/solvers/__init__.py +0 -0
  118. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/solvers/gdpopt_loa.py +0 -0
  119. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/solvers/lp_highs.py +0 -0
  120. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/solvers/milp_highs.py +0 -0
  121. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/solvers/nlp_ipopt.py +0 -0
  122. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/solvers/nlp_ripopt.py +0 -0
  123. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/solvers/oa.py +0 -0
  124. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/solvers/qp_highs.py +0 -0
  125. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/solvers/sipopt.py +0 -0
  126. {discopt-0.2.3 → discopt-0.2.4}/python/discopt/warm_start.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: discopt
3
- Version: 0.2.3
3
+ Version: 0.2.4
4
4
  Classifier: Development Status :: 3 - Alpha
5
5
  Classifier: Intended Audience :: Science/Research
6
6
  Classifier: License :: OSI Approved :: Eclipse Public License 2.0 (EPL-2.0)
@@ -64,7 +64,7 @@ Project-URL: Repository, https://github.com/jkitchin/discopt
64
64
  [![CI](https://github.com/jkitchin/discopt/actions/workflows/ci.yml/badge.svg)](https://github.com/jkitchin/discopt/actions/workflows/ci.yml)
65
65
  [![codecov](https://codecov.io/gh/jkitchin/discopt/graph/badge.svg?token=B3Y6LAtox9)](https://codecov.io/gh/jkitchin/discopt)
66
66
 
67
- ![discopt](https://raw.githubusercontent.com/jkitchin/discopt/main/discopt.png)
67
+ [![discopt](https://github.com/jkitchin/discopt/blob/main/discopt.png?raw=true)](https://github.com/jkitchin/discopt/blob/main/discopt.png?raw=true)
68
68
 
69
69
  A hybrid Mixed-Integer Nonlinear Programming (MINLP) solver combining a Rust backend, JAX automatic differentiation, and Python orchestration. Solves MINLP problems via NLP-based spatial Branch and Bound with JIT-compiled objective/gradient/Hessian evaluation.
70
70
 
@@ -3,7 +3,7 @@
3
3
  [![CI](https://github.com/jkitchin/discopt/actions/workflows/ci.yml/badge.svg)](https://github.com/jkitchin/discopt/actions/workflows/ci.yml)
4
4
  [![codecov](https://codecov.io/gh/jkitchin/discopt/graph/badge.svg?token=B3Y6LAtox9)](https://codecov.io/gh/jkitchin/discopt)
5
5
 
6
- ![discopt](https://raw.githubusercontent.com/jkitchin/discopt/main/discopt.png)
6
+ [![discopt](https://github.com/jkitchin/discopt/blob/main/discopt.png?raw=true)](https://github.com/jkitchin/discopt/blob/main/discopt.png?raw=true)
7
7
 
8
8
  A hybrid Mixed-Integer Nonlinear Programming (MINLP) solver combining a Rust backend, JAX automatic differentiation, and Python orchestration. Solves MINLP problems via NLP-based spatial Branch and Bound with JIT-compiled objective/gradient/Hessian evaluation.
9
9
 
@@ -4,7 +4,7 @@ build-backend = "maturin"
4
4
 
5
5
  [project]
6
6
  name = "discopt"
7
- version = "0.2.3"
7
+ version = "0.2.4"
8
8
  description = "Hybrid MINLP solver combining Rust and JAX"
9
9
  requires-python = ">=3.10"
10
10
  authors = [{name = "John Kitchin"}]
@@ -25,7 +25,7 @@ solvers
25
25
  NLP solver backends: ripopt (Rust IPM), pure-JAX IPM (vmap batch), cyipopt (Ipopt).
26
26
  """
27
27
 
28
- __version__ = "0.2.0"
28
+ __version__ = "0.2.4"
29
29
 
30
30
  from discopt.callbacks import (
31
31
  CallbackContext as CallbackContext,
@@ -1,14 +1,18 @@
1
1
  """discopt CLI.
2
2
 
3
3
  Usage:
4
+ discopt about
5
+ discopt test
4
6
  discopt search-arxiv "query" [--max-results 20] [--start-date 2026-01-01]
5
7
  discopt search-openalex "query" [--from-date ...] [--to-date ...] [--per-page 20]
6
8
  discopt write-report <output-path>
7
9
  """
8
10
 
9
11
  import argparse
12
+ import importlib.metadata
10
13
  import json
11
14
  import os
15
+ import platform
12
16
  import sys
13
17
  import urllib.parse
14
18
  import urllib.request
@@ -225,10 +229,147 @@ def _cmd_write_report(args):
225
229
  print(f"Wrote {len(content)} bytes to {path}")
226
230
 
227
231
 
232
+ def _cmd_about(_args):
233
+ import discopt
234
+
235
+ version = discopt.__version__
236
+
237
+ # Installation location
238
+ install_location = os.path.dirname(os.path.abspath(discopt.__file__))
239
+
240
+ # Try to get package metadata from pip
241
+ try:
242
+ meta = importlib.metadata.metadata("discopt")
243
+ pkg_version = meta["Version"]
244
+ summary = meta["Summary"] or ""
245
+ license_text = meta["License"] or ""
246
+ except importlib.metadata.PackageNotFoundError:
247
+ pkg_version = version
248
+ summary = "Hybrid MINLP solver combining Rust and JAX"
249
+ license_text = "EPL-2.0"
250
+
251
+ # Check for Rust extension
252
+ try:
253
+ import discopt._rust
254
+
255
+ rust_ext = os.path.abspath(discopt._rust.__file__)
256
+ except (ImportError, AttributeError):
257
+ rust_ext = "not available"
258
+
259
+ print(f"discopt {pkg_version}")
260
+ print(f" Summary: {summary}")
261
+ print(f" License: {license_text}")
262
+ print(f" Location: {install_location}")
263
+ print(f" Rust ext: {rust_ext}")
264
+ print(f" Python: {sys.version}")
265
+ print(f" Platform: {platform.platform()}")
266
+ print(f" Executable: {sys.executable}")
267
+
268
+ # Key dependency versions
269
+ deps = ["jax", "jaxlib", "numpy", "scipy"]
270
+ optional_deps = ["cyipopt", "highspy", "litellm", "pycutest", "onnx", "onnxruntime"]
271
+ for name in deps:
272
+ try:
273
+ ver = importlib.metadata.version(name)
274
+ except importlib.metadata.PackageNotFoundError:
275
+ ver = "not installed"
276
+ print(f" {name}: {ver}")
277
+
278
+ print(" Optional:")
279
+ for name in optional_deps:
280
+ try:
281
+ ver = importlib.metadata.version(name)
282
+ except importlib.metadata.PackageNotFoundError:
283
+ ver = "not installed"
284
+ print(f" {name}: {ver}")
285
+
286
+
287
+ def _cmd_test(_args):
288
+ """Run a quick smoke test to verify the installation works."""
289
+ errors = []
290
+ passed = []
291
+
292
+ # 1. Import core package
293
+ try:
294
+ import discopt
295
+
296
+ passed.append(f"import discopt ({discopt.__version__})")
297
+ except Exception as e:
298
+ errors.append(f"import discopt: {e}")
299
+
300
+ # 2. Rust extension
301
+ try:
302
+ import discopt._rust # noqa: F811
303
+
304
+ passed.append("Rust extension loaded")
305
+ except ImportError as e:
306
+ errors.append(f"Rust extension: {e}")
307
+
308
+ # 3. JAX
309
+ try:
310
+ import jax
311
+ import jax.numpy as jnp
312
+
313
+ _ = jnp.array([1.0, 2.0])
314
+ passed.append(f"JAX {jax.__version__} (backend: {jax.default_backend()})")
315
+ except Exception as e:
316
+ errors.append(f"JAX: {e}")
317
+
318
+ # 4. Build and solve a tiny model
319
+ try:
320
+ import discopt
321
+
322
+ m = discopt.Model("smoke_test")
323
+ x = m.continuous("x", lb=0, ub=10)
324
+ m.minimize(x)
325
+ m.subject_to(x >= 1)
326
+ result = m.solve(verbose=False)
327
+ obj = float(result.objective)
328
+ if abs(obj - 1.0) > 1e-3:
329
+ errors.append(f"Solve sanity: expected objective ~1.0, got {obj}")
330
+ else:
331
+ passed.append(f"Model build + solve (objective={obj:.6f})")
332
+ except Exception as e:
333
+ errors.append(f"Model build + solve: {e}")
334
+
335
+ # 5. DAG compiler (JAX tracing)
336
+ try:
337
+ from discopt._jax.dag_compiler import compile_objective
338
+ from discopt.modeling import Model
339
+
340
+ m2 = Model("dag_test")
341
+ x = m2.continuous("x", lb=0, ub=1)
342
+ m2.minimize(x * x)
343
+ _ = compile_objective(m2)
344
+ passed.append("DAG compiler")
345
+ except Exception as e:
346
+ errors.append(f"DAG compiler: {e}")
347
+
348
+ # Print results
349
+ for msg in passed:
350
+ print(f" PASS {msg}")
351
+ for msg in errors:
352
+ print(f" FAIL {msg}")
353
+
354
+ total = len(passed) + len(errors)
355
+ print(f"\n{len(passed)}/{total} checks passed.")
356
+
357
+ if errors:
358
+ sys.exit(1)
359
+
360
+
228
361
  def main():
229
362
  parser = argparse.ArgumentParser(prog="discopt", description="discopt CLI")
230
363
  subparsers = parser.add_subparsers(dest="command", required=True)
231
364
 
365
+ # about
366
+ p_about = subparsers.add_parser("about", help="Show version and installation info")
367
+ p_about.set_defaults(func=_cmd_about)
368
+
369
+ # test
370
+ p_test = subparsers.add_parser("test", help="Run smoke tests to verify installation")
371
+ p_test.set_defaults(func=_cmd_test)
372
+
232
373
  # search-arxiv
233
374
  p_arxiv = subparsers.add_parser("search-arxiv", help="Search arXiv API")
234
375
  p_arxiv.add_argument("query", help="arXiv search query")
File without changes
File without changes
File without changes