m4opt 2.2.0__tar.gz → 2.3.0__tar.gz

{m4opt-2.2.0 → m4opt-2.3.0}/.github/workflows/ci_cron_weekly.yml

@@ -29,7 +29,7 @@ jobs:
     steps:
     - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8  # v6.0.1
     - name: Cache Astropy data
-      uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb  # v5.0.1
+      uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7  # v5.0.2
       with:
         key: ${{ matrix.toxenv }}
         path: ~/.astropy/cache

{m4opt-2.2.0 → m4opt-2.3.0}/.github/workflows/ci_tests.yml

@@ -75,7 +75,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Cache Astropy data
-      uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb  # v5.0.1
+      uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7  # v5.0.2
       with:
         key: ${{ matrix.toxenv }}
         path: ~/.astropy/cache

{m4opt-2.2.0 → m4opt-2.3.0}/.pre-commit-config.yaml

@@ -28,7 +28,7 @@ repos:
         exclude_types: [python] # Covered by Ruff W291.
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.14.11
+    rev: v0.14.13
     hooks:
       # Run the linter.
       - id: ruff-check

{m4opt-2.2.0 → m4opt-2.3.0}/CHANGES.rst

@@ -2,6 +2,22 @@
 Changes
 *******
 
+2.3.0 (2026-01-22)
+==================
+
+- When available memory is limited by the ``--memory`` option, spool CPLEX's
+  node file to disk.
+
+- If the solution is aborted because the best bound falls below the objective
+  lower cutoff, then record the solution status as
+  `aborted, lower cutoff reached`.
+
+2.2.1 (2026-01-16)
+==================
+
+- Fix crash for sky maps with invalid pixels when using a fixed absolute
+  magnitude.
+
 2.2.0 (2026-01-15)
 ==================
 

