svn commit: r560733 - in head/sysutils/slurm-wlm: . files

[Jason W. Bacon]

Author: jwb
Date: Thu Jan  7 20:32:46 2021
New Revision: 560733
URL: https://svnweb.freebsd.org/changeset/ports/560733

Log:
  sysutils/slurm-wlm: Switch from hwloc to hwloc2
  
  Also minor improvements to example slurm.conf
  
  PR:             252495
  Reported by:    thierry

Modified:
  head/sysutils/slurm-wlm/Makefile
  head/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example

Modified: head/sysutils/slurm-wlm/Makefile
==============================================================================
--- head/sysutils/slurm-wlm/Makefile	Thu Jan  7 20:04:35 2021	(r560732)
+++ head/sysutils/slurm-wlm/Makefile	Thu Jan  7 20:32:46 2021	(r560733)
@@ -2,7 +2,7 @@
 
 PORTNAME=	slurm
 DISTVERSION=	20.02.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils python
 MASTER_SITES=	https://download.schedmd.com/slurm/
 PKGNAMESUFFIX=	-wlm
@@ -64,7 +64,7 @@ HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 			libsz.so:science/szip
 HDF5_CONFIGURE_WITH=	hdf5
 
-HWLOC_LIB_DEPENDS=	libhwloc.so:devel/hwloc
+HWLOC_LIB_DEPENDS=	libhwloc.so.15:devel/hwloc2
 HWLOC_CONFIGURE_WITH=	hwloc
 
 IPMI_LIB_DEPENDS=	libfreeipmi.so:sysutils/freeipmi

Modified: head/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example
==============================================================================
--- head/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example	Thu Jan  7 20:04:35 2021	(r560732)
+++ head/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example	Thu Jan  7 20:32:46 2021	(r560733)
@@ -1,17 +1,18 @@
 --- etc/slurm.conf.example.orig	2020-03-26 21:44:05 UTC
 +++ etc/slurm.conf.example
-@@ -8,8 +8,8 @@
+@@ -8,8 +8,9 @@
  #
  # See the slurm.conf man page for more information.
  #
 -ClusterName=linux
 -ControlMachine=linux0
-+ClusterName=beastie
-+ControlMachine=beastie0
++ClusterName=Beastie
++# Short hostname of the head node
++ControlMachine=head
  #ControlAddr=
  #BackupController=
  #BackupAddr=
-@@ -25,8 +25,8 @@ StateSaveLocation=/var/spool/slurm/ctld
+@@ -25,8 +26,8 @@ StateSaveLocation=/var/spool/slurm/ctld
  SlurmdSpoolDir=/var/spool/slurm/d
  SwitchType=switch/none
  MpiDefault=none
@@ -22,16 +23,16 @@
  ProctrackType=proctrack/pgid
  #PluginDir=
  #FirstJobId=
-@@ -34,7 +34,7 @@ ReturnToService=0
+@@ -34,7 +35,7 @@ ReturnToService=0
  #MaxJobCount=
  #PlugStackConfig=
  #PropagatePrioProcess=
 -#PropagateResourceLimits=
-+PropagateResourceLimits=none
++PropagateResourceLimits=NONE
  #PropagateResourceLimitsExcept=
  #Prolog=
  #Epilog=
-@@ -42,7 +42,9 @@ ReturnToService=0
+@@ -42,7 +43,9 @@ ReturnToService=0
  #SrunEpilog=
  #TaskProlog=
  #TaskEpilog=
@@ -42,7 +43,7 @@
  #TrackWCKey=no
  #TreeWidth=50
  #TmpFS=
-@@ -57,10 +59,11 @@ KillWait=30
+@@ -57,10 +60,11 @@ KillWait=30
  Waittime=0
  #
  # SCHEDULING
@@ -55,7 +56,7 @@
  #PriorityType=priority/multifactor
  #PriorityDecayHalfLife=14-0
  #PriorityUsageResetPeriod=14-0
-@@ -72,22 +75,58 @@ SelectTypeParameters=CR_Core
+@@ -72,22 +76,58 @@ SelectTypeParameters=CR_Core
  #
  # LOGGING
  SlurmctldDebug=info
@@ -115,8 +116,8 @@
 -PartitionName=debug Nodes=ALL Default=YES MaxTime=INFINITE State=UP
 +# Set RealMemory < avail memory in /var/run/dmesg.boot
 +# Note that it may change slightly following freebsd-update
-+# NodeName=compute-[001-032] Sockets=2 CoresPerSocket=6 RealMemory=30000 State=UNKNOWN
++NodeName=compute-[001-002] Sockets=2 CoresPerSocket=6 RealMemory=30000 State=UNKNOWN
 +# NodeName=compute-256g-[001-002] Sockets=2 CoresPerSocket=6 RealMemory=250000 State=UNKNOWN
 +# PartitionName=debug Nodes=ALL Default=NO MaxTime=INFINITE State=UP
-+# PartitionName=batch Nodes=compute-[001-032] Default=YES MaxTime=INFINITE State=UP
++PartitionName=batch Nodes=compute-[001-002] Default=YES MaxTime=INFINITE State=UP
 +# PartitionName=256g Nodes=compute-256g-[001-002] Default=NO MaxTime=INFINITE State=UP