Attachment #152287 for bug #196260




# $FreeBSD$

PORTNAME=	slurm
PORTVERSION=	14.11.3
PORTREVISION=	5
CATEGORIES=	sysutils
MASTER_SITES=	http://www.schedmd.com/download/latest/ \
		http://www.schedmd.com/download/archive/ \
		http://www.schedmd.com/download/development/
PKGNAMESUFFIX=	-hpc


MAINTAINER=	jwbacon@tds.net
COMMENT=	Simple Linux Utility for Resource Management

LICENSE=	GPLv2

LIB_DEPENDS=	libsysinfo.so:${PORTSDIR}/devel/libsysinfo \
		libhwloc.so:${PORTSDIR}/devel/hwloc \

		libhdf5.so:${PORTSDIR}/science/hdf5

GNU_CONFIGURE=	yes

USE_LDCONFIG=	yes
USES=		gmake libtool perl5 python tar:bz2

#OPTIONS_DEFINE=DOCS MYSQL PGSQL GTK2
OPTIONS_DEFINE=	DOCS MYSQL GTK2
OPTIONS_SUB=	yes

GTK2_USE=	GNOME=glib20,gtk20
MYSQL_USE=	MYSQL=yes
#PGSQL_USES=	pgsql

GTK2_DESC=	Build GUI config tool sview

USERS=		slurm
GROUPS=		${USERS}

USE_RC_SUBR=	slurmctld slurmd
SUB_FILES+=	slurm.conf

# ${WRKSRC}/slurm is for pty.h in configure
CFLAGS+=	-I${WRKSRC}/slurm -I${LOCALBASE}/include
CFLAGS+=	-I${LOCALBASE}/include -g -O1
LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lkvm

post-install:
	${INSTALL_DATA} ${WRKDIR}/slurm.conf ${STAGEDIR}${PREFIX}/etc/slurm.conf.sample

.include <bsd.port.options.mk>

# SLURM's configure enables interactive jobs if pty.h exists.  Replacing
# #include <pty.h> with appropriate headers will therefore not work, so instead
# add a pty.h for the build.
post-patch:
.if ! ${PORT_OPTIONS:MGTK2}
	@${REINPLACE_CMD} \
	-e 's|min_gtk_version=2.7.1|min_gtk_version=200.7.1|g' \
	${WRKSRC}/configure
