From owner-svn-ports-head@freebsd.org Thu Jan 7 20:32:47 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6295F4DB1AD; Thu, 7 Jan 2021 20:32:47 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DBdG72NN3z3nfl; Thu, 7 Jan 2021 20:32:47 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 446B4173B2; Thu, 7 Jan 2021 20:32:47 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 107KWlUe015263; Thu, 7 Jan 2021 20:32:47 GMT (envelope-from jwb@FreeBSD.org) Received: (from jwb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 107KWkAi015261; Thu, 7 Jan 2021 20:32:46 GMT (envelope-from jwb@FreeBSD.org) Message-Id: <202101072032.107KWkAi015261@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jwb set sender to jwb@FreeBSD.org using -f From: "Jason W. Bacon" Date: Thu, 7 Jan 2021 20:32:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r560733 - in head/sysutils/slurm-wlm: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jwb X-SVN-Commit-Paths: in head/sysutils/slurm-wlm: . files X-SVN-Commit-Revision: 560733 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2021 20:32:47 -0000 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