From d6b38cda26c9a1fd6f4986878e724b90ebcb1f97 Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Fri, 4 Oct 2024 16:52:56 -0400 Subject: [PATCH] Fix cardinal (#114) * rename this file * use auto_accounts * hide most node_types for cardinal * add and fix cuda_versions for cardinal --- form.yml.erb => form.yml | 60 ++++++++++++++++++++++++++++++++++++---- submit.yml.erb | 2 -- 2 files changed, 54 insertions(+), 8 deletions(-) rename form.yml.erb => form.yml (83%) diff --git a/form.yml.erb b/form.yml similarity index 83% rename from form.yml.erb rename to form.yml index 34664a7..5b5c06d 100644 --- a/form.yml.erb +++ b/form.yml @@ -1,8 +1,3 @@ -<%- - groups = OodSupport::User.new.groups.sort_by(&:id).tap { |groups| - groups.unshift(groups.delete(OodSupport::Process.group)) - }.map(&:name).grep(/^P./) --%> --- cluster: - "ascend" @@ -13,7 +8,7 @@ cluster: - "kubernetes-dev" - "cardinal" form: - - account + - auto_accounts - mode - bc_num_hours - node_type @@ -62,6 +57,7 @@ attributes: data-option-for-cluster-kubernetes-test: false, data-option-for-cluster-kubernetes-dev: false, data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "cuda/8.0.61", "cuda/8.0.61", @@ -70,58 +66,99 @@ attributes: data-option-for-cluster-kubernetes-test: false, data-option-for-cluster-kubernetes-dev: false, data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "cuda/9.0.176", "cuda/9.0.176", data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "cuda/9.1.85", "cuda/9.1.85", data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "cuda/9.2.88", "cuda/9.2.88", data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "cuda/10.0.130", "cuda/10.0.130", data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "cuda/10.1.168", "cuda/10.1.168", data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "cuda/10.2.89", "cuda/10.2.89", data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "cuda/11.0.3", "cuda/11.0.3", data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "cuda/11.1.1", "cuda/11.1.1", data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "cuda/11.2.2", "cuda/11.2.2", data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "cuda/11.6.1", "cuda/11.6.1", + data-option-for-cluster-cardinal: false, ] - [ "cuda/11.6.2", "cuda/11.6.2", data-option-for-cluster-pitzer: false, data-option-for-cluster-owens: false, + data-option-for-cluster-cardinal: false, ] - [ "cuda/11.7.1", "cuda/11.7.1", data-option-for-cluster-pitzer: false, data-option-for-cluster-owens: false, + data-option-for-cluster-cardinal: false, ] - [ "cuda/11.8.0", "cuda/11.8.0", + data-option-for-cluster-cardinal: false, + ] + - [ + "cuda/12.0.0", "cuda/12.0.0", + data-option-for-cluster-owens: false, + data-option-for-cluster-cardinal: false, + ] + - [ + "cuda/12.3.0", "cuda/12.3.0", + data-option-for-cluster-cardinal: false, + ] + - [ + "cuda/12.3.2", "cuda/12.3.2", + data-option-for-cluster-owens: false, + data-option-for-cluster-pitzer: false, + data-option-for-cluster-ascend: false, + data-option-for-kubernetes: false, + data-option-for-kubernetes-dev: false, + data-option-for-kubernetes-test: false, + ] + - [ + "cuda/12.4.1", "cuda/12.4.1", + data-option-for-cluster-owens: false, + data-option-for-cluster-pitzer: false, + data-option-for-cluster-ascend: false, + data-option-for-kubernetes: false, + data-option-for-kubernetes-dev: false, + data-option-for-kubernetes-test: false, ] node_type: widget: select @@ -171,6 +208,7 @@ attributes: data-option-for-cluster-kubernetes-test: false, data-option-for-cluster-kubernetes-dev: false, data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "48 core", "any-48core", @@ -183,6 +221,7 @@ attributes: data-option-for-cluster-kubernetes-test: false, data-option-for-cluster-kubernetes-dev: false, data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "any gpu", "gpu", @@ -205,6 +244,7 @@ attributes: data-option-for-cluster-kubernetes-test: false, data-option-for-cluster-kubernetes-dev: false, data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "48 core gpu", "gpu-48core", @@ -215,6 +255,7 @@ attributes: data-option-for-cluster-kubernetes-test: false, data-option-for-cluster-kubernetes-dev: false, data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "largemem", "largemem", @@ -227,6 +268,7 @@ attributes: data-option-for-cluster-kubernetes-test: false, data-option-for-cluster-kubernetes-dev: false, data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "hugemem", "hugemem", @@ -240,6 +282,7 @@ attributes: data-option-for-cluster-kubernetes-test: false, data-option-for-cluster-kubernetes-dev: false, data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "debug", "debug", @@ -253,6 +296,7 @@ attributes: data-option-for-cluster-kubernetes-test: false, data-option-for-cluster-kubernetes-dev: false, data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "pitzer", "pitzer", @@ -267,6 +311,7 @@ attributes: data-option-for-cluster-owens: false, data-option-for-cluster-pitzer: false, data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "owens", "owens", @@ -281,6 +326,7 @@ attributes: data-option-for-cluster-owens: false, data-option-for-cluster-pitzer: false, data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "pitzer gpu", "pitzer-gpu", @@ -293,6 +339,7 @@ attributes: data-option-for-cluster-owens: false, data-option-for-cluster-pitzer: false, data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] - [ "owens gpu", "owens-gpu", @@ -305,5 +352,6 @@ attributes: data-option-for-cluster-owens: false, data-option-for-cluster-pitzer: false, data-option-for-cluster-ascend: false, + data-option-for-cluster-cardinal: false, ] classroom: 0 \ No newline at end of file diff --git a/submit.yml.erb b/submit.yml.erb index 8149d9d..e61b502 100644 --- a/submit.yml.erb +++ b/submit.yml.erb @@ -40,7 +40,6 @@ batch_connect: conn_params: - jupyter_api script: - accounting_id: "<%= account %>" <% if node_type =~ /gpu/ -%> gpus_per_node: 1 <% end -%> @@ -70,7 +69,6 @@ script: -%> --- script: - accounting_id: "<%= account %>" wall_time: "<%= bc_num_hours.to_i * 3600 %>" <%- if node_type =~ /gpu/ -%> gpus_per_node: 1