From a347861607210fa8c7b71c418b79a91b97a3eb40 Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Wed, 11 Oct 2023 14:26:29 -0400 Subject: [PATCH] allow cpus to pass through to the CLI (#247) --- apps.awesim.org/apps/bc_desktop/submit/slurm.yml.erb | 4 +--- ondemand.osc.edu/apps/bc_desktop/submit/slurm.yml.erb | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/apps.awesim.org/apps/bc_desktop/submit/slurm.yml.erb b/apps.awesim.org/apps/bc_desktop/submit/slurm.yml.erb index 82488fe..536ad0b 100644 --- a/apps.awesim.org/apps/bc_desktop/submit/slurm.yml.erb +++ b/apps.awesim.org/apps/bc_desktop/submit/slurm.yml.erb @@ -4,9 +4,7 @@ base_slurm_args.concat ["--licenses", "#{licenses}"] unless licenses.empty? def tasks_per_node - # if you request > 1 nodes, it doesn't matter how many cores you request - you get the whole node - # but srun still adheres to how many tasks per node you've requested, not what you _have_. - bc_num_slots.to_i > 1 ? [] : [ "--ntasks-per-node", "#{cores}" ] + [ "--ntasks-per-node", "#{cores}" ] end def any_node diff --git a/ondemand.osc.edu/apps/bc_desktop/submit/slurm.yml.erb b/ondemand.osc.edu/apps/bc_desktop/submit/slurm.yml.erb index 82488fe..536ad0b 100644 --- a/ondemand.osc.edu/apps/bc_desktop/submit/slurm.yml.erb +++ b/ondemand.osc.edu/apps/bc_desktop/submit/slurm.yml.erb @@ -4,9 +4,7 @@ base_slurm_args.concat ["--licenses", "#{licenses}"] unless licenses.empty? def tasks_per_node - # if you request > 1 nodes, it doesn't matter how many cores you request - you get the whole node - # but srun still adheres to how many tasks per node you've requested, not what you _have_. - bc_num_slots.to_i > 1 ? [] : [ "--ntasks-per-node", "#{cores}" ] + [ "--ntasks-per-node", "#{cores}" ] end def any_node