From 3c034a63249b94b07449407ad5c4f4115a1ef974 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Mon, 3 Jan 2022 17:05:10 -0500 Subject: [PATCH] 18324: Adding BsubCUDAArguments WIP Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- lib/config/config.default.yml | 6 ++++++ lib/config/generated_config.go | 6 ++++++ sdk/go/arvados/config.go | 1 + 3 files changed, 13 insertions(+) diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml index fe9645982b..002acd03aa 100644 --- a/lib/config/config.default.yml +++ b/lib/config/config.default.yml @@ -1089,6 +1089,7 @@ Clusters: # %C number of VCPUs # %M memory in MB # %T tmp in MB + # %G number of GPU devices (runtime_constraints.cuda.device_count) # # Use %% to express a literal %. The %%J in the default will be changed # to %J, which is interpreted by bsub itself. @@ -1099,6 +1100,11 @@ Clusters: # from /tmp, or adjust the "-o" and "-e" arguments accordingly. BsubArgumentsList: ["-o", "/tmp/crunch-run.%%J.out", "-e", "/tmp/crunch-run.%%J.err", "-J", "%U", "-n", "%C", "-D", "%MMB", "-R", "rusage[mem=%MMB:tmp=%TMB] span[hosts=1]", "-R", "select[mem>=%MMB]", "-R", "select[tmp>=%TMB]", "-R", "select[ncpus>=%C]"] + # Arguments that will be appended to the bsub command line + # when submitting Arvados containers as LSF jobs with + # runtime_constraints.cuda.device_count > 0 + BsubCUDAArguments: ["-gpu", "num=%G"] + # Use sudo to switch to this user account when submitting LSF # jobs. # diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go index f19699347f..9983a33b5e 100644 --- a/lib/config/generated_config.go +++ b/lib/config/generated_config.go @@ -1095,6 +1095,7 @@ Clusters: # %C number of VCPUs # %M memory in MB # %T tmp in MB + # %G number of GPU devices (runtime_constraints.cuda.device_count) # # Use %% to express a literal %. The %%J in the default will be changed # to %J, which is interpreted by bsub itself. @@ -1105,6 +1106,11 @@ Clusters: # from /tmp, or adjust the "-o" and "-e" arguments accordingly. BsubArgumentsList: ["-o", "/tmp/crunch-run.%%J.out", "-e", "/tmp/crunch-run.%%J.err", "-J", "%U", "-n", "%C", "-D", "%MMB", "-R", "rusage[mem=%MMB:tmp=%TMB] span[hosts=1]", "-R", "select[mem>=%MMB]", "-R", "select[tmp>=%TMB]", "-R", "select[ncpus>=%C]"] + # Arguments that will be appended to the bsub command line + # when submitting Arvados containers as LSF jobs with + # runtime_constraints.cuda.device_count > 0 + BsubCUDAArguments: ["-gpu", "num=%G"] + # Use sudo to switch to this user account when submitting LSF # jobs. # diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go index b111893068..e367c9202c 100644 --- a/sdk/go/arvados/config.go +++ b/sdk/go/arvados/config.go @@ -486,6 +486,7 @@ type ContainersConfig struct { LSF struct { BsubSudoUser string BsubArgumentsList []string + BsubCUDAArguments []string } } -- 2.30.2