[oar_resources_add] Remove the cpuset-prefix code, useless finally + fix man for gpudevice-prefix

Author: npf

sources/core/man/man8/oar_resources_add.pod

@@ -90,6 +90,10 @@ Or, given the RR value, try to match a round-robin distribution of the core ids,
 
 # of gpudevices on host (mainly useful for development purposes when one wants to emulate more GPUs than systems really have).
 
+=item B<--gpudevice-prefix> <str>
+
+Path prefix to use for the path of the device file of the GPU (e.g.: /dev/nvidia).
+
 =item B<--gputopo> <list>
 
 Provide the topology for the CPUs/GPUs affinity (see hwloc), given a ordered list of the Linux GPU device ids.

sources/core/tools/oar_resources_add

@@ -6,8 +6,6 @@ CORES=4
 THREADS=1
 GPUS=
 HOST_PREFIX="node-"
-CPUSET_PREFIX=
-NO_CPUSET_PREFIX=
 YAML=
 CREATE_PROPERTIES=1
 USE_THREADS=
@@ -41,12 +39,10 @@ Options:
     --cpusets <#>               # of cpusets/host (useful for fake setups only)
     --cputopo <list|RR>         topology of the cpus: ordered list of the cpuset ids or RR for round robin
     --gpudevices <#>            # of gpu devices/host (useful for fake setups only)
-    --gpudevices-prefix  <str>  path prefix to use for the GPU device (e.g.: /dev/nvidia)
+    --gpudevice-prefix  <str>   path prefix to use for the GPU device (e.g.: /dev/nvidia)
     --gputopo <list>            topology of the gpus: ordered list of the gpudevice ids
     --host-prefix <str>         hostname prefix (default: "node-")
     --host-suffix <str>         hostname suffix (e.g. ".domain")
-    --cpuset-prefix <str>       use a custom cpuset resource prefix instead of node: (or pu: if threads)
-    --no-cpuset-prefix          no cpuset resource prefix, just a number
     -a, --auto-offset           guess next host/cpu/core/thread/gpu ids
     -p, --no-create-properties  do not generate oarproperty commands
     -A, --append <str>          append a text string (extra properties)
@@ -71,7 +67,7 @@ debug() {
   [ -n "$DEBUG" ] && echo "DEBUG: $@" 1>&2
 }
 
-LONG_OPTS="hosts:,cpus:,cores:,threads:,gpus:,host-prefix:,host-suffix:,cpuset-prefix:,gpudevice-prefix:,host0:,cpu0:,core0:,thread0:,gpu0:,cpuset:,cpusets:,cputopo:,gpudevices:,gputopo:,append:,use-threads,write-to:,auto-offset,yaml,no-create-properties,repair,no-cpuset-prefix,help,debug"
+LONG_OPTS="hosts:,cpus:,cores:,threads:,gpus:,host-prefix:,host-suffix:,gpudevice-prefix:,host0:,cpu0:,core0:,thread0:,gpu0:,cpuset:,cpusets:,cputopo:,gpudevices:,gputopo:,append:,use-threads,write-to:,auto-offset,yaml,no-create-properties,repair,help,debug"
 SHORT_OPTS="H:C:c:t:g:P:S:A:o:TRaYph"
 args=$(getopt -l $LONG_OPTS -o $SHORT_OPTS -q -- "$@")
 [ $? -gt 0 ] && die "Syntax error, $(getopt -l $LONG_OPTS -o $SHORT_OPTS -Q -- "$@" 2>&1)."
@@ -113,13 +109,6 @@ while [ $# -ge 1 ]; do
     HOST_SUFFIX=$2
     shift
     ;;
-  --cpuset-prefix)
-    CPUSET_PREFIX=$2
-    shift
-    ;;
-  --no-cpuset-prefix)
-    NO_CPUSET_PREFIX=1
-    ;;
   --gpudevice-prefix)
     GPUDEVICE_PREFIX=$2
     shift
@@ -221,14 +210,6 @@ debug "GPUS=$GPUS"
 CPUSETS=${CPUSETS:-$((CPUS*CORES*THREADS))}
 debug "CPUSETS=$CPUSETS"
 
-if [ -z "$NO_CPUSET_PREFIX" -a -z "$CPUSET_PREFIX" ]; then
-    if [ -n "$USE_THREADS" ]; then
-        CPUSET_PREFIX="pu:"
-    else
-        CPUSET_PREFIX="core:"
-    fi
-fi
-
 declare -a CPUTOPO
 if [ -n "$CPUTOPO" ]; then
   if [ "$CPUTOPO" == "RR" ]; then
