Changed configurations a bit

Author: Thomas

pySDC/projects/GPU/analysis_scripts/parallel_scaling.py

@@ -18,6 +18,7 @@ class ScalingConfig(object):
     tasks_time = 1
     max_steps_space = None
     max_steps_space_weak = None
+    sbatch_options = []
 
     def __init__(self, space_time_parallel):
         if space_time_parallel in ['False', False]:
@@ -36,9 +37,9 @@ def run_scaling_test(self, strong=True):
         for i in range(max_steps):
             res, procs = self.get_resolution_and_tasks(strong, i)
 
-            sbatch_options = [f'-n {np.prod(procs)}', f'-p {self.partition}']
+            sbatch_options = [f'-n {np.prod(procs)}', f'-p {self.partition}'] + self.sbatch_options
             if self.useGPU:
-                srun_options = ['--cpus-per-task=4', '--gpus-per-task=1']
+                srun_options = ['--cpus-per-task=4', '--gpus-per-task=1'] + self.sbatch_options
                 sbatch_options += ['--cpus-per-task=4', '--gpus-per-task=1']
             else:
                 srun_options = []
@@ -51,7 +52,7 @@ def run_scaling_test(self, strong=True):
 
             write_jobscript(sbatch_options, srun_options, command, self.cluster)
 
-    def plot_scaling_test(self, strong, ax, plot_ideal=False, **plotting_params):
+    def plot_scaling_test(self, strong, ax, plot_ideal=False, **plotting_params):  # pragma: no cover
         timings = {}
 
         max_steps = self.max_steps_space if strong else self.max_steps_space_weak
@@ -63,12 +64,15 @@ def plot_scaling_test(self, strong, ax, plot_ideal=False, **plotting_params):
             config = get_config(args)
 
             path = f'data/{config.get_path(ranks=[me -1 for me in procs])}-stats-whole-run.pickle'
-            with open(path, 'rb') as file:
-                stats = pickle.load(file)
+            try:
+                with open(path, 'rb') as file:
+                    stats = pickle.load(file)
 
-            timing_step = get_sorted(stats, type='timing_step')
+                timing_step = get_sorted(stats, type='timing_step')
 
-            timings[np.prod(procs) / self.tasks_per_node] = np.mean([me[1] for me in timing_step])
+                timings[np.prod(procs) / self.tasks_per_node] = np.mean([me[1] for me in timing_step])
+            except FileNotFoundError:
+                pass
 
         ax.loglog(timings.keys(), timings.values(), **plotting_params)
         if plot_ideal:
@@ -86,7 +90,8 @@ def plot_scaling_test(self, strong, ax, plot_ideal=False, **plotting_params):
 class CPUConfig(ScalingConfig):
     cluster = 'jusuf'
     partition = 'batch'
-    tasks_per_node = 128
+    tasks_per_node = 16
+    sbatch_options = ['--tasks-per-node=16']
 
 
 class GPUConfig(ScalingConfig):
@@ -97,7 +102,7 @@ class GPUConfig(ScalingConfig):
 
 
 class GrayScottSpaceScalingCPU(CPUConfig, ScalingConfig):
-    base_resolution = 2048
+    base_resolution = 4096
     base_resolution_weak = 256
     config = 'GS_scaling'
     max_steps_space = 10
@@ -106,15 +111,15 @@ class GrayScottSpaceScalingCPU(CPUConfig, ScalingConfig):
 
 
 class GrayScottSpaceScalingGPU(GPUConfig, ScalingConfig):
-    base_resolution_weak = 256 * 32
-    base_resolution = 2048
+    base_resolution_weak = 256 * 2
+    base_resolution = 4096
     config = 'GS_scaling'
-    max_steps_space = 4
+    max_steps_space = 6
     max_steps_space_weak = 4
     tasks_time = 3
 
 
-def plot_scalings(strong, problem, kwargs):
+def plot_scalings(strong, problem, kwargs):  # pragma: no cover
     if problem == 'GS':
         fig, ax = plt.subplots()
 

