From 02018b04db4d761d923ca2cfcb964053b834aa45 Mon Sep 17 00:00:00 2001 From: dbeltran Date: Wed, 8 Jul 2020 16:14:28 +0200 Subject: [PATCH 1/2] doc updates --- autosubmit/job/job.py | 1 + docs/source/usage/wrappers.rst | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/autosubmit/job/job.py b/autosubmit/job/job.py index 3b9464c83..c5a04763d 100644 --- a/autosubmit/job/job.py +++ b/autosubmit/job/job.py @@ -92,6 +92,7 @@ class Job(object): self.name = name self.split = None self.delay = None + self.frequency = None self.synchronize = None self.repacked = 0 self._long_name = None diff --git a/docs/source/usage/wrappers.rst b/docs/source/usage/wrappers.rst index 319cfe155..876e189fa 100644 --- a/docs/source/usage/wrappers.rst +++ b/docs/source/usage/wrappers.rst @@ -22,7 +22,7 @@ For example: [config] EXPID = .... - AUTOSUBMIT_VERSION = 3.12.0b + AUTOSUBMIT_VERSION = 3.13.1b ... MAXWAITINGJOBS = 100 @@ -49,14 +49,17 @@ Number of jobs in a package TYPE = MIN_WRAPPED = 2 MAX_WRAPPED = 999 + POLICY = flexible #default is flexible. Values: flexible,strict - **MAX_WRAPPED** can be defined in ``jobs_cxxx.conf`` in order to limit the number of jobs wrapped for the corresponding job section - If not defined, it considers the **MAX_WRAPPED** defined under [wrapper] in ``autosubmit_cxxx.conf`` - If **MAX_WRAPPED** is not defined, then **TOTALJOBS** is used by default - - - +- **MIN_WRAPPED** can be defined in ``autosubmit_cxxx.conf`` in order to limit the minimum number of jobs that a wrapper can contain + - If not defined, it considers that **MIN_WRAPPED** is 2. + - If **POLICY** is flexible and it doesn't reach the **MIN_WRAPPED** value, it will submit the a inner job as an independent job. + - If **POLICY** is strict and it doesn't reach the **MIN_WRAPPED** value, The wrapper inner jobs will be blocked until it can contain **MIN_WRAPPED** jobs inside. + -strict policy can cause deadlocks. Wrapper check time @@ -127,13 +130,13 @@ Shared-memory Experiments There is also the possibility of setting the option **METHOD** to SRUN in the wrapper directive (**ONLY** for vertical and vertical-horizontal wrappers). -This allows to use SRUN instead of rely in machinefiles to work in parallel. +This allows to form a wrapper with shared-memory paradigm instead of rely in machinefiles to work in parallel. .. code-block:: ini [wrapper] TYPE = vertical - METHOD = srun + METHOD = srun # default ASTHREAD Hybrid wrapper ========================== -- GitLab From d5eaaf079fe3d72460f645aee88fab6b9ea1822a Mon Sep 17 00:00:00 2001 From: dbeltran Date: Wed, 8 Jul 2020 16:42:13 +0200 Subject: [PATCH 2/2] frequency --- autosubmit/job/job.py | 1 + 1 file changed, 1 insertion(+) diff --git a/autosubmit/job/job.py b/autosubmit/job/job.py index c5a04763d..21b2b310d 100644 --- a/autosubmit/job/job.py +++ b/autosubmit/job/job.py @@ -684,6 +684,7 @@ class Job(object): parameters['CHUNK'] = chunk parameters['SPLIT'] = self.split parameters['DELAY'] = self.delay + parameters['FREQUENCY'] = self.frequency parameters['SYNCHRONIZE'] = self.synchronize parameters['PACKED'] = self.packed total_chunk = int(parameters['NUMCHUNKS']) -- GitLab