Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions python/activator/middleware_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@
from lsst.resources import ResourcePath
import lsst.sphgeom
import lsst.afw.cameraGeom
import lsst.ctrl.mpexec
from lsst.ctrl.mpexec import SeparablePipelineExecutor, SingleQuantumExecutor, MPGraphExecutor
from lsst.pipe.base.mp_graph_executor import MPGraphExecutor
from lsst.pipe.base.separable_pipeline_executor import SeparablePipelineExecutor
from lsst.pipe.base.single_quantum_executor import SingleQuantumExecutor
from lsst.daf.butler import Butler, CollectionType, DatasetType, Timespan, \
DataIdValueError, MissingDatasetTypeError, MissingCollectionError
import lsst.dax.apdb
Expand Down Expand Up @@ -1229,21 +1230,21 @@ def _get_graph_executor(self, butler, factory):

Returns
-------
executor : `lsst.ctrl.mpexec.QuantumGraphExecutor`
executor : `lsst.pipe.base.quantum_graph_executor.QuantumGraphExecutor`
The executor to use.
"""
quantum_executor = SingleQuantumExecutor(
butler,
factory,
assumeNoExistingOutputs=True, # Outputs cleared out on success *or* failure
butler=butler,
task_factory=factory,
assume_no_existing_outputs=True, # Outputs cleared out on success *or* failure
raise_on_partial_outputs=True, # Only way to detect that partial outputs happened
)
graph_executor = MPGraphExecutor(
# TODO: re-enable parallel execution once we can log as desired with CliLog or a successor
# (see issues linked from DM-42063)
numProc=1, # Avoid spawning processes, because they bypass our logger
num_proc=1, # Avoid spawning processes, because they bypass our logger
timeout=2_592_000.0, # In practice, timeout is never helpful; set to 30 days.
quantumExecutor=quantum_executor,
quantum_executor=quantum_executor,
)
return graph_executor

Expand Down Expand Up @@ -1297,7 +1298,7 @@ def _try_pipelines(self, pipelines, in_collections, data_ids, *, label):
+ in_collections
+ list(self.butler.collections.defaults),
run=output_run)
factory = lsst.ctrl.mpexec.TaskFactory()
factory = lsst.pipe.base.TaskFactory()
executor = SeparablePipelineExecutor(
exec_butler,
clobber_output=False,
Expand Down
1 change: 0 additions & 1 deletion ups/prompt_processing.table
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ setupRequired(obs_lsst)
# Used by middleware_interface
setupRequired(analysis_tools)
setupRequired(daf_butler)
setupRequired(ctrl_mpexec)
setupRequired(geom)
setupRequired(meas_algorithms)
setupRequired(obs_base)
Expand Down