Update readme

Author: jovial

README.md

@@ -48,8 +48,6 @@ each list element:
 
 `openhpc_module_system_install`: Optional, default true. Whether or not to install an environment module system. If true, lmod will be installed. If false, You can either supply your own module system or go without one.
 
-`openhpc_gres_autodetect`: Optional. The [auto detection mechanism](https://slurm.schedmd.com/gres.conf.html#OPT_AutoDetect) to use for the  generic resources. Can be set on individual hosts or groups of hosts using host/group vars. Note: you must still define `gres` dictionary in `openhpc_slurm_partitions`, but you only need the define the `conf` key. 
-
 ### slurm.conf
 
 `openhpc_nodegroups`: Optional, default `[]`. List of mappings, each defining a
@@ -61,6 +59,7 @@ unique set of homogenous nodes:
   `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  generic resources. Note: you must still define the `gres` dictionary (see below) but you only need the define the `conf` key.
   * `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`: Omit 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.

defaults/main.yml

@@ -14,9 +14,6 @@ openhpc_retry_delay: 10
 openhpc_job_maxtime: '60-0' # quote this to avoid ansible converting some formats to seconds, which is interpreted as minutes by Slurm
 openhpc_config: "{{ openhpc_extra_config | default({}) }}"
 openhpc_gres_template: gres.conf.j2
-# Autodetection mechanism to use: https://slurm.schedmd.com/gres.html#AutoDetect e.g nvml.
-# NOTE: 'off' is a special sentinal value to indicate that autodetection should not be used.
-openhpc_gres_autodetect: 'off'
 openhpc_slurm_configless: "{{ 'enable_configless' in openhpc_config.get('SlurmctldParameters', []) }}"
 
 openhpc_state_save_location: /var/spool/slurm

filter_plugins/slurm_conf.py

@@ -15,7 +15,6 @@
 # NB: To test this from the repo root run:
 #   ansible-playbook -i tests/inventory -i tests/inventory-mock-groups tests/filter.yml
 
-from collections import defaultdict
 from ansible import errors
 import jinja2
 import re
@@ -66,16 +65,6 @@ def hostlist_expression(hosts):
             unmatchable.append(v)
     return ['{}[{}]'.format(k, _group_numbers(v)) for k, v in results.items()] + unmatchable
 
-@jinja2.pass_context
-def group_by_gres_autodetect(context, hosts):
-    """ Groups a list of hosts by the gres_autodetect variable
-    """
-    result = defaultdict(list)
-    for host in hosts:
-        gres_autodetect = _get_hostvar(context, 'openhpc_gres_autodetect', inventory_hostname=host) or 'off'
-        result[gres_autodetect].append(host)
-    return result
-
 def _group_numbers(numbers):
     units = []
     ints = [int(n) for n in numbers]
@@ -144,5 +133,4 @@ def filters(self):
             'error': error,
             'dict2parameters': dict2parameters,
             'config2dict': config2dict,
-            'group_by_gres_autodetect': group_by_gres_autodetect,
         }