From 4114403de1dbad0dcb49695059f191b16727c849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9l=C3=A8ne=20Polv=C3=A8che=20=28=20CECS/I-Stem=20=29?= <99477756+helenepolveche@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:17:01 +0100 Subject: [PATCH 1/5] psmn.config : delete Lake-Flix --- conf/psmn.config | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/psmn.config b/conf/psmn.config index 47cd5d148..72942e375 100644 --- a/conf/psmn.config +++ b/conf/psmn.config @@ -14,32 +14,32 @@ charliecloud { process { executor = 'slurm' - clusterOptions = "--partition=E5,Lake,Lake-flix" + clusterOptions = "--partition=E5,Lake" cpus = 1 memory = 32.GB time = 24.h withLabel: 'process_single|process_single_thread|sc_tiny|sc_small|sc_medium' { - clusterOptions = "--partition=E5,Lake,Lake-flix" + clusterOptions = "--partition=E5,Lake" cpus = 1 memory = 114.GB time = 24.h } withLabel:'process_low|mc_small|process_very_low' { - clusterOptions = "--partition=E5,Lake,Lake-flix" + clusterOptions = "--partition=E5,Lake" cpus = 16 memory = 90.GB time = 24.h } withLabel:'process_medium|mc_medium' { - clusterOptions = "--partition=Lake,Lake-flix" + clusterOptions = "--partition=Lake" cpus = 32 memory = 180.GB time = 48.h } withLabel:'process_high|mc_large|mc_huge|process_high_cpus|cpus_max' { - clusterOptions = "--partition=Lake,Lake-flix" + clusterOptions = "--partition=Lake" cpus = 32 memory = 370.GB time = 48.h @@ -49,7 +49,7 @@ process { time = 96.h } withLabel: 'process_high_memory|memory_max' { - clusterOptions = "--partition=Lake,Lake-flix" + clusterOptions = "--partition=Lake" memory = 370.GB } withLabel: gpu { From cdcfc1d2fe81d41457800c2c0c8ae77bbc8ddb53 Mon Sep 17 00:00:00 2001 From: Laurent Modolo Date: Tue, 5 Nov 2024 10:01:41 +0100 Subject: [PATCH 2/5] psmn.config: update slurm partition information --- conf/psmn.config | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/psmn.config b/conf/psmn.config index 72942e375..d6743f9ee 100644 --- a/conf/psmn.config +++ b/conf/psmn.config @@ -21,15 +21,15 @@ process { time = 24.h withLabel: 'process_single|process_single_thread|sc_tiny|sc_small|sc_medium' { - clusterOptions = "--partition=E5,Lake" + clusterOptions = "--partition=Lake" cpus = 1 - memory = 114.GB + memory = 96.GB time = 24.h } withLabel:'process_low|mc_small|process_very_low' { - clusterOptions = "--partition=E5,Lake" + clusterOptions = "--partition=Lake" cpus = 16 - memory = 90.GB + memory = 80.GB time = 24.h } withLabel:'process_medium|mc_medium' { @@ -49,8 +49,8 @@ process { time = 96.h } withLabel: 'process_high_memory|memory_max' { - clusterOptions = "--partition=Lake" - memory = 370.GB + clusterOptions = "--partition=Epyc" + memory = 500.GB } withLabel: gpu { clusterOptions = "--partition=E5-GPU" From fddf2571ab1955c49428cf691e539c055a89aef9 Mon Sep 17 00:00:00 2001 From: Laurent Modolo Date: Tue, 5 Nov 2024 10:09:07 +0100 Subject: [PATCH 3/5] psmn.config: update number of space for linter --- conf/psmn.config | 80 ++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/conf/psmn.config b/conf/psmn.config index 5fb6c5f4c..9fc044653 100644 --- a/conf/psmn.config +++ b/conf/psmn.config @@ -13,48 +13,48 @@ charliecloud { } process { - executor = 'slurm' - clusterOptions = "--partition=E5,Lake" + executor = 'slurm' + clusterOptions = "--partition=E5,Lake" - cpus = 1 - memory = 32.GB - time = 24.h + cpus = 1 + memory = 32.GB + time = 24.h - withLabel: 'process_single|process_single_thread|sc_tiny|sc_small|sc_medium' { - clusterOptions = "--partition=Lake" - cpus = 1 - memory = 96.GB - time = 24.h - } - withLabel:'process_low|mc_small|process_very_low' { - clusterOptions = "--partition=Lake" - cpus = 16 - memory = 80.GB - time = 24.h - } - withLabel:'process_medium|mc_medium' { - clusterOptions = "--partition=Lake" - cpus = 32 - memory = 180.GB - time = 48.h - } - withLabel:'process_high|mc_large|mc_huge|process_high_cpus|cpus_max' { - clusterOptions = "--partition=Lake" - cpus = 32 - memory = 370.GB - time = 48.h - } - withLabel: 'process_long|process_maximum_time|process_long_parallelized' { - clusterOptions = "--partition=Lake" - time = 96.h - } - withLabel: 'process_high_memory|memory_max' { - clusterOptions = "--partition=Epyc" - memory = 500.GB - } - withLabel: gpu { - clusterOptions = "--partition=E5-GPU" - } + withLabel: 'process_single|process_single_thread|sc_tiny|sc_small|sc_medium' { + clusterOptions = "--partition=Lake" + cpus = 1 + memory = 96.GB + time = 24.h + } + withLabel:'process_low|mc_small|process_very_low' { + clusterOptions = "--partition=Lake" + cpus = 16 + memory = 80.GB + time = 24.h + } + withLabel:'process_medium|mc_medium' { + clusterOptions = "--partition=Lake" + cpus = 32 + memory = 180.GB + time = 48.h + } + withLabel:'process_high|mc_large|mc_huge|process_high_cpus|cpus_max' { + clusterOptions = "--partition=Lake" + cpus = 32 + memory = 370.GB + time = 48.h + } + withLabel: 'process_long|process_maximum_time|process_long_parallelized' { + clusterOptions = "--partition=Lake" + time = 96.h + } + withLabel: 'process_high_memory|memory_max' { + clusterOptions = "--partition=Epyc" + memory = 500.GB + } + withLabel: gpu { + clusterOptions = "--partition=E5-GPU" + } } params { From bdfc3e081a8206435e31ab4cd3f26f27ba2e29fc Mon Sep 17 00:00:00 2001 From: Laurent Modolo Date: Wed, 6 Nov 2024 08:47:04 +0100 Subject: [PATCH 4/5] psmn.config: add back resourceLimits --- conf/psmn.config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/psmn.config b/conf/psmn.config index 9fc044653..d0972f87b 100644 --- a/conf/psmn.config +++ b/conf/psmn.config @@ -13,6 +13,11 @@ charliecloud { } process { + resourceLimits = [ + memory: 370.GB, + cpus: 32, + time: 96.h + ] executor = 'slurm' clusterOptions = "--partition=E5,Lake" From df37bd98968ad0bb9accadae59c44bee01a38ad9 Mon Sep 17 00:00:00 2001 From: Laurent Modolo Date: Wed, 6 Nov 2024 09:05:11 +0100 Subject: [PATCH 5/5] psmn.config: change clusterOption --parition to queue --- conf/psmn.config | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/conf/psmn.config b/conf/psmn.config index d0972f87b..725fff206 100644 --- a/conf/psmn.config +++ b/conf/psmn.config @@ -19,46 +19,46 @@ process { time: 96.h ] executor = 'slurm' - clusterOptions = "--partition=E5,Lake" + queue = "E5,Lake" cpus = 1 memory = 32.GB time = 24.h withLabel: 'process_single|process_single_thread|sc_tiny|sc_small|sc_medium' { - clusterOptions = "--partition=Lake" + queue = "Lake" cpus = 1 memory = 96.GB time = 24.h } - withLabel:'process_low|mc_small|process_very_low' { - clusterOptions = "--partition=Lake" + withLabel: 'process_low|mc_small|process_very_low' { + queue = "Lake" cpus = 16 memory = 80.GB time = 24.h } - withLabel:'process_medium|mc_medium' { - clusterOptions = "--partition=Lake" + withLabel: 'process_medium|mc_medium' { + queue = "Lake" cpus = 32 memory = 180.GB time = 48.h } - withLabel:'process_high|mc_large|mc_huge|process_high_cpus|cpus_max' { - clusterOptions = "--partition=Lake" + withLabel: 'process_high|mc_large|mc_huge|process_high_cpus|cpus_max' { + queue = "Lake" cpus = 32 memory = 370.GB time = 48.h } withLabel: 'process_long|process_maximum_time|process_long_parallelized' { - clusterOptions = "--partition=Lake" + queue = "Lake" time = 96.h } withLabel: 'process_high_memory|memory_max' { - clusterOptions = "--partition=Epyc" + queue = "Epyc" memory = 500.GB } withLabel: gpu { - clusterOptions = "--partition=E5-GPU" + queue = "E5-GPU" } }