Add perhost opt for mpi execs (#517)

* Add perhost opt for mpi execs

* fix attempt to get perhost from config

* show perhost in log

* Update src/swell/utilities/run_jedi_executables.py

Co-authored-by: Alexey Shiklomanov <alexey.shiklomanov@gmail.com>

* Update src/swell/tasks/run_jedi_variational_executable.py

Co-authored-by: Alexey Shiklomanov <alexey.shiklomanov@gmail.com>

* Update src/swell/utilities/run_jedi_executables.py

Co-authored-by: Alexey Shiklomanov <alexey.shiklomanov@gmail.com>

* compilation fix

---------

Co-authored-by: Alexey Shiklomanov <alexey.shiklomanov@gmail.com>

Author: rtodling

src/swell/tasks/run_jedi_variational_executable.py

@@ -38,6 +38,7 @@ def execute(self) -> None:
         observations = self.config.observations()
         jedi_forecast_model = self.config.jedi_forecast_model(None)
         generate_yaml_and_exit = self.config.generate_yaml_and_exit(False)
+        perhost = self.config.perhost(None)
 
         # Set the observing system records path
         self.jedi_rendering.set_obs_records_path(self.config.observing_system_records_path(None))
@@ -163,7 +164,7 @@ def dict_to_ordereddict(d):
         if not generate_yaml_and_exit:
             self.logger.info('Running '+jedi_executable_path+' with '+str(np)+' processors.')
             run_executable(self.logger, self.cycle_dir(), np, jedi_executable_path,
-                           jedi_config_file, output_log_file)
+                           jedi_config_file, output_log_file, perhost)
         else:
             self.logger.info('YAML generated, now exiting.')
 

src/swell/tasks/task_questions.yaml

@@ -825,6 +825,16 @@ path_to_gsi_nc_diags:
   - GetGsiNcdiag
   type: string
 
+perhost:
+  ask_question: true
+  default_value: None
+  models:
+  - geos_atmosphere
+  prompt: What is the number of processors per host?
+  tasks:
+  - RunJediVariationalExecutable
+  type: integer
+
 produce_geovals:
   ask_question: true
   default_value: defer_to_model

src/swell/utilities/render_jedi_interface_files.py

@@ -105,6 +105,7 @@ def __init__(
             'npy_proc',
             'number_of_iterations',
             'packet_ensemble_members',
+            'perhost',
             'skip_ensemble_hofx',
             'swell_static_files',
             'total_processors',

src/swell/utilities/run_jedi_executables.py

@@ -112,14 +112,32 @@ def run_executable(
     np: int,
     jedi_executable_path: str,
     jedi_config_file: str,
-    output_log: str
+    output_log: str,
+    perhost: Optional[int] = None
 ) -> None:
 
     # Run the JEDI executable
     # -----------------------
-    logger.info('Running '+jedi_executable_path+' with '+str(np)+' processors.')
 
-    command = ['mpirun', '-np', str(np), jedi_executable_path, jedi_config_file]
+    if perhost is None:
+        logger.info(f"Running {jedi_executable_path} with {str(np)} processors.")
+        command = [
+            'mpirun',
+            '-np', str(np),
+            jedi_executable_path,
+            jedi_config_file
+        ]
+    else:
+        logger.info(
+            f"Running {jedi_executable_path} with {str(np)} processors & perhost {str(perhost)}"
+        )
+        command = [
+            'mpirun',
+            '-np', str(np),
+            '-perhost', str(perhost),
+            jedi_executable_path,
+            jedi_config_file
+        ]
 
     # Run command
     # -----------