pySDC/projects/GPU/configs/GS_configs.py

@@ -144,6 +144,10 @@ def get_description(self, *args, res=-1, **kwargs):
 
 
 class GrayScott_dt_adaptivity(GrayScott):
+    """
+    Configuration with dt adaptivity added to base configuration
+    """
+
     def get_description(self, *args, **kwargs):
         from pySDC.implementations.convergence_controller_classes.adaptivity import Adaptivity
 
@@ -153,6 +157,10 @@ def get_description(self, *args, **kwargs):
 
 
 class GrayScott_GoL(GrayScott):
+    '''
+    This configuration shows gliders that are similar in complexity to Conway's Game of life.
+    '''
+
     num_frames = 400
     res_per_blob = 2**8
 
@@ -171,7 +179,7 @@ class GrayScott_USkate(GrayScott):
     See arXiv:1501.01990 or http://www.mrob.com/sci/papers/2009smp-figs/index.html
     '''
 
-    num_frames = 200
+    num_frames = 400
     res_per_blob = 2**7
 
     def get_description(self, *args, **kwargs):
@@ -183,7 +191,7 @@ def get_description(self, *args, **kwargs):
         desc['problem_params']['Du'] = 2e-5
         desc['problem_params']['Dv'] = 1e-5
         desc['convergence_controllers'][Adaptivity] = {'e_tol': 1e-3}
-        self.Tend = 100000
+        self.Tend = 200000
         return desc
 
 
@@ -193,7 +201,7 @@ def get_description(self, *args, **kwargs):
         desc['problem_params']['L'] = 2
         desc['problem_params']['num_blobs'] = 4
         desc['sweeper_params']['skip_residual_computation'] = ('IT_CHECK', 'IT_DOWN', 'IT_UP', 'IT_FINE', 'IT_COARSE')
-        self.Tend = 100 * desc['level_params']['dt']
+        self.Tend = 50 * desc['level_params']['dt']
         return desc
 
     def get_controller_params(self, *args, **kwargs):

pySDC/projects/GPU/etc/generate_jobscript.py

@@ -4,6 +4,9 @@
 
 
 def generate_directories():
+    '''
+    Initialize directories for jobscripts and slurm output
+    '''
     import os
 
     for name in ['jobscripts', 'slurm-out']:
@@ -12,6 +15,18 @@ def generate_directories():
 
 
 def get_jobscript_text(sbatch_options, srun_options, command, cluster):
+    """
+    Generate the text for a jobscript
+
+    Args:
+        sbatch_options (list): List of options for sbatch
+        srun_options (list): Options for the srun command
+        command (str): python (!) command. Will be prefaced by `python <path>/`
+        cluster (str): Name of the cluster you want to run on
+
+    Returns:
+        str: Content of jobscript
+    """
     msg = '#!/usr/bin/bash\n\n'
     for op in DEFAULT_SBATCH_OPTIONS + sbatch_options:
         msg += f'#SBATCH {op}\n'
@@ -27,6 +42,16 @@ def get_jobscript_text(sbatch_options, srun_options, command, cluster):
 
 
 def write_jobscript(sbatch_options, srun_options, command, cluster, submit=True):
+    """
+    Generate a jobscript.
+
+    Args:
+        sbatch_options (list): List of options for sbatch
+        srun_options (list): Options for the srun command
+        command (str): python (!) command. Will be prefaced by `python <path>/`
+        cluster (str): Name of the cluster you want to run on
+        submit (bool): If yes, the script will be submitted to SLURM after it is written
+    """
     generate_directories()
 
     text = get_jobscript_text(sbatch_options, srun_options, command, cluster)
@@ -39,10 +64,3 @@ def write_jobscript(sbatch_options, srun_options, command, cluster, submit=True)
         import os
 
         os.system(f'sbatch {path}')
-
-
-if __name__ == '__main__':
-    sbatch_options = ['--nodes=1']
-    srun_options = []
-    command = 'run_problems.py'
-    write_jobscript(sbatch_options, srun_options, command, 'jusuf')