diff --git a/ood/combined_desktop/form.yml.erb b/ood/combined_desktop/form.yml.erb index 2c446e08..d4e85545 100644 --- a/ood/combined_desktop/form.yml.erb +++ b/ood/combined_desktop/form.yml.erb @@ -14,9 +14,7 @@ cluster: "m3cluster" submit: submit.yml.erb form: -<%- if CheckAccounts.Accounts.length() > 1 -%> - slurm_accounts -<%- end -%> - custom_queues - desktop_os - desktop_env @@ -29,19 +27,19 @@ form: - email_on_start attributes: -<%- if CheckAccounts.Accounts.length() > 1 -%> slurm_accounts: widget: select label: "Slurm Account" help: | - Select a Slurm account. By default all users have a default "smu" account. - You may have other accounts, e.g. to access course specific material or - special allocations. + Select a Slurm account. + Slurm accounts grant to access allocations and/or course specific material. + **Important:** beginning on November 1, 2024. The Slurm account *smu* will + be disabled. Only Slurm accounts allocated with [ColdFront] will be usable. + [ColdFront]: https://hpcaccess.smu.edu options: <%- CheckAccounts.Accounts.each do |q| -%> - [ "<%= q %>", "<%= q %>" ] <%- end -%> -<%- end -%> custom_queues: label: "Partition" widget: select diff --git a/ood/jupyterlab/CheckAccounts.rb b/ood/jupyterlab/CheckAccounts.rb new file mode 120000 index 00000000..402c90ae --- /dev/null +++ b/ood/jupyterlab/CheckAccounts.rb @@ -0,0 +1 @@ +../common/CheckAccounts.rb \ No newline at end of file diff --git a/ood/jupyterlab/form.yml.erb b/ood/jupyterlab/form.yml.erb index 7503a61e..c5073439 100644 --- a/ood/jupyterlab/form.yml.erb +++ b/ood/jupyterlab/form.yml.erb @@ -7,11 +7,15 @@ require_relative "CheckQueues" # find user conda environments require_relative "CustomEnvironments" +# find slurm accounts +require_relative "CheckAccounts" + -%> --- cluster: "m3cluster" form: + - slurm_accounts - custom_queues - python_version - build_environment @@ -28,6 +32,19 @@ form: # Define attribute values that aren't meant to be modified by the user within # the Dashboard form attributes: + slurm_accounts: + widget: select + label: "Slurm Account" + help: | + Select a Slurm account. + Slurm accounts grant to access allocations and/or course specific material. + **Important:** beginning on November 1, 2024. The Slurm account *smu* will + be disabled. Only Slurm accounts allocated with [ColdFront] will be usable. + [ColdFront]: https://hpcaccess.smu.edu + options: + <%- CheckAccounts.Accounts.each do |q| -%> + - [ "<%= q %>", "<%= q %>" ] + <%- end -%> custom_queues: label: "Partition" widget: select diff --git a/ood/jupyterlab/submit.yml.erb b/ood/jupyterlab/submit.yml.erb index e4dc3c1e..d36cfe47 100644 --- a/ood/jupyterlab/submit.yml.erb +++ b/ood/jupyterlab/submit.yml.erb @@ -46,3 +46,7 @@ script: - "--mail-type" - "BEGIN" <%- end -%> + <%- if defined?slurm_accounts -%> + - "-A" + - "<%= slurm_accounts %>" + <%- end -%> diff --git a/ood/rstudio/form.yml.erb b/ood/rstudio/form.yml.erb index 9bde71b6..02381f50 100644 --- a/ood/rstudio/form.yml.erb +++ b/ood/rstudio/form.yml.erb @@ -10,9 +10,7 @@ require_relative "CheckAccounts" --- cluster: "m3cluster" form: -<%- if CheckAccounts.Accounts.length() > 1 -%> - slurm_accounts -<%- end -%> - r_module - environment - custom_queues @@ -23,19 +21,19 @@ form: - bc_num_gpus - email_on_start attributes: -<%- if CheckAccounts.Accounts.length() > 1 -%> slurm_accounts: widget: select label: "Slurm Account" help: | - Select a Slurm account. By default all users have a default "smu" account. - You may have other accounts, e.g. to access course specific material or - special allocations. + Select a Slurm account. + Slurm accounts grant to access allocations and/or course specific material. + **Important:** beginning on November 1, 2024. The Slurm account *smu* will + be disabled. Only Slurm accounts allocated with [ColdFront] will be usable. + [ColdFront]: https://hpcaccess.smu.edu options: <%- CheckAccounts.Accounts.each do |q| -%> - [ "<%= q %>", "<%= q %>" ] <%- end -%> -<%- end -%> r_module: widget: select label: "R Version" diff --git a/ood/rstudio/submit.yml.erb b/ood/rstudio/submit.yml.erb index 85bc8090..cdec7688 100644 --- a/ood/rstudio/submit.yml.erb +++ b/ood/rstudio/submit.yml.erb @@ -22,3 +22,7 @@ script: - "--mail-type" - "BEGIN" <%- end -%> + <%- if defined?slurm_accounts -%> + - "-A" + - "<%= slurm_accounts %>" + <%- end -%>