diff options
author | bacon <bacon@pkgsrc.org> | 2018-03-25 14:55:29 +0000 |
---|---|---|
committer | bacon <bacon@pkgsrc.org> | 2018-03-25 14:55:29 +0000 |
commit | de7d026d3e242cc27b5ded755d884526275b3199 (patch) | |
tree | ec67eced764c4ba6fe520f70bc2932d4a75f9ecf /parallel | |
parent | ca34e1b4271506ff701380a2cf3e4598f591ad96 (diff) | |
download | pkgsrc-de7d026d3e242cc27b5ded755d884526275b3199.tar.gz |
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
Install example Linux init scripts
Diffstat (limited to 'parallel')
33 files changed, 446 insertions, 309 deletions
diff --git a/parallel/slurm/DESCR b/parallel/slurm/DESCR index c8991363336..655b1afe27c 100644 --- a/parallel/slurm/DESCR +++ b/parallel/slurm/DESCR @@ -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 --git a/parallel/slurm/Makefile b/parallel/slurm/Makefile index fdddbae689f..2a0dbd0484e 100644 --- a/parallel/slurm/Makefile +++ b/parallel/slurm/Makefile @@ -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 +MAINTAINER= bacon@NetBSD.org 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_USERS= slurm:slurm 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 --git a/parallel/slurm/PLIST b/parallel/slurm/PLIST index fa100c6cf33..503e10c5b01 100644 --- a/parallel/slurm/PLIST +++ b/parallel/slurm/PLIST @@ -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/sbcast bin/scancel bin/scontrol bin/sdiag +bin/sh5util bin/sinfo bin/smap bin/sprio @@ -21,53 +22,74 @@ 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.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_basic.la 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/sprio.1 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_delete_reservation.3 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_launch_t_init.3 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_partitions.3 man/man3/slurm_load_reservations.3 man/man3/slurm_load_slurmd_status.3 man/man3/slurm_notify_job.3 +man/man3/slurm_pack_job_lookup.3 +man/man3/slurm_pack_job_will_run.3 man/man3/slurm_perror.3 man/man3/slurm_pid2jobid.3 man/man3/slurm_ping.3 @@ -215,7 +246,9 @@ man/man3/slurm_print_slurmd_status.3 man/man3/slurm_read_hostfile.3 man/man3/slurm_reconfigure.3 man/man3/slurm_requeue.3 +man/man3/slurm_requeue2.3 man/man3/slurm_resume.3 +man/man3/slurm_resume2.3 man/man3/slurm_set_debug_level.3 man/man3/slurm_set_trigger.3 man/man3/slurm_shutdown.3 @@ -242,25 +275,29 @@ man/man3/slurm_step_launch_wait_start.3 man/man3/slurm_strerror.3 man/man3/slurm_submit_batch_job.3 man/man3/slurm_suspend.3 +man/man3/slurm_suspend2.3 man/man3/slurm_takeover.3 man/man3/slurm_terminate_job.3 man/man3/slurm_terminate_job_step.3 man/man3/slurm_update_front_end.3 man/man3/slurm_update_job.3 +man/man3/slurm_update_job2.3 man/man3/slurm_update_node.3 man/man3/slurm_update_partition.3 man/man3/slurm_update_reservation.3 man/man3/slurm_update_step.3 man/man5/acct_gather.conf.5 man/man5/bluegene.conf.5 +man/man5/burst_buffer.conf.5 man/man5/cgroup.conf.5 man/man5/cray.conf.5 man/man5/ext_sensors.conf.5 man/man5/gres.conf.5 +man/man5/knl.conf.5 +man/man5/nonstop.conf.5 man/man5/slurm.conf.5 man/man5/slurmdbd.conf.5 man/man5/topology.conf.5 -man/man5/wiki.conf.5 man/man8/slurmctld.8 man/man8/slurmd.8 man/man8/slurmdbd.8 @@ -274,6 +311,7 @@ share/doc/${PKGNAME}/html/Slurm_Entity.pdf share/doc/${PKGNAME}/html/Slurm_Individual.pdf share/doc/${PKGNAME}/html/accounting.html share/doc/${PKGNAME}/html/accounting_storageplugins.html +share/doc/${PKGNAME}/html/acct_gather.conf.html share/doc/${PKGNAME}/html/acct_gather_energy_plugins.html share/doc/${PKGNAME}/html/acct_gather_profile_plugins.html share/doc/${PKGNAME}/html/add.html @@ -281,9 +319,13 @@ share/doc/${PKGNAME}/html/allocation_pies.gif share/doc/${PKGNAME}/html/api.html share/doc/${PKGNAME}/html/arch.gif share/doc/${PKGNAME}/html/authplugins.html +share/doc/${PKGNAME}/html/bb_plugins.html share/doc/${PKGNAME}/html/big_sys.html +share/doc/${PKGNAME}/html/bluegene.conf.html share/doc/${PKGNAME}/html/bluegene.html -share/doc/${PKGNAME}/html/bull.jpg +share/doc/${PKGNAME}/html/burst_buffer.conf.html +share/doc/${PKGNAME}/html/burst_buffer.html +share/doc/${PKGNAME}/html/cgroup.conf.html share/doc/${PKGNAME}/html/cgroups.html share/doc/${PKGNAME}/html/checkpoint_blcr.html share/doc/${PKGNAME}/html/checkpoint_plugins.html @@ -293,53 +335,68 @@ share/doc/${PKGNAME}/html/configurator.html share/doc/${PKGNAME}/html/cons_res.html share/doc/${PKGNAME}/html/cons_res_share.html share/doc/${PKGNAME}/html/contributor.html +share/doc/${PKGNAME}/html/core_spec.html +share/doc/${PKGNAME}/html/core_spec_plugins.html share/doc/${PKGNAME}/html/cpu_management.html +share/doc/${PKGNAME}/html/cray.conf.html share/doc/${PKGNAME}/html/cray.html +share/doc/${PKGNAME}/html/cray_alps.html share/doc/${PKGNAME}/html/crypto_plugins.html share/doc/${PKGNAME}/html/disclaimer.html share/doc/${PKGNAME}/html/dist_plane.html share/doc/${PKGNAME}/html/documentation.html share/doc/${PKGNAME}/html/download.html -share/doc/${PKGNAME}/html/dynalloc.html share/doc/${PKGNAME}/html/elastic_computing.html share/doc/${PKGNAME}/html/entities.gif share/doc/${PKGNAME}/html/example_usage.gif +share/doc/${PKGNAME}/html/ext_sensors.conf.html share/doc/${PKGNAME}/html/ext_sensorsplugins.html +share/doc/${PKGNAME}/html/fair_tree.html share/doc/${PKGNAME}/html/faq.html +share/doc/${PKGNAME}/html/federation.html +share/doc/${PKGNAME}/html/fonts.css +share/doc/${PKGNAME}/html/fonts.ttf share/doc/${PKGNAME}/html/gang_scheduling.html +share/doc/${PKGNAME}/html/gres.conf.html share/doc/${PKGNAME}/html/gres.html share/doc/${PKGNAME}/html/gres_design.html share/doc/${PKGNAME}/html/gres_plugins.html share/doc/${PKGNAME}/html/hdf5_job_outline.png share/doc/${PKGNAME}/html/hdf5_profile_user_guide.html share/doc/${PKGNAME}/html/hdf5_task_attr.png -share/doc/${PKGNAME}/html/help.html +share/doc/${PKGNAME}/html/heterogeneous_jobs.html share/doc/${PKGNAME}/html/high_throughput.html share/doc/${PKGNAME}/html/ibm-pe.html -share/doc/${PKGNAME}/html/ibm.html share/doc/${PKGNAME}/html/ibm_pe_fig1.png share/doc/${PKGNAME}/html/ibm_pe_fig2.png +share/doc/${PKGNAME}/html/intel_knl.html share/doc/${PKGNAME}/html/job_array.html +share/doc/${PKGNAME}/html/job_container_plugins.html share/doc/${PKGNAME}/html/job_exit_code.html share/doc/${PKGNAME}/html/job_launch.html share/doc/${PKGNAME}/html/job_submit_plugins.html share/doc/${PKGNAME}/html/jobacct_gatherplugins.html share/doc/${PKGNAME}/html/jobcompplugins.html +share/doc/${PKGNAME}/html/jquery.min.js +share/doc/${PKGNAME}/html/k_function.gif +share/doc/${PKGNAME}/html/knl.conf.html share/doc/${PKGNAME}/html/launch_plugins.html -share/doc/${PKGNAME}/html/linuxstyles.css -share/doc/${PKGNAME}/html/lll.gif +share/doc/${PKGNAME}/html/licenses.html share/doc/${PKGNAME}/html/mail.html share/doc/${PKGNAME}/html/man_index.html -share/doc/${PKGNAME}/html/maui.html share/doc/${PKGNAME}/html/mc_support.gif share/doc/${PKGNAME}/html/mc_support.html +share/doc/${PKGNAME}/html/mcs.html +share/doc/${PKGNAME}/html/mcs_plugins.html share/doc/${PKGNAME}/html/meetings.html -share/doc/${PKGNAME}/html/moab.html share/doc/${PKGNAME}/html/mpi_guide.html share/doc/${PKGNAME}/html/mpiplugins.html share/doc/${PKGNAME}/html/multi_cluster.html share/doc/${PKGNAME}/html/news.html +share/doc/${PKGNAME}/html/node_features_plugins.html +share/doc/${PKGNAME}/html/nonstop.conf.html share/doc/${PKGNAME}/html/overview.html +share/doc/${PKGNAME}/html/pam_slurm_adopt.html share/doc/${PKGNAME}/html/plane_ex1.gif share/doc/${PKGNAME}/html/plane_ex2.gif share/doc/${PKGNAME}/html/plane_ex3.gif @@ -349,11 +406,13 @@ share/doc/${PKGNAME}/html/plane_ex6.gif share/doc/${PKGNAME}/html/plane_ex7.gif share/doc/${PKGNAME}/html/platforms.html share/doc/${PKGNAME}/html/plugins.html +share/doc/${PKGNAME}/html/power_mgmt.html +share/doc/${PKGNAME}/html/power_plugins.html share/doc/${PKGNAME}/html/power_save.html share/doc/${PKGNAME}/html/preempt.html share/doc/${PKGNAME}/html/preemption_plugins.html share/doc/${PKGNAME}/html/priority_multifactor.html -share/doc/${PKGNAME}/html/priority_multifactor2.html +share/doc/${PKGNAME}/html/priority_multifactor3.html share/doc/${PKGNAME}/html/priority_plugins.html share/doc/${PKGNAME}/html/proctrack_plugins.html share/doc/${PKGNAME}/html/programmer_guide.html @@ -363,42 +422,85 @@ share/doc/${PKGNAME}/html/qos.html share/doc/${PKGNAME}/html/quickstart.html share/doc/${PKGNAME}/html/quickstart_admin.html share/doc/${PKGNAME}/html/reservations.html +share/doc/${PKGNAME}/html/reset.css share/doc/${PKGNAME}/html/resource_limits.html share/doc/${PKGNAME}/html/rosetta.html +share/doc/${PKGNAME}/html/route_plugin.html +share/doc/${PKGNAME}/html/rpc.html +share/doc/${PKGNAME}/html/sacct.html +share/doc/${PKGNAME}/html/sacctmgr.html +share/doc/${PKGNAME}/html/salloc.html +share/doc/${PKGNAME}/html/sattach.html +share/doc/${PKGNAME}/html/sbatch.html +share/doc/${PKGNAME}/html/sbcast.html +share/doc/${PKGNAME}/html/scancel.html +share/doc/${PKGNAME}/html/sched_config.html share/doc/${PKGNAME}/html/schedmd.png share/doc/${PKGNAME}/html/schedplugins.html +share/doc/${PKGNAME}/html/scontrol.html +share/doc/${PKGNAME}/html/sdiag.html share/doc/${PKGNAME}/html/select_design.html share/doc/${PKGNAME}/html/selectplugins.html +share/doc/${PKGNAME}/html/sh5util.html +share/doc/${PKGNAME}/html/sinfo.html +share/doc/${PKGNAME}/html/slurm.conf.html +share/doc/${PKGNAME}/html/slurm.css share/doc/${PKGNAME}/html/slurm.html -share/doc/${PKGNAME}/html/slurm_design.pdf share/doc/${PKGNAME}/html/slurm_logo.png share/doc/${PKGNAME}/html/slurm_ug_agenda.html share/doc/${PKGNAME}/html/slurm_ug_cfp.html -share/doc/${PKGNAME}/html/slurm_ug_registration.html +share/doc/${PKGNAME}/html/slurmctld.html share/doc/${PKGNAME}/html/slurmctld_plugstack.html -share/doc/${PKGNAME}/html/slurmstyles.css -share/doc/${PKGNAME}/html/sponsors.gif -share/doc/${PKGNAME}/html/sun_const.html +share/doc/${PKGNAME}/html/slurmd.html +share/doc/${PKGNAME}/html/slurmdbd.conf.html +share/doc/${PKGNAME}/html/slurmdbd.html +share/doc/${PKGNAME}/html/slurmstepd.html +share/doc/${PKGNAME}/html/smap.html +share/doc/${PKGNAME}/html/spank.html +share/doc/${PKGNAME}/html/sprio.html +share/doc/${PKGNAME}/html/squeue.html +share/doc/${PKGNAME}/html/squeue_color.png +share/doc/${PKGNAME}/html/sreport.html +share/doc/${PKGNAME}/html/srun.html +share/doc/${PKGNAME}/html/sshare.html +share/doc/${PKGNAME}/html/sstat.html +share/doc/${PKGNAME}/html/strigger.html +share/doc/${PKGNAME}/html/style.css share/doc/${PKGNAME}/html/switchplugins.html share/doc/${PKGNAME}/html/taskplugins.html share/doc/${PKGNAME}/html/team.html share/doc/${PKGNAME}/html/testimonials.html share/doc/${PKGNAME}/html/topo_ex1.gif share/doc/${PKGNAME}/html/topo_ex2.gif +share/doc/${PKGNAME}/html/topology.conf.html share/doc/${PKGNAME}/html/topology.html share/doc/${PKGNAME}/html/topology_plugin.html +share/doc/${PKGNAME}/html/tres.html share/doc/${PKGNAME}/html/troubleshoot.html share/doc/${PKGNAME}/html/tutorial_intro_files.tar share/doc/${PKGNAME}/html/tutorials.html share/doc/${PKGNAME}/html/usage_pies.gif +share/doc/${PKGNAME}/html/user_permissions.html +share/doc/${PKGNAME}/html/wckey.html +share/examples/slurm/Makefile +share/examples/slurm/Makefile.am +share/examples/slurm/Makefile.in share/examples/slurm/bluegene.conf.example share/examples/slurm/cgroup.conf.example -share/examples/slurm/cgroup.release_common.example share/examples/slurm/cgroup_allowed_devices_file.conf.example share/examples/slurm/init.d.slurm share/examples/slurm/init.d.slurm.in share/examples/slurm/init.d.slurmdbd share/examples/slurm/init.d.slurmdbd.in +share/examples/slurm/layouts.d.power.conf.example +share/examples/slurm/layouts.d.power_cpufreq.conf.example +share/examples/slurm/layouts.d.unit.conf.example share/examples/slurm/slurm.conf.example share/examples/slurm/slurm.epilog.clean +share/examples/slurm/slurmctld.service +share/examples/slurm/slurmctld.service.in +share/examples/slurm/slurmd.service +share/examples/slurm/slurmd.service.in share/examples/slurm/slurmdbd.conf.example +share/examples/slurm/slurmdbd.service +share/examples/slurm/slurmdbd.service.in diff --git a/parallel/slurm/PLIST.Linux b/parallel/slurm/PLIST.Linux new file mode 100644 index 00000000000..9a3eea16a94 --- /dev/null +++ b/parallel/slurm/PLIST.Linux @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST.Linux,v 1.1 2018/03/25 14:55:29 bacon Exp $ +lib/slurm/task_affinity.la diff --git a/parallel/slurm/distinfo b/parallel/slurm/distinfo index 6931972cfe9..34148ffd5e9 100644 --- a/parallel/slurm/distinfo +++ b/parallel/slurm/distinfo @@ -1,24 +1,14 @@ -$NetBSD: distinfo,v 1.5 2015/11/02 23:46:13 agc Exp $ +$NetBSD: distinfo,v 1.6 2018/03/25 14:55:29 bacon Exp $ -SHA1 (slurm-2.6.4.tar.bz2) = 6a5850b53201d506a86ab23d13318be34395d237 -RMD160 (slurm-2.6.4.tar.bz2) = a6b4ab6782b0db0822acb2fd7efe6c1464b8a87c -SHA512 (slurm-2.6.4.tar.bz2) = 7aecf83350fddd1b6f6c901a133c30d7b27c3c548715583e6e9c4325c7d2deee883ff0f3806f67f098b4b85fdd86e5ccbf56959bb9377349582219ccbaa21e29 -Size (slurm-2.6.4.tar.bz2) = 5954130 bytes -SHA1 (patch-doc_html_Makefile.am) = 9152b1c6d735fbd106a5b2841b09b0c0d5fdbf9e -SHA1 (patch-doc_html_Makefile.in) = 237da04742791877d42d4b68805b2a513aab8f40 -SHA1 (patch-doc_man_man1_Makefile.am) = a131bb9ac16f2683dd0756fff4538a3213043503 -SHA1 (patch-doc_man_man1_Makefile.in) = 262ea869552b7ebd44b63e3df11a40b7172d2425 -SHA1 (patch-doc_man_man5_Makefile.am) = b6918b7bf767b203841c8450bb6ab05b3339b08c -SHA1 (patch-doc_man_man5_Makefile.in) = 6a6d6370c915041096a8b1784dc290f76cac6f1b -SHA1 (patch-doc_man_man8_Makefile.am) = 1a5e7a1139688b0ce127a020deab04402599485e -SHA1 (patch-doc_man_man8_Makefile.in) = 01efd7282aa9d1d011c283358cb4aa566f7c72d6 -SHA1 (patch-src_common_net.c) = 6a53ef7ef94afa1e48d929c635e900c9999e381b -SHA1 (patch-src_common_slurm__jobacct__gather.c) = abcb7c117c3efa95509d047ff7243fc98cfc00b7 -SHA1 (patch-src_common_xcgroup.c) = fd49ee490fc663635b0b5a3ce54ede7e6166b897 -SHA1 (patch-src_common_xcgroup.h) = 78e9021a725692c8a980556c000c4501c8009a75 -SHA1 (patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c) = 46cd8b130af2eb0c47de04ba2f24ffc1291c75ce -SHA1 (patch-src_slurmctld_reservation.c) = c02eb31c2b9dee32e1b68bb9ecf63acd34a987ca -SHA1 (patch-src_slurmd_common_setproctitle.c) = 1ac0cccd1f889a8a3e3d998bdb6392cfbca932e5 -SHA1 (patch-src_slurmd_slurmstepd_task.c) = b7afd7c2ed58b8423490e1117d6e82d7b0f3294b -SHA1 (patch-src_srun_libsrun_debugger.c) = 1d10d883c2f9931af3166980c70730ab9fa1df96 -SHA1 (patch-src_srun_libsrun_launch.c) = ff3cbfced383206f86f33c3a511334b95da9edc7 +SHA1 (slurm-17.11.5.tar.bz2) = fe29758ca8d81492e18d59b84968cedf17a6161b +RMD160 (slurm-17.11.5.tar.bz2) = 8d393e7ddf545ac1e8c81e8ddd9160a5e76d9311 +SHA512 (slurm-17.11.5.tar.bz2) = cb82e192bf0ab57fbc810fc3c9b32e90d4c28926b4a959514e3df51b63556b13d01057938d73da5bc0bea157bbd7712b1aad0712a913ad912bd7e6089fc0bd21 +Size (slurm-17.11.5.tar.bz2) = 6248551 bytes +SHA1 (patch-etc_init.d.slurm.in) = beaedd5385b4aad04583d2bc5a23557519f74ec5 +SHA1 (patch-src_plugins_task_cgroup_task__cgroup__memory.c) = 1accc4ebb9456699db477557ddc783e136fdff00 +SHA1 (patch-src_slurmd_common_task__plugin.c) = 0d6680b10b45648703fe7a57411e605992fd9040 +SHA1 (patch-src_slurmd_common_task__plugin.h) = d4ad9f350efe1e873809adfe9dc4f559634e9ba2 +SHA1 (patch-src_slurmd_slurmd_slurmd.c) = 67cac6d8b4545c9053b655a4da77db63f5de7e63 +SHA1 (patch-src_slurmd_slurmd_slurmd.h) = a610b0bbe5b6b04be70eb2f8eac2a231139e6d1a +SHA1 (patch-src_slurmd_slurmstepd_io.c) = b56782887621edb539be70d53dff8029a89e90ed +SHA1 (patch-src_slurmd_slurmstepd_task.c) = 7948c76ce65b0e5211486d2e7b1901664c1f7016 diff --git a/parallel/slurm/files/linux-slurm-enable b/parallel/slurm/files/linux-slurm-enable new file mode 100644 index 00000000000..b162759003e --- /dev/null +++ b/parallel/slurm/files/linux-slurm-enable @@ -0,0 +1,64 @@ +#!/bin/sh -e + +########################################################################## +# Script description: +# +# Arguments: +# +# Returns: +# +# History: +# Date Name Modification +# 2013-12-26 root Begin +########################################################################## + +usage() +{ + printf "Usage: $0 node-type\n" + exit 1 +} + + +########################################################################## +# Main +########################################################################## + +if [ $# != 1 ]; then + usage +fi + +node_type=$1 +#./munge-enable $node_type + +case $node_type in +'head') + prefix='/usr/pkg-1' + ;; +'compute') + prefix='/sharedapps/pkg-1' + ;; +*) + printf "$0 is only for head and compute nodes.\n" + exit 1 + ;; +esac + +# slurm.conf +if [ ! -e $prefix/etc/slurm.conf ]; then + printf "Missing $prefix/etc/slurm.conf. Copy it from head node.\n" + exit 1 +fi + +# Init script +#if [ ! -e /etc/init.d/slurm ]; then + printf "exec_prefix=/$prefix\nprefix=$prefix\n\n" \ + > /etc/init.d/slurm + chmod 750 /etc/init.d/slurm + cat $prefix/share/examples/slurm/init.d.slurm >> /etc/init.d/slurm + chkconfig slurm on + service slurm restart +#fi + +mkdir -p /var/log/slurm +chown slurm:slurm /var/log/slurm + diff --git a/parallel/slurm/files/slurmctld.sh b/parallel/slurm/files/slurmctld.sh index 4e613e81432..b81e2eff9df 100644 --- a/parallel/slurm/files/slurmctld.sh +++ b/parallel/slurm/files/slurmctld.sh @@ -1,5 +1,5 @@ #!@RCD_SCRIPTS_SHELL@ -# $NetBSD: slurmctld.sh,v 1.1 2014/09/13 16:49:27 asau Exp $ +# $NetBSD: slurmctld.sh,v 1.2 2018/03/25 14:55:30 bacon Exp $ # # PROVIDE: slurmctld # REQUIRE: DAEMON munge diff --git a/parallel/slurm/files/slurmd.sh b/parallel/slurm/files/slurmd.sh index 13c81f29ebd..204e1413112 100644 --- a/parallel/slurm/files/slurmd.sh +++ b/parallel/slurm/files/slurmd.sh @@ -1,5 +1,5 @@ #!@RCD_SCRIPTS_SHELL@ -# $NetBSD: slurmd.sh,v 1.1 2014/09/13 16:49:27 asau Exp $ +# $NetBSD: slurmd.sh,v 1.2 2018/03/25 14:55:30 bacon Exp $ # # PROVIDE: slurmd # REQUIRE: DAEMON munge @@ -11,7 +11,7 @@ name="slurmd" rcvar=${name} command="@PREFIX@/sbin/slurmd" -slurmd_user="slurm" +slurmd_user="root" load_rc_config $name run_rc_command "$1" diff --git a/parallel/slurm/patches/patch-doc_html_Makefile.am b/parallel/slurm/patches/patch-doc_html_Makefile.am deleted file mode 100644 index dfd6b0289d3..00000000000 --- a/parallel/slurm/patches/patch-doc_html_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-doc_html_Makefile.am,v 1.2 2013/12/06 06:05:30 asau Exp $ - ---- doc/html/Makefile.am.orig 2013-11-04 21:19:15.000000000 +0000 -+++ doc/html/Makefile.am -@@ -1,6 +1,3 @@ -- --htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html -- - generated_html = \ - accounting.html \ - accounting_storageplugins.html \ diff --git a/parallel/slurm/patches/patch-doc_html_Makefile.in b/parallel/slurm/patches/patch-doc_html_Makefile.in deleted file mode 100644 index 335e9e1c73f..00000000000 --- a/parallel/slurm/patches/patch-doc_html_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-doc_html_Makefile.in,v 1.2 2013/12/06 06:05:30 asau Exp $ - ---- doc/html/Makefile.in.orig 2013-11-04 21:19:15.000000000 +0000 -+++ doc/html/Makefile.in -@@ -341,7 +341,7 @@ host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ --htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html -+htmldir = @htmldir@ - includedir = @includedir@ - infodir = @infodir@ - install_sh = @install_sh@ diff --git a/parallel/slurm/patches/patch-doc_man_man1_Makefile.am b/parallel/slurm/patches/patch-doc_man_man1_Makefile.am deleted file mode 100644 index ce9d18c54bd..00000000000 --- a/parallel/slurm/patches/patch-doc_man_man1_Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-doc_man_man1_Makefile.am,v 1.2 2013/12/06 06:05:30 asau Exp $ - ---- doc/man/man1/Makefile.am.orig 2013-11-04 21:19:15.000000000 +0000 -+++ doc/man/man1/Makefile.am -@@ -1,5 +1,3 @@ --htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html -- - man1_MANS = \ - sacct.1 \ - sacctmgr.1 \ diff --git a/parallel/slurm/patches/patch-doc_man_man1_Makefile.in b/parallel/slurm/patches/patch-doc_man_man1_Makefile.in deleted file mode 100644 index 32a542af2bf..00000000000 --- a/parallel/slurm/patches/patch-doc_man_man1_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-doc_man_man1_Makefile.in,v 1.2 2013/12/06 06:05:30 asau Exp $ - ---- doc/man/man1/Makefile.in.orig 2013-11-04 21:19:15.000000000 +0000 -+++ doc/man/man1/Makefile.in -@@ -343,7 +343,7 @@ host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ --htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html -+htmldir = @htmldir@ - includedir = @includedir@ - infodir = @infodir@ - install_sh = @install_sh@ diff --git a/parallel/slurm/patches/patch-doc_man_man5_Makefile.am b/parallel/slurm/patches/patch-doc_man_man5_Makefile.am deleted file mode 100644 index e09c0aa9648..00000000000 --- a/parallel/slurm/patches/patch-doc_man_man5_Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-doc_man_man5_Makefile.am,v 1.2 2013/12/06 06:05:30 asau Exp $ - ---- doc/man/man5/Makefile.am.orig 2013-11-04 21:19:15.000000000 +0000 -+++ doc/man/man5/Makefile.am -@@ -1,5 +1,3 @@ --htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html -- - man5_MANS = \ - acct_gather.conf.5 \ - bluegene.conf.5 \ diff --git a/parallel/slurm/patches/patch-doc_man_man5_Makefile.in b/parallel/slurm/patches/patch-doc_man_man5_Makefile.in deleted file mode 100644 index 32cc2885c37..00000000000 --- a/parallel/slurm/patches/patch-doc_man_man5_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-doc_man_man5_Makefile.in,v 1.2 2013/12/06 06:05:30 asau Exp $ - ---- doc/man/man5/Makefile.in.orig 2013-11-04 21:19:15.000000000 +0000 -+++ doc/man/man5/Makefile.in -@@ -343,7 +343,7 @@ host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ --htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html -+htmldir = @htmldir@ - includedir = @includedir@ - infodir = @infodir@ - install_sh = @install_sh@ diff --git a/parallel/slurm/patches/patch-doc_man_man8_Makefile.am b/parallel/slurm/patches/patch-doc_man_man8_Makefile.am deleted file mode 100644 index c7547823cc6..00000000000 --- a/parallel/slurm/patches/patch-doc_man_man8_Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-doc_man_man8_Makefile.am,v 1.2 2013/12/06 06:05:30 asau Exp $ - ---- doc/man/man8/Makefile.am.orig 2013-11-04 21:19:15.000000000 +0000 -+++ doc/man/man8/Makefile.am -@@ -1,5 +1,3 @@ --htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html -- - man8_MANS = slurmctld.8 \ - slurmd.8 \ - slurmdbd.8 \ diff --git a/parallel/slurm/patches/patch-doc_man_man8_Makefile.in b/parallel/slurm/patches/patch-doc_man_man8_Makefile.in deleted file mode 100644 index 216ce67f93f..00000000000 --- a/parallel/slurm/patches/patch-doc_man_man8_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-doc_man_man8_Makefile.in,v 1.2 2013/12/06 06:05:30 asau Exp $ - ---- doc/man/man8/Makefile.in.orig 2013-11-04 21:19:15.000000000 +0000 -+++ doc/man/man8/Makefile.in -@@ -343,7 +343,7 @@ host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ --htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@/html -+htmldir = @htmldir@ - includedir = @includedir@ - infodir = @infodir@ - install_sh = @install_sh@ diff --git a/parallel/slurm/patches/patch-etc_init.d.slurm.in b/parallel/slurm/patches/patch-etc_init.d.slurm.in new file mode 100644 index 00000000000..09f75eb2121 --- /dev/null +++ b/parallel/slurm/patches/patch-etc_init.d.slurm.in @@ -0,0 +1,16 @@ +$NetBSD: patch-etc_init.d.slurm.in,v 1.1 2018/03/25 14:55:30 bacon Exp $ + +# Provide something for SUBST to replace + +--- etc/init.d.slurm.in.orig 2015-03-19 19:38:01.000000000 +0000 ++++ etc/init.d.slurm.in +@@ -25,6 +25,9 @@ + # Description: Start slurm to provide resource management + ### END INIT INFO + ++exec_prefix= ++prefix= ++ + BINDIR="@bindir@" + CONFDIR="@sysconfdir@" + LIBDIR="@libdir@" diff --git a/parallel/slurm/patches/patch-src_common_net.c b/parallel/slurm/patches/patch-src_common_net.c deleted file mode 100644 index f473503843b..00000000000 --- a/parallel/slurm/patches/patch-src_common_net.c +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-src_common_net.c,v 1.1 2013/12/06 06:05:30 asau Exp $ - ---- src/common/net.c.orig 2013-11-04 21:19:15.000000000 +0000 -+++ src/common/net.c -@@ -52,7 +52,7 @@ - #include <errno.h> - #include <stdint.h> - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) - #define SOL_TCP IPPROTO_TCP - #endif - -@@ -216,7 +216,7 @@ extern int net_set_keep_alive(int sock) - * Removing this call might decrease the robustness of communications, - * but will probably have no noticable effect. - */ --#if ! defined(__FreeBSD__) || (__FreeBSD_version > 900000) -+#if (! defined(__FreeBSD__) || (__FreeBSD_version > 900000)) && ! defined(__APPLE__) - opt_int = keep_alive_time; - if (setsockopt(sock, SOL_TCP, TCP_KEEPIDLE, &opt_int, opt_len) < 0) { - error("Unable to set keep alive socket time: %m"); diff --git a/parallel/slurm/patches/patch-src_common_slurm__jobacct__gather.c b/parallel/slurm/patches/patch-src_common_slurm__jobacct__gather.c deleted file mode 100644 index 68a1a5b3e55..00000000000 --- a/parallel/slurm/patches/patch-src_common_slurm__jobacct__gather.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_common_slurm__jobacct__gather.c,v 1.1 2013/12/06 06:05:30 asau Exp $ - ---- src/common/slurm_jobacct_gather.c.orig 2013-11-04 21:19:15.000000000 +0000 -+++ src/common/slurm_jobacct_gather.c -@@ -47,7 +47,7 @@ - * Morris Jette, et al. - \*****************************************************************************/ - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) - #include <signal.h> - #endif - #include <pthread.h> diff --git a/parallel/slurm/patches/patch-src_common_xcgroup.c b/parallel/slurm/patches/patch-src_common_xcgroup.c deleted file mode 100644 index 35ca0581bbc..00000000000 --- a/parallel/slurm/patches/patch-src_common_xcgroup.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_common_xcgroup.c,v 1.1 2013/12/06 06:05:30 asau Exp $ - ---- src/common/xcgroup.c.orig 2013-11-04 21:19:15.000000000 +0000 -+++ src/common/xcgroup.c -@@ -217,7 +217,7 @@ int xcgroup_ns_mount(xcgroup_ns_t* cgns) - options = opt_combined; - } - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__APPLE__) - if (mount("cgroup", cgns->mnt_point, - MS_NOSUID|MS_NOEXEC|MS_NODEV, options)) - #else diff --git a/parallel/slurm/patches/patch-src_common_xcgroup.h b/parallel/slurm/patches/patch-src_common_xcgroup.h deleted file mode 100644 index 1841bacf729..00000000000 --- a/parallel/slurm/patches/patch-src_common_xcgroup.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_common_xcgroup.h,v 1.1 2013/12/06 06:05:30 asau Exp $ - ---- src/common/xcgroup.h.orig 2013-11-04 21:19:15.000000000 +0000 -+++ src/common/xcgroup.h -@@ -49,7 +49,7 @@ - #define XCGROUP_SUCCESS 0 - - // http://lists.debian.org/debian-boot/2012/04/msg00047.html --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) - #define MS_NOSUID MNT_NOSUID - #define MS_NOEXEC MNT_NOEXEC - #define MS_NODEV 0 diff --git a/parallel/slurm/patches/patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c b/parallel/slurm/patches/patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c deleted file mode 100644 index b4b456cdca9..00000000000 --- a/parallel/slurm/patches/patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-src_plugins_acct__gather__filesystem_lustre_acct__gather__filesystem__lustre.c,v 1.2 2014/03/19 22:05:39 asau Exp $ - ---- src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c.orig 2013-12-23 19:38:25.000000000 +0000 -+++ src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c -@@ -49,6 +49,9 @@ - #include <getopt.h> - #include <netinet/in.h> - -+#if defined(__NetBSD__) || defined(__FreeBSD__) -+#include <limits.h> /* PATH_MAX */ -+#endif - - #include "src/common/slurm_xlator.h" - #include "src/common/slurm_acct_gather_filesystem.h" diff --git a/parallel/slurm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c b/parallel/slurm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c new file mode 100644 index 00000000000..a484f378123 --- /dev/null +++ b/parallel/slurm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c @@ -0,0 +1,16 @@ +$NetBSD: patch-src_plugins_task_cgroup_task__cgroup__memory.c,v 1.1 2018/03/25 14:55:30 bacon Exp $ + +# Guard Linuxism? +--- src/plugins/task/cgroup/task_cgroup_memory.c.orig 2018-03-15 18:57:29.000000000 +0000 ++++ src/plugins/task/cgroup/task_cgroup_memory.c +@@ -39,7 +39,10 @@ + #include <poll.h> + #include <signal.h> + #include <stdlib.h> /* getenv */ ++// Should this be defined(__Linux__)? ++#if !defined(__NetBSD__) && !defined(__FreeBSD__) + #include <sys/eventfd.h> ++#endif + #include <sys/types.h> + #include <unistd.h> + diff --git a/parallel/slurm/patches/patch-src_slurmctld_reservation.c b/parallel/slurm/patches/patch-src_slurmctld_reservation.c deleted file mode 100644 index 3a89e6db136..00000000000 --- a/parallel/slurm/patches/patch-src_slurmctld_reservation.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_slurmctld_reservation.c,v 1.1 2013/12/06 06:05:30 asau Exp $ - ---- src/slurmctld/reservation.c.orig 2013-11-04 21:19:15.000000000 +0000 -+++ src/slurmctld/reservation.c -@@ -44,7 +44,7 @@ - # include <pthread.h> - #endif /* WITH_PTHREADS */ - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) - #include <signal.h> - #endif - diff --git a/parallel/slurm/patches/patch-src_slurmd_common_setproctitle.c b/parallel/slurm/patches/patch-src_slurmd_common_setproctitle.c deleted file mode 100644 index a00562a7c02..00000000000 --- a/parallel/slurm/patches/patch-src_slurmd_common_setproctitle.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_slurmd_common_setproctitle.c,v 1.1 2013/12/06 06:05:30 asau Exp $ - ---- src/slurmd/common/setproctitle.c.orig 2013-11-04 21:19:15.000000000 +0000 -+++ src/slurmd/common/setproctitle.c -@@ -90,7 +90,7 @@ - #include <stdlib.h> - #include <string.h> - #endif --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) - #include <stdio.h> - #endif - #ifndef HAVE_SETPROCTITLE diff --git a/parallel/slurm/patches/patch-src_slurmd_common_task__plugin.c b/parallel/slurm/patches/patch-src_slurmd_common_task__plugin.c new file mode 100644 index 00000000000..d21da8c7564 --- /dev/null +++ b/parallel/slurm/patches/patch-src_slurmd_common_task__plugin.c @@ -0,0 +1,30 @@ +$NetBSD: patch-src_slurmd_common_task__plugin.c,v 1.1 2018/03/25 14:55:30 bacon Exp $ + +# cpuset functions not standardized across platforms + +--- src/slurmd/common/task_plugin.c.orig 2018-01-05 18:03:10.000000000 +0000 ++++ src/slurmd/common/task_plugin.c +@@ -542,7 +542,11 @@ extern void task_slurm_chkaffinity(cpu_s + int statval) + { + char *bind_type, *action, *status, *units; ++#ifdef __NetBSD__ ++ char mstr[1 + cpuset_size(mask) / 4]; ++#else + char mstr[1 + CPU_SETSIZE / 4]; ++#endif + int task_gid = job->envtp->procid; + int task_lid = job->envtp->localid; + pid_t mypid = job->envtp->task_pid; +@@ -609,7 +613,11 @@ extern char *task_cpuset_to_str(const cp + char *ptr = str; + char *ret = NULL; + ++#ifdef __NetBSD__ ++ for (base = cpuset_size(mask) - 4; base >= 0; base -= 4) { ++#else + for (base = CPU_SETSIZE - 4; base >= 0; base -= 4) { ++#endif + char val = 0; + if (CPU_ISSET(base, mask)) + val |= 1; diff --git a/parallel/slurm/patches/patch-src_slurmd_common_task__plugin.h b/parallel/slurm/patches/patch-src_slurmd_common_task__plugin.h new file mode 100644 index 00000000000..8f371ce7e0f --- /dev/null +++ b/parallel/slurm/patches/patch-src_slurmd_common_task__plugin.h @@ -0,0 +1,23 @@ +$NetBSD: patch-src_slurmd_common_task__plugin.h,v 1.1 2018/03/25 14:55:30 bacon Exp $ + +# cpuset functions not standardized across platforms + +--- src/slurmd/common/task_plugin.h.orig 2018-01-04 21:15:01.000000000 +0000 ++++ src/slurmd/common/task_plugin.h +@@ -42,6 +42,16 @@ + + #include "src/slurmd/slurmstepd/slurmstepd_job.h" + ++// Keep in sync with slurmd/slurmd.h ++#ifdef __NetBSD__ ++#define cpu_set_t cpuset_t ++#define CPU_ZERO(c) cpuset_zero((c)) ++#define CPU_SET(i,c) cpuset_set((i),(c)) ++#define CPU_ISSET(i,c) cpuset_isset((i),(c)) ++#define sched_getaffinity sched_getaffinity_np ++#define SCHED_GETAFFINITY_THREE_ARGS ++#endif ++ + /* + * Initialize the task plugin. + * diff --git a/parallel/slurm/patches/patch-src_slurmd_slurmd_slurmd.c b/parallel/slurm/patches/patch-src_slurmd_slurmd_slurmd.c new file mode 100644 index 00000000000..13c203f8513 --- /dev/null +++ b/parallel/slurm/patches/patch-src_slurmd_slurmd_slurmd.c @@ -0,0 +1,29 @@ +$NetBSD: patch-src_slurmd_slurmd_slurmd.c,v 1.1 2018/03/25 14:55:30 bacon Exp $ + +# cpuset functions not standardized across platforms + +--- src/slurmd/slurmd/slurmd.c.orig 2018-01-04 21:15:01.000000000 +0000 ++++ src/slurmd/slurmd/slurmd.c +@@ -2067,7 +2067,13 @@ static int _core_spec_init(void) + uint32_t task_params; + bool slurmd_off_spec; + bitstr_t *res_mac_bitmap; ++#ifdef __NetBSD__ ++ cpuset_t *mask = cpuset_create(); ++#define CPU_SET_SIZE cpuset_size(mask) ++#else + cpu_set_t mask; ++#define CPU_SET_SIZE sizeof(cpu_set_t) ++#endif + + if ((conf->core_spec_cnt == 0) && (conf->cpu_spec_list == NULL)) { + debug("Resource spec: No specialized cores configured by " +@@ -2165,7 +2171,7 @@ static int _core_spec_init(void) + rval = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, + pid, sizeof(cpu_set_t), &mask); + #elif defined(SCHED_GETAFFINITY_THREE_ARGS) +- rval = sched_setaffinity(pid, sizeof(cpu_set_t), &mask); ++ rval = sched_setaffinity(pid, CPU_SET_SIZE, &mask); + #else + rval = sched_setaffinity(pid, &mask); + #endif diff --git a/parallel/slurm/patches/patch-src_slurmd_slurmd_slurmd.h b/parallel/slurm/patches/patch-src_slurmd_slurmd_slurmd.h new file mode 100644 index 00000000000..66fddde34e3 --- /dev/null +++ b/parallel/slurm/patches/patch-src_slurmd_slurmd_slurmd.h @@ -0,0 +1,23 @@ +$NetBSD: patch-src_slurmd_slurmd_slurmd.h,v 1.1 2018/03/25 14:55:30 bacon Exp $ + +# cpuset functions not standardized across platforms + +--- src/slurmd/slurmd/slurmd.h.orig 2018-01-04 21:15:01.000000000 +0000 ++++ src/slurmd/slurmd/slurmd.h +@@ -48,6 +48,16 @@ + #include "src/common/slurm_protocol_api.h" + #include "src/common/slurm_cred.h" + ++// Keep in sync with common/task_plugin.h ++#ifdef __NetBSD__ ++#define CPU_ZERO(c) cpuset_zero((c)) ++#define CPU_SET(i,c) cpuset_set((i),(c)) ++#define CPU_ISSET(i,c) cpuset_isset((i),(c)) ++#define sched_getaffinity sched_getaffinity_np ++#define sched_setaffinity sched_setaffinity_np ++#define SCHED_GETAFFINITY_THREE_ARGS ++#endif ++ + #ifndef __USE_XOPEN_EXTENDED + extern pid_t getsid(pid_t pid); /* missing from <unistd.h> */ + extern pid_t getpgid(pid_t pid); diff --git a/parallel/slurm/patches/patch-src_slurmd_slurmstepd_io.c b/parallel/slurm/patches/patch-src_slurmd_slurmstepd_io.c new file mode 100644 index 00000000000..f3a56ebb0f5 --- /dev/null +++ b/parallel/slurm/patches/patch-src_slurmd_slurmstepd_io.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_slurmd_slurmstepd_io.c,v 1.1 2018/03/25 14:55:30 bacon Exp $ + +# Portability + +--- src/slurmd/slurmstepd/io.c.orig 2018-01-05 23:43:03.000000000 +0000 ++++ src/slurmd/slurmstepd/io.c +@@ -45,6 +45,7 @@ + #endif + + #ifdef HAVE_UTMP_H ++# include <time.h> + # include <utmp.h> + #endif + diff --git a/parallel/slurm/patches/patch-src_slurmd_slurmstepd_task.c b/parallel/slurm/patches/patch-src_slurmd_slurmstepd_task.c index 2da1694adf5..3a17a7f2dda 100644 --- a/parallel/slurm/patches/patch-src_slurmd_slurmstepd_task.c +++ b/parallel/slurm/patches/patch-src_slurmd_slurmstepd_task.c @@ -1,18 +1,25 @@ -$NetBSD: patch-src_slurmd_slurmstepd_task.c,v 1.1 2013/12/06 06:05:30 asau Exp $ +$NetBSD: patch-src_slurmd_slurmstepd_task.c,v 1.2 2018/03/25 14:55:30 bacon Exp $ ---- src/slurmd/slurmstepd/task.c.orig 2013-11-04 21:19:15.000000000 +0000 +# Linux compat + +--- src/slurmd/slurmstepd/task.c.orig 2016-05-03 22:41:59.000000000 +0000 +++ src/slurmd/slurmstepd/task.c -@@ -501,7 +501,12 @@ _make_tmpdir(slurmd_job_t *job) +@@ -558,6 +558,18 @@ _make_tmpdir(stepd_step_rec_t *job) * still work with older systems we include this check. */ --#if defined(__FreeBSD__) +/* FIXME: Come up with a real solution for EUID instead of substituting RUID */ +#if defined(__NetBSD__) +#define eaccess(p,m) (access((p),(m))) ++#define HAVE_EACCESS 1 +#endif ++ ++// Unsure about the reason for this patch, but it dates back to SLURM 2.6.4 ++//#if defined(__FreeBSD__) || defined(__NetBSD__) ++//#define __GLIBC__ (1) ++//#define __GLIBC_PREREQ(a,b) (1) ++//#endif + -+#if defined(__FreeBSD__) || defined(__NetBSD__) - #define __GLIBC__ (1) - #define __GLIBC_PREREQ(a,b) (1) - #endif + #if defined(HAVE_FACCESSAT) + else if (faccessat(AT_FDCWD, tmpdir, X_OK|W_OK, AT_EACCESS)) + #elif defined(HAVE_EACCESS) diff --git a/parallel/slurm/patches/patch-src_srun_libsrun_debugger.c b/parallel/slurm/patches/patch-src_srun_libsrun_debugger.c deleted file mode 100644 index 0f8aae3da6c..00000000000 --- a/parallel/slurm/patches/patch-src_srun_libsrun_debugger.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_srun_libsrun_debugger.c,v 1.1 2013/12/06 06:05:30 asau Exp $ - ---- src/srun/libsrun/debugger.c.orig 2013-11-04 21:19:15.000000000 +0000 -+++ src/srun/libsrun/debugger.c -@@ -38,7 +38,7 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - \*****************************************************************************/ - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) - #include <signal.h> - #endif - diff --git a/parallel/slurm/patches/patch-src_srun_libsrun_launch.c b/parallel/slurm/patches/patch-src_srun_libsrun_launch.c deleted file mode 100644 index 0bfde117062..00000000000 --- a/parallel/slurm/patches/patch-src_srun_libsrun_launch.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_srun_libsrun_launch.c,v 1.1 2013/12/06 06:05:30 asau Exp $ - ---- src/srun/libsrun/launch.c.orig 2013-11-04 21:19:15.000000000 +0000 -+++ src/srun/libsrun/launch.c -@@ -36,7 +36,7 @@ - #include <stdlib.h> - #include <fcntl.h> - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) - #include <signal.h> - #endif - |