pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/parallel/slurm parallel/slurm: Update to 17.11.5
details: https://anonhg.NetBSD.org/pkgsrc/rev/20b650c9dec1
branches: trunk
changeset: 377982:20b650c9dec1
user: bacon <bacon%pkgsrc.org@localhost>
date: Sun Mar 25 14:55:29 2018 +0000
description:
parallel/slurm: Update to 17.11.5
Changes since 2.6.4:
Adds additional capabilities such as SQL accounting and job profiling
Change maintainer to bacon%NetBSD.org@localhost
Install example Linux init scripts
diffstat:
parallel/slurm/DESCR | 15 +-
parallel/slurm/Makefile | 74 +++-
parallel/slurm/PLIST | 164 ++++++++-
parallel/slurm/PLIST.Linux | 2 +
parallel/slurm/distinfo | 36 +-
parallel/slurm/files/linux-slurm-enable | 64 +++
parallel/slurm/files/slurmctld.sh | 2 +-
parallel/slurm/files/slurmd.sh | 4 +-
parallel/slurm/patches/patch-doc_html_Makefile.am | 11 -
parallel/slurm/patches/patch-doc_html_Makefile.in | 13 -
parallel/slurm/patches/patch-doc_man_man1_Makefile.am | 10 -
parallel/slurm/patches/patch-doc_man_man1_Makefile.in | 13 -
parallel/slurm/patches/patch-doc_man_man5_Makefile.am | 10 -
parallel/slurm/patches/patch-doc_man_man5_Makefile.in | 13 -
parallel/slurm/patches/patch-doc_man_man8_Makefile.am | 10 -
parallel/slurm/patches/patch-doc_man_man8_Makefile.in | 13 -
parallel/slurm/patches/patch-etc_init.d.slurm.in | 16 +
parallel/slurm/patches/patch-src_common_net.c | 22 -
parallel/slurm/patches/patch-src_common_slurm__jobacct__gather.c | 13 -
parallel/slurm/patches/patch-src_common_xcgroup.c | 13 -
parallel/slurm/patches/patch-src_common_xcgroup.h | 13 -
parallel/slurm/patches/patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c | 14 -
parallel/slurm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c | 16 +
parallel/slurm/patches/patch-src_slurmctld_reservation.c | 13 -
parallel/slurm/patches/patch-src_slurmd_common_setproctitle.c | 13 -
parallel/slurm/patches/patch-src_slurmd_common_task__plugin.c | 30 +
parallel/slurm/patches/patch-src_slurmd_common_task__plugin.h | 23 +
parallel/slurm/patches/patch-src_slurmd_slurmd_slurmd.c | 29 +
parallel/slurm/patches/patch-src_slurmd_slurmd_slurmd.h | 23 +
parallel/slurm/patches/patch-src_slurmd_slurmstepd_io.c | 14 +
parallel/slurm/patches/patch-src_slurmd_slurmstepd_task.c | 23 +-
parallel/slurm/patches/patch-src_srun_libsrun_debugger.c | 13 -
parallel/slurm/patches/patch-src_srun_libsrun_launch.c | 13 -
33 files changed, 446 insertions(+), 309 deletions(-)
diffs (truncated from 1201 to 300 lines):
diff -r 06b53c012da9 -r 20b650c9dec1 parallel/slurm/DESCR
--- a/parallel/slurm/DESCR Sun Mar 25 12:05:01 2018 +0000
+++ b/parallel/slurm/DESCR Sun Mar 25 14:55:29 2018 +0000
@@ -1,8 +1,7 @@
-SLURM is an open-source resource manager designed for Linux
-clusters of all sizes. It provides three key functions. First it
-allocates exclusive and/or non-exclusive access to resources
-(computer nodes) to users for some duration of time so they can
-perform work. Second, it provides a framework for starting,
-executing, and monitoring work (typically a parallel job) on a
-set of allocated nodes. Finally, it arbitrates contention for
-resources by managing a queue of pending work.
+SLURM is an open-source resource manager designed for Linux clusters of
+all sizes. It provides three key functions. First it allocates exclusive
+and/or non-exclusive access to resources (computer nodes) to users for some
+duration of time so they can perform work. Second, it provides a framework
+for starting, executing, and monitoring work (typically a parallel job) on
+a set of allocated nodes. Finally, it arbitrates contention for resources
+by managing a queue of pending work.
diff -r 06b53c012da9 -r 20b650c9dec1 parallel/slurm/Makefile
--- a/parallel/slurm/Makefile Sun Mar 25 12:05:01 2018 +0000
+++ b/parallel/slurm/Makefile Sun Mar 25 14:55:29 2018 +0000
@@ -1,28 +1,41 @@
-# $NetBSD: Makefile,v 1.23 2018/01/01 18:16:38 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2018/03/25 14:55:29 bacon Exp $
-DISTNAME= slurm-2.6.4
-PKGREVISION= 9
+DISTNAME= slurm-17.11.5
CATEGORIES= parallel
MASTER_SITES= http://www.schedmd.com/download/archive/
MASTER_SITES+= http://www.schedmd.com/download/latest/
MASTER_SITES+= http://www.schedmd.com/download/development/
EXTRACT_SUFX= .tar.bz2
-MAINTAINER= asau%inbox.ru@localhost
+MAINTAINER= bacon%NetBSD.org@localhost
HOMEPAGE= http://www.schedmd.com/
COMMENT= Simple Linux Utility for Resource Management
-USE_LANGUAGES= c c++
+LICENSE= gnu-gpl-v2
+
+BUILD_DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base
+BUILD_DEPENDS+= man2html-[0-9]*:../../textproc/man2html
GNU_CONFIGURE= yes
-USE_TOOLS= perl pkg-config
+USE_LANGUAGES= c c++
USE_LIBTOOL= yes
+USE_TOOLS+= bash perl pkg-config
-CONFIGURE_ARGS+= --with-hdf5=no
-# Fix installation:
+CONFIG_SHELL= bash
+CONFIGURE_ARGS+= --bindir=${PREFIX}/bin
CONFIGURE_ARGS+= --htmldir=${PREFIX}/share/doc/${PKGNAME_NOREV}/html
+CONFIGURE_ARGS+= --with-munge=${BUILDLINK_PREFIX.munge}
+CONFIGURE_ARGS+= --with-hwloc=${PREFIX}
+CONFIGURE_ARGS+= --with-json=${PREFIX}
+CONFIGURE_ARGS+= --with-libssh2=${PREFIX}
-REPLACE_PYTHON= doc/html/shtml2html.py
+LDFLAGS+= -llz4
+
+REPLACE_PYTHON= doc/html/shtml2html.py
+REPLACE_PYTHON+= doc/man/man2html.py
+REPLACE_PYTHON+= testsuite/expect/regression.py
+REPLACE_PYTHON+= testsuite/expect/driveregress.py
+REPLACE_PYTHON+= contribs/cray/csm/slurmconfgen_smw.py
PKG_GROUPS= slurm
PKG_USERS= slurm:slurm
@@ -30,20 +43,49 @@
PKG_GECOS.slurm= SLURM user
PKG_SHELL.slurm= ${NOLOGIN}
-RCD_SCRIPTS+= slurmd slurmctld
+RCD_SCRIPTS+= slurmd slurmctld
+
+SUBST_CLASSES+= linuxinit
+SUBST_STAGE.linuxinit= post-patch
+SUBST_FILES.linuxinit= etc/init.d.slurm.in
+SUBST_SED.linuxinit= -e 's|^exec_prefix=|&${PREFIX}|'
+SUBST_SED.linuxinit+= -e 's|^prefix=|&${PREFIX}|'
+SUBST_SED.linuxinit+= -e 's|@bindir@|$${exec_prefix}/bin|'
+SUBST_SED.linuxinit+= -e 's|@sbindir@|$${exec_prefix}/sbin|'
+SUBST_SED.linuxinit+= -e 's|@libdir@|$${exec_prefix}/lib|'
+SUBST_SED.linuxinit+= -e 's|@sysconfdir@|$${prefix}/etc|'
+
+# Configure flag to disable gtk does not work, so set an impossible requirement
+SUBST_CLASSES+= gtk
+SUBST_STAGE.gtk= post-patch
+SUBST_SED.gtk= -e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|'
+SUBST_FILES.gtk= configure
+
+SUBST_CLASSES+= make-ex
+SUBST_STAGE.make-ex= post-install
+SUBST_FILES.make-ex= etc/Makefile
+SUBST_SED.make-ex= -e 's|${WRKDIR}|<build-prefix>|g'
+
+INSTALLATION_DIRS+= share/examples/${PKGBASE}
post-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}
- ${INSTALL_DATA} ${WRKSRC}/etc/* ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}/
+ ${RM} -f ${WRKSRC}/etc/init.d.slurm.in.orig
+ ${INSTALL_DATA} ${WRKSRC}/etc/* \
+ ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}/
-PYTHON_FOR_BUILD_ONLY= yes
+.include "../../www/curl/buildlink3.mk"
.include "../../lang/python/tool.mk"
-
-CONFIGURE_ARGS+= --with-munge=${BUILDLINK_PREFIX.munge:Q}
.include "../../security/munge/buildlink3.mk" # optional
+.include "../../parallel/hwloc/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+.include "../../devel/hdf5/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../archivers/lz4/buildlink3.mk"
+.include "../../textproc/json-c/buildlink3.mk"
+.include "../../security/libssh2/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/pam.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 06b53c012da9 -r 20b650c9dec1 parallel/slurm/PLIST
--- a/parallel/slurm/PLIST Sun Mar 25 12:05:01 2018 +0000
+++ b/parallel/slurm/PLIST Sun Mar 25 14:55:29 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/12/06 06:05:30 asau Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/03/25 14:55:29 bacon Exp $
bin/sacct
bin/sacctmgr
bin/salloc
@@ -8,6 +8,7 @@
bin/scancel
bin/scontrol
bin/sdiag
+bin/sh5util
bin/sinfo
bin/smap
bin/sprio
@@ -21,53 +22,74 @@
include/slurm/slurm.h
include/slurm/slurm_errno.h
include/slurm/slurmdb.h
+include/slurm/smd_ns.h
include/slurm/spank.h
lib/libpmi.la
lib/libslurm.la
lib/libslurmdb.la
lib/slurm/accounting_storage_filetxt.la
+lib/slurm/accounting_storage_mysql.la
lib/slurm/accounting_storage_none.la
lib/slurm/accounting_storage_slurmdbd.la
+lib/slurm/acct_gather_energy_cray.la
+lib/slurm/acct_gather_energy_ibmaem.la
lib/slurm/acct_gather_energy_none.la
lib/slurm/acct_gather_energy_rapl.la
lib/slurm/acct_gather_filesystem_lustre.la
lib/slurm/acct_gather_filesystem_none.la
-lib/slurm/acct_gather_infiniband_none.la
+lib/slurm/acct_gather_interconnect_none.la
+lib/slurm/acct_gather_profile_hdf5.la
lib/slurm/acct_gather_profile_none.la
lib/slurm/auth_munge.la
lib/slurm/auth_none.la
+lib/slurm/burst_buffer_cray.la
+lib/slurm/burst_buffer_generic.la
lib/slurm/checkpoint_none.la
lib/slurm/checkpoint_ompi.la
+lib/slurm/core_spec_cray.la
+lib/slurm/core_spec_none.la
lib/slurm/crypto_munge.la
lib/slurm/crypto_openssl.la
lib/slurm/ext_sensors_none.la
lib/slurm/gres_gpu.la
lib/slurm/gres_mic.la
lib/slurm/gres_nic.la
+lib/slurm/job_container_cncu.la
+lib/slurm/job_container_none.la
lib/slurm/job_submit_all_partitions.la
-lib/slurm/job_submit_cnode.la
+lib/slurm/job_submit_cray.la
lib/slurm/job_submit_defaults.la
lib/slurm/job_submit_logging.la
+lib/slurm/job_submit_lua.la
lib/slurm/job_submit_partition.la
lib/slurm/job_submit_pbs.la
lib/slurm/job_submit_require_timelimit.la
-lib/slurm/jobacct_gather_aix.la
+lib/slurm/job_submit_throttle.la
lib/slurm/jobacct_gather_cgroup.la
lib/slurm/jobacct_gather_linux.la
lib/slurm/jobacct_gather_none.la
+lib/slurm/jobcomp_elasticsearch.la
lib/slurm/jobcomp_filetxt.la
+lib/slurm/jobcomp_mysql.la
lib/slurm/jobcomp_none.la
lib/slurm/jobcomp_script.la
lib/slurm/launch_slurm.la
-lib/slurm/mpi_lam.la
-lib/slurm/mpi_mpich1_p4.la
-lib/slurm/mpi_mpich1_shmem.la
-lib/slurm/mpi_mpichgm.la
-lib/slurm/mpi_mpichmx.la
-lib/slurm/mpi_mvapich.la
+lib/slurm/layouts_power_cpufreq.la
+lib/slurm/layouts_power_default.la
+lib/slurm/layouts_unit_default.la
+lib/slurm/libslurmfull.la
+lib/slurm/mcs_account.la
+lib/slurm/mcs_group.la
+lib/slurm/mcs_none.la
+lib/slurm/mcs_user.la
lib/slurm/mpi_none.la
lib/slurm/mpi_openmpi.la
lib/slurm/mpi_pmi2.la
+lib/slurm/node_features_knl_cray.la
+lib/slurm/node_features_knl_generic.la
+lib/slurm/power_cray.la
+lib/slurm/power_none.la
+lib/slurm/preempt_job_prio.la
lib/slurm/preempt_none.la
lib/slurm/preempt_partition_prio.la
lib/slurm/preempt_qos.la
@@ -75,23 +97,30 @@
lib/slurm/priority_multifactor.la
lib/slurm/proctrack_cgroup.la
lib/slurm/proctrack_linuxproc.la
+lib/slurm/proctrack_lua.la
lib/slurm/proctrack_pgid.la
+lib/slurm/route_default.la
+lib/slurm/route_topology.la
lib/slurm/sched_backfill.la
lib/slurm/sched_builtin.la
lib/slurm/sched_hold.la
-lib/slurm/sched_wiki.la
-lib/slurm/sched_wiki2.la
+lib/slurm/select_alps.la
lib/slurm/select_cons_res.la
lib/slurm/select_cray.la
lib/slurm/select_linear.la
lib/slurm/select_serial.la
+lib/slurm/slurmctld_nonstop.la
lib/slurm/spank_pbs.la
lib/slurm/src/sattach/sattach.wrapper.c
lib/slurm/src/srun/srun.wrapper.c
+lib/slurm/switch_cray.la
+lib/slurm/switch_generic.la
lib/slurm/switch_none.la
lib/slurm/task_cgroup.la
+lib/slurm/task_cray.la
lib/slurm/task_none.la
lib/slurm/topology_3d_torus.la
+lib/slurm/topology_hypercube.la
lib/slurm/topology_node_rank.la
lib/slurm/topology_none.la
lib/slurm/topology_tree.la
@@ -112,15 +141,13 @@
man/man1/squeue.1
man/man1/sreport.1
man/man1/srun.1
-man/man1/srun_cr.1
man/man1/sshare.1
man/man1/sstat.1
man/man1/strigger.1
-man/man1/sview.1
+man/man3/slurm_allocate_pack_job_blocking.3
man/man3/slurm_allocate_resources.3
man/man3/slurm_allocate_resources_blocking.3
man/man3/slurm_allocation_lookup.3
-man/man3/slurm_allocation_lookup_lite.3
man/man3/slurm_allocation_msg_thr_create.3
man/man3/slurm_allocation_msg_thr_destroy.3
man/man3/slurm_api_version.3
@@ -146,6 +173,7 @@
man/man3/slurm_free_ctl_conf.3
man/man3/slurm_free_front_end_info_msg.3
man/man3/slurm_free_job_alloc_info_response_msg.3
+man/man3/slurm_free_job_array_resp.3
man/man3/slurm_free_job_info_msg.3
man/man3/slurm_free_job_step_create_response_msg.3
man/man3/slurm_free_job_step_info_response_msg.3
@@ -181,6 +209,7 @@
man/man3/slurm_job_step_layout_free.3
man/man3/slurm_job_step_layout_get.3
man/man3/slurm_job_will_run.3
+man/man3/slurm_job_will_run2.3
man/man3/slurm_jobinfo_ctx_get.3
man/man3/slurm_kill_job.3
man/man3/slurm_kill_job_step.3
@@ -195,6 +224,8 @@
man/man3/slurm_load_reservations.3
man/man3/slurm_load_slurmd_status.3
Home |
Main Index |
Thread Index |
Old Index