From 5bb21884f670ac4e2b19fed5c7ae7caf64691687 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Tue, 9 Dec 2025 15:51:03 +0000 Subject: [PATCH 1/2] fix empty nodelist in ondemand apps (reqd. when using topology) --- environments/common/inventory/group_vars/all/openondemand.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/environments/common/inventory/group_vars/all/openondemand.yml b/environments/common/inventory/group_vars/all/openondemand.yml index 4337e0d89..1191250d9 100644 --- a/environments/common/inventory/group_vars/all/openondemand.yml +++ b/environments/common/inventory/group_vars/all/openondemand.yml @@ -158,7 +158,9 @@ openondemand_apps_desktop_default: native: - <%= "--nodes=1" %> - <%= "--ntasks=#{num_cores}" %> + <% if node != '' %> - <%= "--nodelist=#{node}" %> + <% end %> <% if gres != 'none' %> - <%= "--gres=#{gres}:#{gres_count}" %> <% end %> @@ -218,7 +220,9 @@ openondemand_apps_jupyter_default: native: - <%= "--nodes=1" %> - <%= "--ntasks=#{num_cores}" %> + <% if node != '' %> - <%= "--nodelist=#{node}" %> + <% end %> <% if gres != 'none' %> - <%= "--gres=#{gres}:#{gres_count}" %> <% end %> From 6561ee984fc594184bb5c63435531092cb15c20d Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Tue, 9 Dec 2025 15:55:54 +0000 Subject: [PATCH 2/2] enable topology in CI --- environments/.stackhpc/inventory/extra_groups | 3 +++ 1 file changed, 3 insertions(+) diff --git a/environments/.stackhpc/inventory/extra_groups b/environments/.stackhpc/inventory/extra_groups index 0d7fb53b5..b6cb02651 100644 --- a/environments/.stackhpc/inventory/extra_groups +++ b/environments/.stackhpc/inventory/extra_groups @@ -40,3 +40,6 @@ cluster [compute_init:children] compute + +[topology:children] +compute