Merge branch '98-switch-plotting-jobs-to-run-locally' into 'master'

Resolve "Switch plotting jobs to run locally"

Closes #98

See merge request !117

bilby_pipe/gracedb.py

@@ -172,6 +172,7 @@ def create_config_file(candidate, gracedb, outdir, roq=True):
         sampler_kwargs="{nlive: 1000, walks: 100, check_point_plot=True, n_check_point: 5000}",
         create_plots=True,
         local_generation=True,
+        local_plot=True,
         transfer_files=False,
         time_marginalization=True,
         distance_marginalization=True,

bilby_pipe/main.py

@@ -92,6 +92,7 @@ class MainInput(Input):
 
         self.run_local = args.local
         self.local_generation = args.local_generation
+        self.local_plot = args.local_plot
 
         self.gps_file = args.gps_file
         self.trigger_time = args.trigger_time
@@ -768,6 +769,11 @@ class Dag(object):
 
     def create_plot_jobs(self):
 
+        if self.inputs.local_plot:
+            universe = "local"
+        else:
+            universe = self.universe
+
         if self.merged_runs:
             files = [self.merged_runs_result_file]
             parent_jobs = [self.merged_runs_job]
@@ -796,9 +802,9 @@ class Dag(object):
                 name=job_name,
                 executable=shutil.which("bilby_pipe_plot"),
                 submit=self.inputs.submit_directory,
-                request_memory="32 GB",
+                request_memory="16 GB",
                 getenv=self.getenv,
-                universe=self.universe,
+                universe=universe,
                 initialdir=self.initialdir,
                 notification=self.notification,
                 requirements=self.requirements,

bilby_pipe/parser.py

@@ -266,6 +266,10 @@ def create_parser(top_level=True):
             "data generation job locally."
         ),
     )
+    submission_parser.add(
+        "--local-plot", action="store_true", help="Run the plot job locally"
+    )
+
     submission_parser.add("--outdir", type=str, default=".", help="Output directory")
     parser.add(
         "--periodic-restart-time",

tests/dag_test.py

@@ -32,6 +32,7 @@ class TestDag(unittest.TestCase):
             email="test@test.com",
             existing_dir=None,
             local_generation=False,
+            local_plot=False,
             trigger_time=0,
             deltaT=0.2,
             waveform_approximant="IMRPhenomPV2",