Skip to content

Commit

Permalink
Merge pull request #8 from lsst/tickets/DM-31848
Browse files Browse the repository at this point in the history
DM-31848: Remove faro steps from ci_imsim_run.py.
  • Loading branch information
jeffcarlin committed Sep 30, 2021
2 parents 82f014a + d593487 commit 59a0deb
Showing 1 changed file with 0 additions and 39 deletions.
39 changes: 0 additions & 39 deletions bin.src/ci_imsim_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
INPUTCOL = f"{INSTRUMENT_NAME}/defaults"
COLLECTION = f"{INSTRUMENT_NAME}/runs/ci_imsim"

QGRAPH_FARO_FILE = "faro.qgraph"
COLLECTION_FARO = f"{INSTRUMENT_NAME}/runs/ci_imsim/faro"

index_command = 0

ciRunner = CommandRunner(os.environ["CI_IMSIM_DIR"])
Expand Down Expand Up @@ -123,42 +120,6 @@ def run(self, currentState: BuildState):
subprocess.run(pipetask, check=True)


@ciRunner.register("qgraph_faro", index_command := index_command + 1)
class QgraphFaroCommand(BaseCommand):
def run(self, currentState: BuildState):
args = (
"--long-log",
"qgraph",
"-d", "skymap='discrete/ci_imsim/4k' AND tract=0 AND patch=24",
"-b", self.runner.RunDir,
"--input", COLLECTION,
"--output", COLLECTION_FARO,
"-p", os.path.join(os.environ["FARO_DIR"], "pipelines", "metrics_pipeline.yaml"),
"--skip-existing",
"--save-qgraph", os.path.join(self.runner.RunDir, QGRAPH_FARO_FILE),
)
pipetask = self.runner.getExecutableCmd("CTRL_MPEXEC_DIR", "pipetask", args)
subprocess.run(pipetask, check=True)


@ciRunner.register("process_faro", index_command := index_command + 1)
class ProcessingFaroCommand(BaseCommand):
def run(self, currentState: BuildState):
args = (
"--long-log",
"run",
"-j", str(self.arguments.num_cores),
"-b", self.runner.RunDir,
"--input", COLLECTION,
"--output", COLLECTION_FARO,
"--register-dataset-types",
"--skip-existing",
"--qgraph", os.path.join(self.runner.RunDir, QGRAPH_FARO_FILE),
)
pipetask = self.runner.getExecutableCmd("CTRL_MPEXEC_DIR", "pipetask", args)
subprocess.run(pipetask, check=True)


ciRunner.register("test", index_command := index_command + 1)(TestRunner)

ciRunner.run()

0 comments on commit 59a0deb

Please sign in to comment.