{m4opt-2.2.0 → m4opt-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: m4opt
-Version: 2.2.0
+Version: 2.3.0
 Summary: Multi-Mission Multi-Messenger Observation Planning Toolkit
 Author-email: M4OPT Developers <leo.singer@ligo.org>
 License-Expression: BSD-3-Clause

{m4opt-2.2.0 → m4opt-2.3.0}/docs/dev/changes.rst

@@ -2,6 +2,22 @@
 Changes
 *******
 
+2.3.0 (2026-01-22)
+==================
+
+- When available memory is limited by the ``--memory`` option, spool CPLEX's
+  node file to disk.
+
+- If the solution is aborted because the best bound falls below the objective
+  lower cutoff, then record the solution status as
+  `aborted, lower cutoff reached`.
+
+2.2.1 (2026-01-16)
+==================
+
+- Fix crash for sky maps with invalid pixels when using a fixed absolute
+  magnitude.
+
 2.2.0 (2026-01-15)
 ==================
 

{m4opt-2.2.0 → m4opt-2.3.0}/m4opt/_cli/schedule.py

@@ -355,6 +355,8 @@ def schedule(
                 appmag_quantiles = stats.norm(
                     loc=appmag_mu[:, np.newaxis], scale=appmag_sigma[:, np.newaxis]
                 ).ppf(quantiles)
+                # FIXME: prune pixels with infinite distance
+                appmag_quantiles[np.isposinf(appmag_mu)] = np.inf
 
                 with observing(
                     observer_location=observer_locations[0],

{m4opt-2.2.0 → m4opt-2.3.0}/m4opt/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.2.0'
-__version_tuple__ = version_tuple = (2, 2, 0)
+__version__ = version = '2.3.0'
+__version_tuple__ = version_tuple = (2, 3, 0)
 
-__commit_id__ = commit_id = 'g76c65b409'
+__commit_id__ = commit_id = 'gbb83227d0'

{m4opt-2.2.0 → m4opt-2.3.0}/m4opt/milp.py

@@ -6,7 +6,7 @@ from gzip import GzipFile
 from io import BufferedWriter
 from pathlib import Path
 from shutil import copyfileobj
-from tempfile import NamedTemporaryFile
+from tempfile import NamedTemporaryFile, gettempdir
 from unittest.mock import patch
 
 import cplex
@@ -25,6 +25,7 @@ __all__ = ("Model", "SolveSolution")
 class LowerCutoffCallback:
     def __init__(self, cutoff: float):
         self._cutoff = cutoff
+        self._reached = False
 
     def invoke(self, context: cplex.callbacks.Context):
         best_bound = context.get_double_info(cplex.callbacks.CallbackInfo.best_bound)
@@ -32,6 +33,7 @@ class LowerCutoffCallback:
             print(
                 f"giving up because best bound ({best_bound}) <= cutoff ({self._cutoff})"
             )
+            self._reached = True
             context.abort()
 
 
@@ -89,6 +91,7 @@ class Model(_Model):
 
         self.context.solver.log_output = verbose
         self.context.cplex_parameters.threads = jobs
+        self.context.cplex_parameters.workdir = gettempdir()
 
         # Disable deterministic parallelism. We're OK with results being
         # slightly dependent upon timing.
@@ -110,7 +113,8 @@ class Model(_Model):
             )
 
         if np.isfinite(memory):
-            self.context.cplex_parameters.mip.limits.treememory = memory.to_value(u.MiB)
+            self.context.cplex_parameters.mip.strategy.file = 3
+            self.context.cplex_parameters.workmem = memory.to_value(u.MiB)
 
         if lowercutoff is not None:
             # FIXME: Setting lowercutoff drastically hurts solution quality.
@@ -118,8 +122,9 @@ class Model(_Model):
             # See https://github.com/IBMDecisionOptimization/docplex/issues/20
             #
             # model.context.cplex_parameters.mip.tolerances.lowercutoff = cutoff
+            self._lower_cutoff = LowerCutoffCallback(lowercutoff)
             self.get_cplex().set_callback(
-                LowerCutoffCallback(lowercutoff),
+                self._lower_cutoff,
                 cplex.callbacks.Context.id.global_progress,
             )
 
@@ -186,7 +191,17 @@ class Model(_Model):
 
     def solve(self, **kwargs):
         with patch("docplex.mp.solution.SolveSolution", SolveSolution):
-            return super().solve(**kwargs)
+            result = super().solve(**kwargs)
+        if (
+            (cutoff := getattr(self, "_lower_cutoff", None))
+            and cutoff._reached
+            and self.solve_details.status == "aborted"
+        ):
+            message = "aborted, lower cutoff reached"
+            self._solve_details._solve_status = message
+            if result is not None:
+                result.solve_details._solve_status = message
+        return result
 
     def min(self, *args):
         return np.asarray(super().min(*args)).view(VariableArray)

{m4opt-2.2.0 → m4opt-2.3.0}/m4opt/tests/test_milp.py

@@ -1,5 +1,7 @@
 """Test production problem size limits for MILP solvers."""
 
+from tempfile import gettempdir
+
 import docplex.mp.model
 import numpy as np
 import pytest
@@ -24,26 +26,32 @@ def test_cplex_parameters():
     """Test configuration of CPLEX solver parameters."""
     m = Model()
     assert m.context.cplex_parameters.mip.pool.capacity.value == 0
+    assert m.context.cplex_parameters.mip.strategy.file.value == 1
     assert m.context.cplex_parameters.parallel.value == -1
     assert m.context.cplex_parameters.threads.value == 0
     assert m.context.cplex_parameters.timelimit.value == 1e75
-    assert m.context.cplex_parameters.mip.limits.treememory.value == 1e75
+    assert m.context.cplex_parameters.workmem.value == 2048
+    assert m.context.cplex_parameters.workdir.value == gettempdir()
     assert m.context.solver.log_output
 
     m = Model(timelimit=1 * u.minute, jobs=3)
     assert m.context.cplex_parameters.mip.pool.capacity.value == 0
+    assert m.context.cplex_parameters.mip.strategy.file.value == 1
     assert m.context.cplex_parameters.parallel.value == -1
     assert m.context.cplex_parameters.threads.value == 3
     assert m.context.cplex_parameters.timelimit.value == 60
-    assert m.context.cplex_parameters.mip.limits.treememory.value == 1e75
+    assert m.context.cplex_parameters.workmem.value == 2048
+    assert m.context.cplex_parameters.workdir.value == gettempdir()
     assert m.context.solver.log_output
 
     m = Model(timelimit=1 * u.minute, jobs=3, memory=5 * u.GiB)
     assert m.context.cplex_parameters.mip.pool.capacity.value == 0
+    assert m.context.cplex_parameters.mip.strategy.file.value == 3
     assert m.context.cplex_parameters.parallel.value == -1
     assert m.context.cplex_parameters.threads.value == 3
     assert m.context.cplex_parameters.timelimit.value == 60
-    assert m.context.cplex_parameters.mip.limits.treememory.value == 5120
+    assert m.context.cplex_parameters.workmem.value == 5120
+    assert m.context.cplex_parameters.workdir.value == gettempdir()
     assert m.context.solver.log_output
 
 

{m4opt-2.2.0 → m4opt-2.3.0}/m4opt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: m4opt
-Version: 2.2.0
+Version: 2.3.0
 Summary: Multi-Mission Multi-Messenger Observation Planning Toolkit
 Author-email: M4OPT Developers <leo.singer@ligo.org>
 License-Expression: BSD-3-Clause