Move to separate field as it not possible to autodetect for a subset of gpus

Author: jovial

README.md

@@ -58,10 +58,10 @@ each list element:
   * `extra_nodes`: Optional. A list of additional node definitions, e.g. for nodes in this group/partition not controlled by this role. Each item should be a dict, with keys/values as per the ["NODE CONFIGURATION"](https://slurm.schedmd.com/slurm.conf.html#lbAE) docs for slurm.conf. Note the key `NodeName` must be first.
   * `ram_mb`: Optional.  The physical RAM available in each node of this group ([slurm.conf](https://slurm.schedmd.com/slurm.conf.html) parameter `RealMemory`) in MiB. This is set using ansible facts if not defined, equivalent to `free --mebi` total * `openhpc_ram_multiplier`.
   * `ram_multiplier`: Optional.  An override for the top-level definition `openhpc_ram_multiplier`. Has no effect if `ram_mb` is set.
+  * `gres_autodetect`: Optional. The [auto detection mechanism](https://slurm.schedmd.com/gres.conf.html#OPT_AutoDetect) to use for the resource. 
   * `gres`: Optional. List of dicts defining [generic resources](https://slurm.schedmd.com/gres.html). Each dict should define:
       - `conf`: A string with the [resource specification](https://slurm.schedmd.com/slurm.conf.html#OPT_Gres_1) but requiring the format `<name>:<type>:<number>`, e.g. `gpu:A100:2`. Note the `type` is an arbitrary string.
-      - `file`: Optional if `autodetect` is set, A string with the [File](https://slurm.schedmd.com/gres.conf.html#OPT_File) (path to device(s)) for this resource, e.g. `/dev/nvidia[0-1]` for the above example.
-      - `autodetect`: Optional if `file` is set, The [auto detection mechanism](https://slurm.schedmd.com/gres.conf.html#OPT_AutoDetect) to use for the resource.
+      - `file`: Optional if `gres_autodetect` is set, A string with the [File](https://slurm.schedmd.com/gres.conf.html#OPT_File) (path to device(s)) for this resource, e.g. `/dev/nvidia[0-1]` for the above example.
 
     Note [GresTypes](https://slurm.schedmd.com/slurm.conf.html#OPT_GresTypes) must be set in `openhpc_config` if this is used.
 

templates/gres.conf.j2

@@ -2,15 +2,16 @@ AutoDetect=off
 {% for part in openhpc_slurm_partitions %}
 {%  set nodelist = [] %}
 {%  for group in part.get('groups', [part]) %}
-{%      if 'gres' in group %}
+{%      if 'gres_autodetect' in group %}
+NodeName={{ hostlist }} AutoDetect={{ group.gres_autodetect }}
+{%      elif 'gres' in group %}
 {%          for gres in group.gres %}
 {%              set gres_name, gres_type, _ = gres.conf.split(':') %}
 {%              set group_name = group.cluster_name|default(openhpc_cluster_name) ~ '_' ~ group.name %}
 {%              set file = gres.file | default('') %}
-{%              set autodetect = gres.autodetect | default('') %}
 {%              set inventory_group_hosts = groups.get(group_name, []) %}
 {%              for hostlist in (inventory_group_hosts | hostlist_expression) %}
-NodeName={{ hostlist }} Name={{ gres_name }} Type={{ gres_type }}{% if gres.file is truthy %}  File={{ gres.file }}{% endif %}{% if gres.autodetect is truthy %} AutoDetect={{ gres.autodetect }}{%endif%}
+NodeName={{ hostlist }} Name={{ gres_name }} Type={{ gres_type }} File={{ gres.file }}
 
 {%              endfor %}
 {%          endfor %}