@@ -345,7 +326,7 @@ fi
 
 while [ $host -le $HOSTS ]; do
   debug "Host loop $host <= $HOSTS"
-  hostname="'$HOST_PREFIX$((host+HOST0-1))$HOST_SUFFIX'"
+  hostname="$HOST_PREFIX$((host+HOST0-1))$HOST_SUFFIX"
   cpuset=0
   gpudevice=0
   while [ $cpu -lt $((CPUS*host)) ]; do
@@ -385,15 +366,15 @@ EOF
           else
             if [ -z "$DO_REPAIR" ]; then
               if [ -z "$USE_THREADS" ]; then
-                echo "oarnodesetting -a -h $hostname -p host=$hostname -p cpu=$((cpu+CPU0)) -p core=$((core+CORE0)) -p cpuset=$CPUSET_PREFIX${CPUTOPO[$cpuset]} ${DO_GPUS:+-p gpu=$((gpu+GPU0)) -p gpudevice=$GPUDEVICE_PREFIX${GPUTOPO[$gpudevice]} }$APPEND"
+                echo "oarnodesetting -a -h $hostname -p host=$hostname -p cpu=$((cpu+CPU0)) -p core=$((core+CORE0)) -p cpuset=${CPUTOPO[$cpuset]} ${DO_GPUS:+-p gpu=$((gpu+GPU0)) -p gpudevice=$GPUDEVICE_PREFIX${GPUTOPO[$gpudevice]} }$APPEND"
               else
-                echo "oarnodesetting -a -h $hostname -p host=$hostname -p cpu=$((cpu+CPU0)) -p core=$((core+CORE0)) -p thread=$((thread+THREAD0)) -p cpuset=$CPUSET_PREFIX${CPUTOPO[$cpuset]} ${DO_GPUS:+-p gpu=$((gpu+GPU0)) -p gpudevice=$GPUDEVICE_PREFIX${GPUTOPO[$gpudevice]} }$APPEND"
+                echo "oarnodesetting -a -h $hostname -p host=$hostname -p cpu=$((cpu+CPU0)) -p core=$((core+CORE0)) -p thread=$((thread+THREAD0)) -p cpuset=${CPUTOPO[$cpuset]} ${DO_GPUS:+-p gpu=$((gpu+GPU0)) -p gpudevice=$GPUDEVICE_PREFIX${GPUTOPO[$gpudevice]} }$APPEND"
               fi
             else
               if [ -z "$USE_THREADS" ]; then
-                echo "oarnodesetting --sql \"network_address = $hostname and cpuset = $CPUSET_PREFIX${CPUTOPO[$cpuset]}\" -p host=$hostname -p cpu=$((cpu+CPU0)) -p core=$((core+CORE0)) ${DO_GPUS:+-p gpu=$((gpu+GPU0)) -p gpudevice=$GPUDEVICE_PREFIX${GPUTOPO[$gpudevice]} }$APPEND"
+                echo "oarnodesetting --sql \"network_address = '$hostname' and cpuset = '${CPUTOPO[$cpuset]}'\" -p host=$hostname -p cpu=$((cpu+CPU0)) -p core=$((core+CORE0)) ${DO_GPUS:+-p gpu=$((gpu+GPU0)) -p gpudevice=$GPUDEVICE_PREFIX${GPUTOPO[$gpudevice]} }$APPEND"
               else
-                echo "oarnodesetting --sql \"network_address = $hostname and cpuset = $CPUSET_PREFIX${CPUTOPO[$cpuset]}\" -p host=$hostname -p cpu=$((cpu+CPU0)) -p core=$((core+CORE0)) -p thread=$((thread+THREAD0)) ${DO_GPUS:+-p gpu=$((gpu+GPU0)) -p gpudevice=$GPUDEVICE_PREFIX${GPUTOPO[$gpudevice]} }$APPEND"
+                echo "oarnodesetting --sql \"network_address = '$hostname' and cpuset = '${CPUTOPO[$cpuset]}'\" -p host=$hostname -p cpu=$((cpu+CPU0)) -p core=$((core+CORE0)) -p thread=$((thread+THREAD0)) ${DO_GPUS:+-p gpu=$((gpu+GPU0)) -p gpudevice=$GPUDEVICE_PREFIX${GPUTOPO[$gpudevice]} }$APPEND"
               fi
             fi
           fi