.else
# Can't disable configure test, so make it fail
CONFIGURE_ARGS+=--with-mysql_config=/nomysql
.endif
	@${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm
	@${REINPLACE_CMD} \
	-e 's|/usr/bin/env python|${PYTHON_CMD}|g' \
	${WRKSRC}/doc/html/shtml2html.py \
	${WRKSRC}/doc/man/man2html.py

post-stage:
.if ! ${PORT_OPTIONS:MDOCS}
	${RM} -rf ${STAGEDIR}${LOCALBASE}/share/doc/${PORTNAME}-${PORTVERSION}
		lib/slurm/accounting_storage_pgsql.la \
		lib/slurm/accounting_storage_pgsql.so \
		lib/slurm/jobcomp_pgsql.a \
		lib/slurm/jobcomp_pgsql.la \
		lib/slurm/jobcomp_pgsql.so
.else
# Can't disable configure test, so make it fail
CONFIGURE_ARGS+=--with-pg_config=/nopostgres
.endif
	@${CP} ${FILESDIR}/slurm.conf.example ${STAGEDIR}${PREFIX}/etc/

.if ${PORT_OPTIONS:MGTK2}
# Note: Configure could not find pcre when building with no ports
# preinstalled on 9.1-RELEASE.  Worked fine on second try.
USE_GNOME=	glib20 gtk20	# sview
PLIST_FILES+=	bin/sview
.endif

INSTALL_TARGET=	install-strip
# Can't disable configure test, so make it fail
.if ! ${PORT_OPTIONS:MGTK2}
	${REINPLACE_CMD} -e 's|min_gtk_version=2.7.1|min_gtk_version=200.7.1|' \
		${WRKSRC}/configure
.endif
	@${REINPLACE_CMD} \
		-e 's|/usr/bin/env python|${PYTHON_CMD}|g' \
		${WRKSRC}/doc/html/shtml2html.py \
		${WRKSRC}/doc/man/man2html.py

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (slurm-2.6.4.tar.bz2) = f44a9a80c502dba9809127dc2a04069fd7c87d6b1e10824fe254b2077f9adac8	1	SHA256 (slurm-14.11.3.tar.bz2) = ee5b4918c560962db06267066ef07fe07470991aaeedb30bc9cf36f419179e10
2	SIZE (slurm-2.6.4.tar.bz2) = 5954130	2	SIZE (slurm-14.11.3.tar.bz2) = 6352549




--- configure.orig	2013-09-10 16:44:33.000000000 -0500
+++ configure	2013-11-14 10:23:02.000000000 -0600
@@ -21594,12 +21594,9 @@
 main ()
 {
 
-					int main()
-					{
 						MYSQL mysql;
 						(void) mysql_init(&mysql);
 						(void) mysql_close(&mysql);
-					}
 
   ;
   return 0;
@@ -21636,12 +21633,9 @@
 main ()
 {
 
-						int main()
-						{
 							MYSQL mysql;
 							(void) mysql_init(&mysql);
 							(void) mysql_close(&mysql);
-						}
 
   ;
   return 0;
@@ -21803,12 +21797,9 @@
 main ()
 {
 
-				int main()
-       	  			{
 					PGconn     *conn;
 					conn = PQconnectdb("dbname = postgres");
        					(void) PQfinish(conn);
-				}
 
   ;
   return 0;




--- src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c.orig	2014-02-10 16:16:55.000000000 -0600
+++ src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c	2014-02-27 08:10:17.000000000 -0600
@@ -57,6 +57,8 @@
 #include <getopt.h>
 #include <netinet/in.h>
 
 #include "src/slurmd/slurmd/slurmd.h"
 
+#include <limits.h>
+
 
 /***************************************************************/
 




--- src/plugins/select/cons_res/dist_tasks.c.orig	2013-09-10 16:44:33.000000000 -0500
+++ src/plugins/select/cons_res/dist_tasks.c	2013-11-14 10:23:02.000000000 -0600
@@ -271,6 +271,30 @@
 	return SLURM_SUCCESS;
 }
 
+// These were nested below, which is not legal in standard C
+
+	/* qsort compare function for ascending int list */
+	int _cmp_int_ascend (const void *a, const void *b)
+	{
+		return (*(int*)a - *(int*)b);
+	}
+
+	/* qsort compare function for descending int list */
+	int _cmp_int_descend (const void *a, const void *b)
+	{
+		return (*(int*)b - *(int*)a);
+	}
+
+	int* sockets_cpu_cnt;
+
+	/* qsort compare function for board combination socket
+	 * list */
+	int _cmp_sock (const void *a, const void *b)
+	{
+		 return (sockets_cpu_cnt[*(int*)b] -
+				 sockets_cpu_cnt[*(int*)a]);
+	}
+
 /* sync up core bitmap with new CPU count using a best-fit approach
  * on the available resources on each node
  *
@@ -298,7 +322,6 @@
 	int elig_idx, comb_brd_idx, sock_list_idx, comb_min, board_num;
 	int* boards_cpu_cnt;
 	int* sort_brds_cpu_cnt;
-	int* sockets_cpu_cnt;
 	int* board_combs;
 	int* socket_list;
 	int* elig_brd_combs;
@@ -316,26 +339,6 @@
 	uint64_t ncomb_brd;
 	bool sufficient,best_fit_sufficient;
 
-	/* qsort compare function for ascending int list */
-	int _cmp_int_ascend (const void *a, const void *b)
-	{
-		return (*(int*)a - *(int*)b);
-	}
-
-	/* qsort compare function for descending int list */
-	int _cmp_int_descend (const void *a, const void *b)
-	{
-		return (*(int*)b - *(int*)a);
-	}
-
-	/* qsort compare function for board combination socket
-	 * list */
-	int _cmp_sock (const void *a, const void *b)
-	{
-		 return (sockets_cpu_cnt[*(int*)b] -
-				 sockets_cpu_cnt[*(int*)a]);
-	}
-
 	if (!job_res)
 		return;
 




--- src/plugins/task/cgroup/task_cgroup_cpuset.c.orig	2013-11-14 10:56:33.000000000 -0600
+++ src/plugins/task/cgroup/task_cgroup_cpuset.c	2013-11-14 11:10:51.000000000 -0600
@@ -59,7 +59,12 @@
 
 #ifdef HAVE_HWLOC
 #include <hwloc.h>
+#if !defined(__FreeBSD__)
 #include <hwloc/glibc-sched.h>
+#else
+// For cpuset
+#include <pthread_np.h>
+#endif
 
 # if HWLOC_API_VERSION <= 0x00010000
 /* After this version the cpuset structure and all it's functions
@@ -714,7 +719,7 @@
 	hwloc_obj_type_t req_hwtype;
 
 	size_t tssize;
-	cpu_set_t ts;
+	cpuset_t ts;
 
 	bind_type = job->cpu_bind_type ;
 	if (conf->task_plugin_param & CPU_BIND_VERBOSE ||
@@ -900,7 +905,7 @@
 
 		hwloc_bitmap_asprintf(&str, cpuset);
 
-		tssize = sizeof(cpu_set_t);
+		tssize = sizeof(cpuset_t);
 		if (hwloc_cpuset_to_glibc_sched_affinity(topology,cpuset,
 							 &ts,tssize) == 0) {
 			fstatus = SLURM_SUCCESS;

Line 0 Link Here

(-)files/pty.h (+4 lines)
	1	#include <sys/types.h>
	2	#include <sys/ioctl.h>
	3	#include <termios.h>
	4	#include <libutil.h>




# Example slurm.conf file.
#
# You can run configurator.html (included as part of the documentation) to build
# a configuration file customized for your environment.
#
# See the slurm.conf man page for more information.
#

AuthType=auth/munge
#BackupAddr=
#BackupController=
CacheGroups=0
ClusterName=FreeBSD
#ControlAddr=
ControlMachine=Master
#Epilog=
#FirstJobId=
#JobCredentialPrivateKey=
#JobCredentialPublicCertificate=
MailProg=/usr/bin/mail
#MaxJobCount=
MpiDefault=none
#PlugStackConfig=
#PluginDir=
ProctrackType=proctrack/pgid
#Prolog=
#PropagatePrioProcess=
#PropagateResourceLimits=
#PropagateResourceLimitsExcept=
ReturnToService=0
#SrunEpilog=
#SrunProlog=
SlurmUser=slurm
SlurmctldPidFile=/var/run/slurm/slurmctld.pid
SlurmctldPort=6817
SlurmdPidFile=/var/run/slurm/slurmd.pid
SlurmdPort=6818
SlurmdSpoolDir=/var/spool/slurmd
#SlurmdUser=root
StateSaveLocation=/var/run/slurm
SwitchType=switch/none
#TaskEpilog=
#TaskPlugin=
#TaskProlog=
#TmpFS=
#TrackWCKey=no
#TreeWidth=50
#UsePAM=

# TIMERS
InactiveLimit=0
KillWait=30
MinJobAge=300
SlurmctldTimeout=300
SlurmdTimeout=300
Waittime=0

# SCHEDULING
FastSchedule=1
#PriorityDecayHalfLife=14-0
#PriorityMaxAge=1-0
#PriorityType=priority/multifactor
#PriorityUsageResetPeriod=14-0
#PriorityWeightAge=1000
#PriorityWeightFairshare=100000
#PriorityWeightJobSize=1000
#PriorityWeightPartition=10000
#SchedulerAuth=
#SchedulerPort=
#SchedulerRootFilter=
SchedulerType=sched/backfill
SelectType=select/linear

# LOGGING
#JobCompLoc=
JobCompType=jobcomp/none
SlurmctldDebug=3
SlurmctldLogFile=/var/log/slurmctld.log
SlurmdDebug=3
SlurmdLogFile=/var/log/slurmd.log

# ACCOUNTING
#AccountingStorageHost=
#AccountingStorageLoc=
#AccountingStoragePass=
#AccountingStorageType=accounting_storage/slurmdbd
#AccountingStorageUser=
#JobAcctGatherFrequency=30
#JobAcctGatherType=jobacct_gather/none

# COMPUTE NODES
NodeName=slave[1-10]  Procs=48  State=UNKNOWN
NodeName=slave[11-20] Procs=16  State=UNKNOWN

# PARTITIONS
PartitionName=all Nodes=slave[1-20] Default=YES MaxTime=INFINITE State=UP




# slurm.conf file generated by configurator.html.
# Put this file on all nodes of your cluster.
# See the slurm.conf man page for more information.
#
ControlMachine=%%CONTROL_MACHINE%%
#ControlAddr=
#BackupController=%%BACKUP_CONTROL_MACHINE%%
#BackupAddr=
#
AuthType=auth/munge
CacheGroups=0
#CheckpointType=checkpoint/none
CryptoType=crypto/munge
#DisableRootJobs=NO
#EnforcePartLimits=NO
#Epilog=
#EpilogSlurmctld=
#FirstJobId=1
#MaxJobId=999999
#GresTypes=
#GroupUpdateForce=0
#GroupUpdateTime=600
#JobCheckpointDir=/var/slurm/checkpoint
#JobCredentialPrivateKey=
#JobCredentialPublicCertificate=
#JobFileAppend=0
#JobRequeue=1
#JobSubmitPlugins=1
#KillOnBadExit=0
#LaunchType=launch/slurm
#Licenses=foo*4,bar
MailProg=/usr/bin/mail
#MaxJobCount=5000
#MaxStepCount=40000
#MaxTasksPerNode=128
MpiDefault=none
#MpiParams=ports=#-#
#PluginDir=
#PlugStackConfig=
#PrivateData=jobs
ProctrackType=proctrack/pgid
#Prolog=
#PrologSlurmctld=
#PropagatePrioProcess=0
#PropagateResourceLimits=
# Prevent head node limits from being applied to jobs!
PropagateResourceLimitsExcept=ALL
#RebootProgram=
ReturnToService=1
#SallocDefaultCommand=
SlurmctldPidFile=/var/run/slurmctld.pid
SlurmctldPort=6817
SlurmdPidFile=/var/run/slurmd.pid
SlurmdPort=6818
SlurmdSpoolDir=/var/spool/slurmd
SlurmUser=slurm
#SlurmdUser=root
#SrunEpilog=
#SrunProlog=
StateSaveLocation=/home/slurm/slurmctld
SwitchType=switch/none
#TaskEpilog=
TaskPlugin=task/none
#TaskPluginParam=
#TaskProlog=
#TopologyPlugin=topology/tree
#TmpFs=/tmp
#TrackWCKey=no
#TreeWidth=
#UnkillableStepProgram=
#UsePAM=0
#
#
# TIMERS
#BatchStartTimeout=10
#CompleteWait=0
#EpilogMsgTime=2000
#GetEnvTimeout=2
#HealthCheckInterval=0
#HealthCheckProgram=
InactiveLimit=0
KillWait=30
#MessageTimeout=10
#ResvOverRun=0
MinJobAge=300
#OverTimeLimit=0
SlurmctldTimeout=120
SlurmdTimeout=300
#UnkillableStepTimeout=60
#VSizeFactor=0
Waittime=0
#
#
# SCHEDULING
#DefMemPerCPU=0
FastSchedule=1
#MaxMemPerCPU=0
#SchedulerRootFilter=1
#SchedulerTimeSlice=30
SchedulerType=sched/backfill
SchedulerPort=7321
SelectType=select/cons_res
#SelectTypeParameters=
#
#
# JOB PRIORITY
#PriorityType=priority/basic
#PriorityDecayHalfLife=
#PriorityCalcPeriod=
#PriorityFavorSmall=
#PriorityMaxAge=
#PriorityUsageResetPeriod=
#PriorityWeightAge=
#PriorityWeightFairshare=
#PriorityWeightJobSize=
#PriorityWeightPartition=
#PriorityWeightQOS=
#
#
# LOGGING AND ACCOUNTING
#AccountingStorageEnforce=0
#AccountingStorageHost=
#AccountingStorageLoc=
#AccountingStoragePass=
#AccountingStoragePort=
AccountingStorageType=accounting_storage/none
#AccountingStorageUser=
AccountingStoreJobComment=YES
ClusterName=cluster
#DebugFlags=
#JobCompHost=
#JobCompLoc=
#JobCompPass=
#JobCompPort=
JobCompType=jobcomp/none
#JobCompUser=
JobAcctGatherFrequency=30
JobAcctGatherType=jobacct_gather/none
SlurmctldDebug=5
SlurmctldLogFile=/var/log/slurmctld
SlurmdDebug=5
SlurmdLogFile=/var/log/slurmd
#SlurmSchedLogFile=
#SlurmSchedLogLevel=
#
#
# POWER SAVE SUPPORT FOR IDLE NODES (optional)
#SuspendProgram=
#ResumeProgram=
#SuspendTimeout=
#ResumeTimeout=
#ResumeRate=
#SuspendExcNodes=
#SuspendExcParts=
#SuspendRate=
#SuspendTime=
#
#
# COMPUTE NODES

#############################################################################
# Note: Using CPUs=2 or Sockets=2 causes slurmctld to seg fault on FreeBSD.
#       Use Sockets=1, CoresPerSocket=total-cores-in-node, and
#       ThreadsPerCore=N, even if your motherboard has more than 1 socket.
#	This issue is related to get_cpuinfo() and is being investigated.
#############################################################################

NodeName=compute-[001-002] Sockets=1 CoresPerSocket=1 ThreadsPerCore=1 State=UNKNOWN
PartitionName=default-partition Nodes=compute-[001-002] Default=YES MaxTime=INFINITE State=UP

Lines 1-9 Link Here

(-)pkg-descr (-4 / +4 lines)
1	SLURM is an open-source resource manager designed for *nix clusters of all	1	Slurm is an open-source workload manager designed for *nux clusters of all
2	sizes. It provides three key functions. First it allocates exclusive and/or	2	sizes. It provides three key functions. First it allocates exclusive and/or
3	non-exclusive access to resources (computer nodes) to users for some duration	3	non-exclusive access to resources (computer nodes) to users for some duration of
4	of time so they can perform work. Second, it provides a framework for starting,	4	time so they can perform work. Second, it provides a framework for starting,
5	executing, and monitoring work (typically a parallel job) on a set of allocated	5	executing, and monitoring work (typically a parallel job) on a set of allocated
6	nodes. Finally, it arbitrates contention for resources by managing a queue of	6	nodes. Finally, it arbitrates contention for resources by managing a queue of
7	pending work.	7	pending work.
8		8
9	WWW: https://computing.llnl.gov/linux/slurm/	9	WWW: http://slurm.schedmd.com/




================================================================================

A sample configuration file, slurm.conf.example has been installed to
${LOCALBASE}/etc/.  You need to copy it to slurm.conf and customize it.  If you
use the default locations for .pid, spool, and log files you will need to create
some directories and set appropriate permissions.

On the controller node(s):
==========================

# mkdir /var/run/slurm/ /var/spool/slurmctld
# touch /var/log/slurmctld
# chown slurm:slurm /var/run/slurm /var/spool/slurmctld /var/log/slurmctld

Add the following to /etc/rc.conf:

munged_enable="YES"
slurmctld_enable="YES"

# service munged start
# service slurmctld start

On the compute node(s):
=======================

# mkdir /var/run/slurm/ /var/spool/slurmd

Add the following to /etc/rc.conf:

munged_enable="YES"
slurmd_enable="YES"

# service munged start
# service slurmd start

================================================================================




bin/sshare
bin/sstat
bin/strigger
%%GTK2%%bin/sview
etc/slurm.conf.example
include/slurm/pmi.h
include/slurm/slurm.h
include/slurm/slurm_errno.h
include/slurm/slurmdb.h
include/slurm/smd_ns.h
include/slurm/spank.h
lib/libpmi.a
lib/libpmi.so

lib/libpmi.so.0.0.0
lib/libslurm.a
lib/libslurm.so
lib/libslurm.so.28
lib/libslurm.so.28.0.0
lib/libslurmdb.a
lib/libslurmdb.so
lib/libslurmdb.so.28
lib/libslurmdb.so.28.0.0
lib/slurm/accounting_storage_filetxt.a
lib/slurm/accounting_storage_filetxt.so
%%MYSQL%%lib/slurm/accounting_storage_mysql.a
%%MYSQL%%lib/slurm/accounting_storage_mysql.so
lib/slurm/accounting_storage_none.a
lib/slurm/accounting_storage_none.so
lib/slurm/accounting_storage_slurmdbd.a

lib/slurm/checkpoint_none.so
lib/slurm/checkpoint_ompi.a
lib/slurm/checkpoint_ompi.so
lib/slurm/core_spec_cray.a
lib/slurm/core_spec_cray.so
lib/slurm/core_spec_none.a
lib/slurm/core_spec_none.so
lib/slurm/crypto_munge.a
lib/slurm/crypto_munge.so
lib/slurm/crypto_openssl.a

lib/slurm/gres_mic.so
lib/slurm/gres_nic.a
lib/slurm/gres_nic.so
lib/slurm/job_container_cncu.a
lib/slurm/job_container_cncu.so
lib/slurm/job_container_none.a
lib/slurm/job_container_none.so
lib/slurm/job_submit_all_partitions.a
lib/slurm/job_submit_all_partitions.so
lib/slurm/job_submit_cnode.a
lib/slurm/job_submit_cnode.so
lib/slurm/job_submit_cray.a
lib/slurm/job_submit_cray.so
lib/slurm/job_submit_defaults.a
lib/slurm/job_submit_defaults.so
lib/slurm/job_submit_logging.a

lib/slurm/job_submit_pbs.so
lib/slurm/job_submit_require_timelimit.a
lib/slurm/job_submit_require_timelimit.so
lib/slurm/job_submit_throttle.a
lib/slurm/job_submit_throttle.so
lib/slurm/jobacct_gather_aix.a
lib/slurm/jobacct_gather_aix.so
lib/slurm/jobacct_gather_cgroup.a

lib/slurm/jobacct_gather_none.so
lib/slurm/jobcomp_filetxt.a
lib/slurm/jobcomp_filetxt.so
%%MYSQL%%lib/slurm/jobcomp_mysql.a
%%MYSQL%%lib/slurm/jobcomp_mysql.so
lib/slurm/jobcomp_none.a
lib/slurm/jobcomp_none.so
lib/slurm/jobcomp_script.a

lib/slurm/mpi_openmpi.so
lib/slurm/mpi_pmi2.a
lib/slurm/mpi_pmi2.so
lib/slurm/preempt_job_prio.a
lib/slurm/preempt_job_prio.so
lib/slurm/preempt_none.a
lib/slurm/preempt_none.so
lib/slurm/preempt_partition_prio.a

lib/slurm/proctrack_linuxproc.so
lib/slurm/proctrack_pgid.a
lib/slurm/proctrack_pgid.so
lib/slurm/route_default.a
lib/slurm/route_default.so
lib/slurm/route_topology.a
lib/slurm/route_topology.so
lib/slurm/sched_backfill.a
lib/slurm/sched_backfill.so
lib/slurm/sched_builtin.a

lib/slurm/sched_wiki.so
lib/slurm/sched_wiki2.a
lib/slurm/sched_wiki2.so
lib/slurm/select_alps.a
lib/slurm/select_alps.so
lib/slurm/select_cons_res.a
lib/slurm/select_cons_res.so
lib/slurm/select_cray.a

lib/slurm/select_linear.so
lib/slurm/select_serial.a
lib/slurm/select_serial.so
lib/slurm/slurmctld_nonstop.a
lib/slurm/slurmctld_nonstop.so
lib/slurm/spank_pbs.a
lib/slurm/spank_pbs.so
lib/slurm/src/sattach/sattach.wrapper.c
lib/slurm/src/srun/srun.wrapper.c
lib/slurm/switch_cray.a
lib/slurm/switch_cray.so
lib/slurm/switch_generic.a
lib/slurm/switch_generic.so
lib/slurm/switch_none.a
lib/slurm/switch_none.so
lib/slurm/task_cgroup.a
lib/slurm/task_cgroup.so
lib/slurm/task_cray.a
lib/slurm/task_cray.so
lib/slurm/task_none.a
lib/slurm/task_none.so
lib/slurm/topology_3d_torus.a

man/man1/sshare.1.gz
man/man1/sstat.1.gz
man/man1/strigger.1.gz
%%GTK2%%man/man1/sview.1.gz
man/man3/slurm_allocate_resources.3.gz
man/man3/slurm_allocate_resources_blocking.3.gz
man/man3/slurm_allocation_lookup.3.gz

man/man3/slurm_free_ctl_conf.3.gz
man/man3/slurm_free_front_end_info_msg.3.gz
man/man3/slurm_free_job_alloc_info_response_msg.3.gz
man/man3/slurm_free_job_array_resp.3.gz
man/man3/slurm_free_job_info_msg.3.gz
man/man3/slurm_free_job_step_create_response_msg.3.gz
man/man3/slurm_free_job_step_info_response_msg.3.gz

man/man3/slurm_read_hostfile.3.gz
man/man3/slurm_reconfigure.3.gz
man/man3/slurm_requeue.3.gz
man/man3/slurm_requeue2.3.gz
man/man3/slurm_resume.3.gz
man/man3/slurm_resume2.3.gz
man/man3/slurm_set_debug_level.3.gz
man/man3/slurm_set_trigger.3.gz
man/man3/slurm_shutdown.3.gz

man/man3/slurm_strerror.3.gz
man/man3/slurm_submit_batch_job.3.gz
man/man3/slurm_suspend.3.gz
man/man3/slurm_suspend2.3.gz
man/man3/slurm_takeover.3.gz
man/man3/slurm_terminate_job.3.gz
man/man3/slurm_terminate_job_step.3.gz
man/man3/slurm_update_front_end.3.gz
man/man3/slurm_update_job.3.gz
man/man3/slurm_update_job2.3.gz
man/man3/slurm_update_node.3.gz
man/man3/slurm_update_partition.3.gz
man/man3/slurm_update_reservation.3.gz

man/man5/cray.conf.5.gz
man/man5/ext_sensors.conf.5.gz
man/man5/gres.conf.5.gz
man/man5/nonstop.conf.5.gz
man/man5/slurm.conf.5.gz
man/man5/slurmdbd.conf.5.gz
man/man5/topology.conf.5.gz

sbin/slurmd
sbin/slurmdbd
sbin/slurmstepd
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/Slurm_Entity.pdf
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/Slurm_Individual.pdf
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/accounting.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/accounting_storageplugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/acct_gather_energy_plugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/acct_gather_profile_plugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/add.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/allocation_pies.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/api.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/arch.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/authplugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/big_sys.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/bluegene.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/bull.jpg
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/cgroups.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/checkpoint_blcr.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/checkpoint_plugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/coding_style.pdf
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/configurator.easy.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/configurator.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/cons_res.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/cons_res_share.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/contributor.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/core_spec.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/core_spec_plugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/cpu_management.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/cray.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/cray_alps.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/crypto_plugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/disclaimer.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/dist_plane.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/documentation.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/download.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/dynalloc.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/elastic_computing.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/entities.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/example_usage.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/ext_sensorsplugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/fair_tree.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/faq.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/gang_scheduling.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/gres.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/gres_design.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/gres_plugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/hdf5_job_outline.png
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/hdf5_profile_user_guide.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/hdf5_task_attr.png
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/high_throughput.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/ibm-pe.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/ibm.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/ibm_pe_fig1.png
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/ibm_pe_fig2.png
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/job_array.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/job_container_plugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/job_exit_code.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/job_launch.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/job_submit_plugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/jobacct_gatherplugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/jobcompplugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/k_function.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/launch_plugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/licenses.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/linuxstyles.css
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/lll.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/mail.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/man_index.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/maui.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/mc_support.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/mc_support.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/meetings.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/moab.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/mpi_guide.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/mpiplugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/multi_cluster.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/news.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/overview.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/plane_ex1.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/plane_ex2.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/plane_ex3.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/plane_ex4.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/plane_ex5.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/plane_ex6.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/plane_ex7.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/platforms.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/plugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/power_save.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/preempt.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/preemption_plugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/priority_multifactor.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/priority_multifactor2.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/priority_multifactor3.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/priority_plugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/proctrack_plugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/programmer_guide.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/prolog_epilog.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/publications.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/qos.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/quickstart.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/quickstart_admin.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/reservations.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/resource_limits.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/rosetta.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/route_plugin.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/rpc.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/sched_config.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/schedmd.png
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/schedplugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/select_design.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/selectplugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/slurm.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/slurm_design.pdf
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/slurm_logo.png
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/slurm_ug_agenda.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/slurm_ug_cfp.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/slurm_ug_registration.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/slurmctld_plugstack.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/slurmstyles.css
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/sponsors.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/sun_const.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/switchplugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/taskplugins.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/team.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/testimonials.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/topo_ex1.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/topo_ex2.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/topology.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/topology_plugin.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/troubleshoot.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/tutorial_intro_files.tar
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/tutorials.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/usage_pies.gif
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-14.11.3/html/wckey.html

Return to bug 196260

Lines 2-12 Link Here

(-)Makefile (-52 / +35 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= slurm	4	PORTNAME= slurm
5	PORTVERSION= 2.6.4	5	PORTVERSION= 14.11.3
6	PORTREVISION= 5
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= http://www.schedmd.com/download/archive/ \	7	MASTER_SITES= http://www.schedmd.com/download/latest/ \
9	http://www.schedmd.com/download/latest/ \	8	http://www.schedmd.com/download/archive/ \
10	http://www.schedmd.com/download/development/	9	http://www.schedmd.com/download/development/
11	PKGNAMESUFFIX= -hpc	10	PKGNAMESUFFIX= -hpc
12		11
Lines 13-19 Link Here
13	MAINTAINER= jwbacon@tds.net	12	MAINTAINER= jwbacon@tds.net
14	COMMENT= Simple Linux Utility for Resource Management	13	COMMENT= Simple Linux Utility for Resource Management
15		14
16	LICENSE= GPLv1	15	LICENSE= GPLv2
17		16
18	LIB_DEPENDS= libsysinfo.so:${PORTSDIR}/devel/libsysinfo \	17	LIB_DEPENDS= libsysinfo.so:${PORTSDIR}/devel/libsysinfo \
19	libhwloc.so:${PORTSDIR}/devel/hwloc \	18	libhwloc.so:${PORTSDIR}/devel/hwloc \
Lines 22-90 Link Here
22	libhdf5.so:${PORTSDIR}/science/hdf5	21	libhdf5.so:${PORTSDIR}/science/hdf5
23		22
24	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
25	USES= gmake libtool perl5 python tar:bzip2	24
26	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
		26	USES= gmake libtool perl5 python tar:bz2
27		27
28	OPTIONS_DEFINE= DOCS MYSQL PGSQL GTK2	28	#OPTIONS_DEFINE=DOCS MYSQL PGSQL GTK2
		29	OPTIONS_DEFINE= DOCS MYSQL GTK2
		30	OPTIONS_SUB= yes
29		31
		32	GTK2_USE= GNOME=glib20,gtk20
		33	MYSQL_USE= MYSQL=yes
		34	#PGSQL_USES= pgsql
		35
		36	GTK2_DESC= Build GUI config tool sview
		37
30	USERS= slurm	38	USERS= slurm
31	GROUPS= ${USERS}	39	GROUPS= ${USERS}
32		40
33	USE_RC_SUBR= slurmctld slurmd	41	USE_RC_SUBR= slurmctld slurmd
34	SUB_FILES+= slurm.conf
35		42
36	# This is a new and complex port. Allow debugging.	43	# ${WRKSRC}/slurm is for pty.h in configure
37	STRIP_CMD= # NONE	44	CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include
38	CFLAGS+= -I${LOCALBASE}/include -g -O1
39	LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lkvm	45	LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lkvm
40		46
41	post-install:
42	${INSTALL_DATA} ${WRKDIR}/slurm.conf ${STAGEDIR}${PREFIX}/etc/slurm.conf.sample
43
44	.include <bsd.port.options.mk>	47	.include <bsd.port.options.mk>
45		48
46	.if ${PORT_OPTIONS:MMYSQL}	49	# SLURM's configure enables interactive jobs if pty.h exists. Replacing
47	USE_MYSQL= yes # Job accounting	50	# #include <pty.h> with appropriate headers will therefore not work, so instead
48	PLIST_FILES+= lib/slurm/accounting_storage_mysql.a \	51	# add a pty.h for the build.
49	lib/slurm/accounting_storage_mysql.la \	52	post-patch:
50	lib/slurm/accounting_storage_mysql.so \	53	.if ! ${PORT_OPTIONS:MGTK2}
51	lib/slurm/jobcomp_mysql.a \	54	@${REINPLACE_CMD} \
52	lib/slurm/jobcomp_mysql.la \	55	-e 's\|min_gtk_version=2.7.1\|min_gtk_version=200.7.1\|g' \
53	lib/slurm/jobcomp_mysql.so	56	${WRKSRC}/configure
54	.else
55	# Can't disable configure test, so make it fail
56	CONFIGURE_ARGS+=--with-mysql_config=/nomysql
57	.endif	57	.endif
		58	@${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm
		59	@${REINPLACE_CMD} \
		60	-e 's\|/usr/bin/env python\|${PYTHON_CMD}\|g' \
		61	${WRKSRC}/doc/html/shtml2html.py \
		62	${WRKSRC}/doc/man/man2html.py
58		63
59	.if ${PORT_OPTIONS:MPGSQL}	64	post-stage:
60	USES+= pgsql # Job accounting	65	.if ! ${PORT_OPTIONS:MDOCS}
61	PLIST_FILES+= lib/slurm/accounting_storage_pgsql.a \	66	${RM} -rf ${STAGEDIR}${LOCALBASE}/share/doc/${PORTNAME}-${PORTVERSION}
62	lib/slurm/accounting_storage_pgsql.la \
63	lib/slurm/accounting_storage_pgsql.so \
64	lib/slurm/jobcomp_pgsql.a \
65	lib/slurm/jobcomp_pgsql.la \
66	lib/slurm/jobcomp_pgsql.so
67	.else
68	# Can't disable configure test, so make it fail
69	CONFIGURE_ARGS+=--with-pg_config=/nopostgres
70	.endif	67	.endif
		68	@${CP} ${FILESDIR}/slurm.conf.example ${STAGEDIR}${PREFIX}/etc/
71		69
72	.if ${PORT_OPTIONS:MGTK2}
73	# Note: Configure could not find pcre when building with no ports
74	# preinstalled on 9.1-RELEASE. Worked fine on second try.
75	USE_GNOME= glib20 gtk20 # sview
76	PLIST_FILES+= bin/sview
77	.endif
78		70
79	post-patch:	71	INSTALL_TARGET= install-strip
80	# Can't disable configure test, so make it fail
81	.if ! ${PORT_OPTIONS:MGTK2}
82	${REINPLACE_CMD} -e 's\|min_gtk_version=2.7.1\|min_gtk_version=200.7.1\|' \
83	${WRKSRC}/configure
84	.endif
85	@${REINPLACE_CMD} \
86	-e 's\|/usr/bin/env python\|${PYTHON_CMD}\|g' \
87	${WRKSRC}/doc/html/shtml2html.py \
88	${WRKSRC}/doc/man/man2html.py
89		72
90	.include <bsd.port.mk>	73	.include <bsd.port.mk>

Lines 1-41 Link Here

(-)files/patch-configure (-41 lines)
1	--- configure.orig 2013-09-10 16:44:33.000000000 -0500
2	+++ configure 2013-11-14 10:23:02.000000000 -0600
3	@@ -21594,12 +21594,9 @@
4	main ()
5	{
6
7	- int main()
8	- {
9	MYSQL mysql;
10	(void) mysql_init(&mysql);
11	(void) mysql_close(&mysql);
12	- }
13
14	;
15	return 0;
16	@@ -21636,12 +21633,9 @@
17	main ()
18	{
19
20	- int main()
21	- {
22	MYSQL mysql;
23	(void) mysql_init(&mysql);
24	(void) mysql_close(&mysql);
25	- }
26
27	;
28	return 0;
29	@@ -21803,12 +21797,9 @@
30	main ()
31	{
32
33	- int main()
34	- {
35	PGconn *conn;
36	conn = PQconnectdb("dbname = postgres");
37	(void) PQfinish(conn);
38	- }
39
40	;
41	return 0;

Lines 1-11 Link Here

(-)files/patch-src-plugins-acct_gather_filesystem-lustre-acct_gather_filesystem_lustre.c (-7 / +7 lines)
1	--- src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c.orig 2013-09-10 16:44:33.000000000 -0500	1	--- src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c.orig 2014-02-10 16:16:55.000000000 -0600
2	+++ src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c 2013-11-14 10:23:02.000000000 -0600	2	+++ src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c 2014-02-27 08:10:17.000000000 -0600
3	@@ -49,6 +49,8 @@	3	@@ -57,6 +57,8 @@
4	#include <getopt.h>
5	#include <netinet/in.h>
6		4
		5	#include "src/slurmd/slurmd/slurmd.h"
		6
7	+#include <limits.h>	7	+#include <limits.h>
8	+	8	+
9		9
10	#include "src/common/slurm_xlator.h"	10	/***************************************************************/
11	#include "src/common/slurm_acct_gather_filesystem.h"	11

Lines 1-68 Link Here

(-)files/patch-src-plugins-select-cons_res-dist_tasks.c (-68 lines)
1	--- src/plugins/select/cons_res/dist_tasks.c.orig 2013-09-10 16:44:33.000000000 -0500
2	+++ src/plugins/select/cons_res/dist_tasks.c 2013-11-14 10:23:02.000000000 -0600
3	@@ -271,6 +271,30 @@
4	return SLURM_SUCCESS;
5	}
6
7	+// These were nested below, which is not legal in standard C
8	+
9	+ /* qsort compare function for ascending int list */
10	+ int _cmp_int_ascend (const void a, const void b)
11	+ {
12	+ return ((int)a - (int)b);
13	+ }
14	+
15	+ /* qsort compare function for descending int list */
16	+ int _cmp_int_descend (const void a, const void b)
17	+ {
18	+ return ((int)b - (int)a);
19	+ }
20	+
21	+ int* sockets_cpu_cnt;
22	+
23	+ /* qsort compare function for board combination socket
24	+ * list */
25	+ int _cmp_sock (const void a, const void b)
26	+ {
27	+ return (sockets_cpu_cnt[(int)b] -
28	+ sockets_cpu_cnt[(int)a]);
29	+ }
30	+
31	/* sync up core bitmap with new CPU count using a best-fit approach
32	* on the available resources on each node
33	*
34	@@ -298,7 +322,6 @@
35	int elig_idx, comb_brd_idx, sock_list_idx, comb_min, board_num;
36	int* boards_cpu_cnt;
37	int* sort_brds_cpu_cnt;
38	- int* sockets_cpu_cnt;
39	int* board_combs;
40	int* socket_list;
41	int* elig_brd_combs;
42	@@ -316,26 +339,6 @@
43	uint64_t ncomb_brd;
44	bool sufficient,best_fit_sufficient;
45
46	- /* qsort compare function for ascending int list */
47	- int _cmp_int_ascend (const void a, const void b)
48	- {
49	- return ((int)a - (int)b);
50	- }
51	-
52	- /* qsort compare function for descending int list */
53	- int _cmp_int_descend (const void a, const void b)
54	- {
55	- return ((int)b - (int)a);
56	- }
57	-
58	- /* qsort compare function for board combination socket
59	- * list */
60	- int _cmp_sock (const void a, const void b)
61	- {
62	- return (sockets_cpu_cnt[(int)b] -
63	- sockets_cpu_cnt[(int)a]);
64	- }
65	-
66	if (!job_res)
67	return;
68

Lines 1-33 Link Here

(-)files/patch-src-plugins-task-cgroup-task_cgroup_cpuset.c (-33 lines)
1	--- src/plugins/task/cgroup/task_cgroup_cpuset.c.orig 2013-11-14 10:56:33.000000000 -0600
2	+++ src/plugins/task/cgroup/task_cgroup_cpuset.c 2013-11-14 11:10:51.000000000 -0600
3	@@ -59,7 +59,12 @@
4
5	#ifdef HAVE_HWLOC
6	#include <hwloc.h>
7	+#if !defined(__FreeBSD__)
8	#include <hwloc/glibc-sched.h>
9	+#else
10	+// For cpuset
11	+#include <pthread_np.h>
12	+#endif
13
14	# if HWLOC_API_VERSION <= 0x00010000
15	/* After this version the cpuset structure and all it's functions
16	@@ -714,7 +719,7 @@
17	hwloc_obj_type_t req_hwtype;
18
19	size_t tssize;
20	- cpu_set_t ts;
21	+ cpuset_t ts;
22
23	bind_type = job->cpu_bind_type ;
24	if (conf->task_plugin_param & CPU_BIND_VERBOSE \|\|
25	@@ -900,7 +905,7 @@
26
27	hwloc_bitmap_asprintf(&str, cpuset);
28
29	- tssize = sizeof(cpu_set_t);
30	+ tssize = sizeof(cpuset_t);
31	if (hwloc_cpuset_to_glibc_sched_affinity(topology,cpuset,
32	&ts,tssize) == 0) {
33	fstatus = SLURM_SUCCESS;

Line 0 Link Here

(-)files/slurm.conf.example (+96 lines)
		1	# Example slurm.conf file.
		2	#
		3	# You can run configurator.html (included as part of the documentation) to build
		4	# a configuration file customized for your environment.
		5	#
		6	# See the slurm.conf man page for more information.
		7	#
		8
		9	AuthType=auth/munge
		10	#BackupAddr=
		11	#BackupController=
		12	CacheGroups=0
		13	ClusterName=FreeBSD
		14	#ControlAddr=
		15	ControlMachine=Master
		16	#Epilog=
		17	#FirstJobId=
		18	#JobCredentialPrivateKey=
		19	#JobCredentialPublicCertificate=
		20	MailProg=/usr/bin/mail
		21	#MaxJobCount=
		22	MpiDefault=none
		23	#PlugStackConfig=
		24	#PluginDir=
		25	ProctrackType=proctrack/pgid
		26	#Prolog=
		27	#PropagatePrioProcess=
		28	#PropagateResourceLimits=
		29	#PropagateResourceLimitsExcept=
		30	ReturnToService=0
		31	#SrunEpilog=
		32	#SrunProlog=
		33	SlurmUser=slurm
		34	SlurmctldPidFile=/var/run/slurm/slurmctld.pid
		35	SlurmctldPort=6817
		36	SlurmdPidFile=/var/run/slurm/slurmd.pid
		37	SlurmdPort=6818
		38	SlurmdSpoolDir=/var/spool/slurmd
		39	#SlurmdUser=root
		40	StateSaveLocation=/var/run/slurm
		41	SwitchType=switch/none
		42	#TaskEpilog=
		43	#TaskPlugin=
		44	#TaskProlog=
		45	#TmpFS=
		46	#TrackWCKey=no
		47	#TreeWidth=50
		48	#UsePAM=
		49
		50	# TIMERS
		51	InactiveLimit=0
		52	KillWait=30
		53	MinJobAge=300
		54	SlurmctldTimeout=300
		55	SlurmdTimeout=300
		56	Waittime=0
		57
		58	# SCHEDULING
		59	FastSchedule=1
		60	#PriorityDecayHalfLife=14-0
		61	#PriorityMaxAge=1-0
		62	#PriorityType=priority/multifactor
		63	#PriorityUsageResetPeriod=14-0
		64	#PriorityWeightAge=1000
65	#PriorityWeightFairshare=100000
66	#PriorityWeightJobSize=1000
67	#PriorityWeightPartition=10000
68	#SchedulerAuth=
69	#SchedulerPort=
70	#SchedulerRootFilter=
71	SchedulerType=sched/backfill
72	SelectType=select/linear
73
74	# LOGGING
75	#JobCompLoc=
76	JobCompType=jobcomp/none
77	SlurmctldDebug=3
78	SlurmctldLogFile=/var/log/slurmctld.log
79	SlurmdDebug=3
80	SlurmdLogFile=/var/log/slurmd.log
81
82	# ACCOUNTING
83	#AccountingStorageHost=
84	#AccountingStorageLoc=
85	#AccountingStoragePass=
86	#AccountingStorageType=accounting_storage/slurmdbd
87	#AccountingStorageUser=
88	#JobAcctGatherFrequency=30
89	#JobAcctGatherType=jobacct_gather/none
90
91	# COMPUTE NODES
92	NodeName=slave[1-10] Procs=48 State=UNKNOWN
93	NodeName=slave[11-20] Procs=16 State=UNKNOWN
94
95	# PARTITIONS
96	PartitionName=all Nodes=slave[1-20] Default=YES MaxTime=INFINITE State=UP

Lines 1-169 Link Here

(-)files/slurm.conf.in (-169 lines)
1	# slurm.conf file generated by configurator.html.
2	# Put this file on all nodes of your cluster.
3	# See the slurm.conf man page for more information.
4	#
5	ControlMachine=%%CONTROL_MACHINE%%
6	#ControlAddr=
7	#BackupController=%%BACKUP_CONTROL_MACHINE%%
8	#BackupAddr=
9	#
10	AuthType=auth/munge
11	CacheGroups=0
12	#CheckpointType=checkpoint/none
13	CryptoType=crypto/munge
14	#DisableRootJobs=NO
15	#EnforcePartLimits=NO
16	#Epilog=
17	#EpilogSlurmctld=
18	#FirstJobId=1
19	#MaxJobId=999999
20	#GresTypes=
21	#GroupUpdateForce=0
22	#GroupUpdateTime=600
23	#JobCheckpointDir=/var/slurm/checkpoint
24	#JobCredentialPrivateKey=
25	#JobCredentialPublicCertificate=
26	#JobFileAppend=0
27	#JobRequeue=1
28	#JobSubmitPlugins=1
29	#KillOnBadExit=0
30	#LaunchType=launch/slurm
31	#Licenses=foo*4,bar
32	MailProg=/usr/bin/mail
33	#MaxJobCount=5000
34	#MaxStepCount=40000
35	#MaxTasksPerNode=128
36	MpiDefault=none
37	#MpiParams=ports=#-#
38	#PluginDir=
39	#PlugStackConfig=
40	#PrivateData=jobs
41	ProctrackType=proctrack/pgid
42	#Prolog=
43	#PrologSlurmctld=
44	#PropagatePrioProcess=0
45	#PropagateResourceLimits=
46	# Prevent head node limits from being applied to jobs!
47	PropagateResourceLimitsExcept=ALL
48	#RebootProgram=
49	ReturnToService=1
50	#SallocDefaultCommand=
51	SlurmctldPidFile=/var/run/slurmctld.pid
52	SlurmctldPort=6817
53	SlurmdPidFile=/var/run/slurmd.pid
54	SlurmdPort=6818
55	SlurmdSpoolDir=/var/spool/slurmd
56	SlurmUser=slurm
57	#SlurmdUser=root
58	#SrunEpilog=
59	#SrunProlog=
60	StateSaveLocation=/home/slurm/slurmctld
61	SwitchType=switch/none
62	#TaskEpilog=
63	TaskPlugin=task/none
64	#TaskPluginParam=
65	#TaskProlog=
66	#TopologyPlugin=topology/tree
67	#TmpFs=/tmp
68	#TrackWCKey=no
69	#TreeWidth=
70	#UnkillableStepProgram=
71	#UsePAM=0
72	#
73	#
74	# TIMERS
75	#BatchStartTimeout=10
76	#CompleteWait=0
77	#EpilogMsgTime=2000
78	#GetEnvTimeout=2
79	#HealthCheckInterval=0
80	#HealthCheckProgram=
81	InactiveLimit=0
82	KillWait=30
83	#MessageTimeout=10
84	#ResvOverRun=0
85	MinJobAge=300
86	#OverTimeLimit=0
87	SlurmctldTimeout=120
88	SlurmdTimeout=300
89	#UnkillableStepTimeout=60
90	#VSizeFactor=0
91	Waittime=0
92	#
93	#
94	# SCHEDULING
95	#DefMemPerCPU=0
96	FastSchedule=1
97	#MaxMemPerCPU=0
98	#SchedulerRootFilter=1
99	#SchedulerTimeSlice=30
100	SchedulerType=sched/backfill
101	SchedulerPort=7321
102	SelectType=select/cons_res
103	#SelectTypeParameters=
104	#
105	#
106	# JOB PRIORITY
107	#PriorityType=priority/basic
108	#PriorityDecayHalfLife=
109	#PriorityCalcPeriod=
110	#PriorityFavorSmall=
111	#PriorityMaxAge=
112	#PriorityUsageResetPeriod=
113	#PriorityWeightAge=
114	#PriorityWeightFairshare=
115	#PriorityWeightJobSize=
116	#PriorityWeightPartition=
117	#PriorityWeightQOS=
118	#
119	#
120	# LOGGING AND ACCOUNTING
121	#AccountingStorageEnforce=0
122	#AccountingStorageHost=
123	#AccountingStorageLoc=
124	#AccountingStoragePass=
125	#AccountingStoragePort=
126	AccountingStorageType=accounting_storage/none
127	#AccountingStorageUser=
128	AccountingStoreJobComment=YES
129	ClusterName=cluster
130	#DebugFlags=
131	#JobCompHost=
132	#JobCompLoc=
133	#JobCompPass=
134	#JobCompPort=
135	JobCompType=jobcomp/none
136	#JobCompUser=
137	JobAcctGatherFrequency=30
138	JobAcctGatherType=jobacct_gather/none
139	SlurmctldDebug=5
140	SlurmctldLogFile=/var/log/slurmctld
141	SlurmdDebug=5
142	SlurmdLogFile=/var/log/slurmd
143	#SlurmSchedLogFile=
144	#SlurmSchedLogLevel=
145	#
146	#
147	# POWER SAVE SUPPORT FOR IDLE NODES (optional)
148	#SuspendProgram=
149	#ResumeProgram=
150	#SuspendTimeout=
151	#ResumeTimeout=
152	#ResumeRate=
153	#SuspendExcNodes=
154	#SuspendExcParts=
155	#SuspendRate=
156	#SuspendTime=
157	#
158	#
159	# COMPUTE NODES
160
161	#############################################################################
162	# Note: Using CPUs=2 or Sockets=2 causes slurmctld to seg fault on FreeBSD.
163	# Use Sockets=1, CoresPerSocket=total-cores-in-node, and
164	# ThreadsPerCore=N, even if your motherboard has more than 1 socket.
165	# This issue is related to get_cpuinfo() and is being investigated.
166	#############################################################################
167
168	NodeName=compute-[001-002] Sockets=1 CoresPerSocket=1 ThreadsPerCore=1 State=UNKNOWN
169	PartitionName=default-partition Nodes=compute-[001-002] Default=YES MaxTime=INFINITE State=UP

Line 0 Link Here

(-)pkg-message (+36 lines)
	1	================================================================================
	2
	3	A sample configuration file, slurm.conf.example has been installed to
	4	${LOCALBASE}/etc/. You need to copy it to slurm.conf and customize it. If you
	5	use the default locations for .pid, spool, and log files you will need to create
	6	some directories and set appropriate permissions.
	7
	8	On the controller node(s):
	9	==========================
	10
	11	# mkdir /var/run/slurm/ /var/spool/slurmctld
	12	# touch /var/log/slurmctld
	13	# chown slurm:slurm /var/run/slurm /var/spool/slurmctld /var/log/slurmctld
	14
	15	Add the following to /etc/rc.conf:
	16
	17	munged_enable="YES"
	18	slurmctld_enable="YES"
	19
	20	# service munged start
	21	# service slurmctld start
	22
	23	On the compute node(s):
	24	=======================
	25
	26	# mkdir /var/run/slurm/ /var/spool/slurmd
	27
	28	Add the following to /etc/rc.conf:
	29
	30	munged_enable="YES"
	31	slurmd_enable="YES"
	32
	33	# service munged start
	34	# service slurmd start
	35
	36	================================================================================