cleanup

Author: americalexander

activitysim/core/calibration.py

@@ -356,33 +356,6 @@ def _resolve_checkpoint_name(
     )
 
 
-def _effective_resume_index(
-    state: workflow.State,
-    checkpoint_name: str,
-) -> int:
-    """Return the index of the last model covered by a checkpoint.
-
-    For model-level checkpoints this is the model's own index in
-    ``settings.models``.  For step-level checkpoints this is the index of
-    the last model in the enclosing multiprocess step.
-    """
-    all_models = state.settings.models
-    if checkpoint_name in all_models:
-        return all_models.index(checkpoint_name)
-
-    mp_steps = state.settings.multiprocess_steps or []
-    step_boundaries = [all_models.index(s.begin) for s in mp_steps]
-    step_boundaries.append(len(all_models))
-
-    for i, step in enumerate(mp_steps):
-        if step.name == checkpoint_name or (
-            checkpoint_name.startswith(f"calibration_{step.name}")
-        ):
-            return step_boundaries[i + 1] - 1
-
-    return -1
-
-
 def _run_precursor_components(
     state: workflow.State,
     models: list[str],
@@ -1531,36 +1504,10 @@ def _run_in_configured_mode(
         state.checkpoint.add(original_last_model)
         return
 
-    # Single-process mode: resolve resume_after to an existing checkpoint
-    # when the pipeline has step-level checkpoints from a prior multiprocess
-    # run (model-level checkpoints won't exist in that pipeline).
-    if resume_after:
-        pipeline_path = state.checkpoint.default_pipeline_file_path()
-        try:
-            checkpoint_names = _get_pipeline_checkpoint_names(
-                state, pipeline_path
-            )
-        except Exception:
-            checkpoint_names = []
-
-        if checkpoint_names and resume_after not in checkpoint_names:
-            resolved = _resolve_checkpoint_name(
-                state, resume_after, checkpoint_names
-            )
-            # The resolved checkpoint may cover more models than
-            # resume_after — trim the models list accordingly.
-            end_idx = _effective_resume_index(state, resolved)
-            if end_idx >= 0:
-                all_models = state.settings.models
-                models = [m for m in models if all_models.index(m) > end_idx]
-
-            if not models:
-                state.checkpoint.restore(resolved)
-                state.checkpoint.add(original_last_model)
-                return
-
-            resume_after = resolved
-
+    # Single-process mode: pass resume_after directly to the runner.
+    # Single-process pipelines use model-level checkpoint names, so the
+    # model name should exist as-is.  Cross-mode resume (single-process
+    # resuming from a multiprocess pipeline) is not supported.
     state.run(
         models=models,
         resume_after=resume_after,