Permalink
Browse files

ENH: add torque-3.0.5

  • Loading branch information...
1 parent ce0e20d commit 4069aa05c3fd5a5216916c8712d1d09a44b6d0fc @npinto committed May 19, 2012
@@ -1,6 +1,43 @@
# ChangeLog for sys-cluster/torque
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.132 2012/01/18 16:36:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.141 2012/04/25 16:43:11 jlec Exp $
+
+ 25 Apr 2012; Justin Lecher <jlec@gentoo.org> torque-2.3.13.ebuild,
+ torque-2.4.16.ebuild, torque-3.0.3.ebuild, torque-3.0.4.ebuild:
+ Drop unnessecary die
+
+ 08 Mar 2012; Brent Baude <ranger@gentoo.org> torque-2.4.16.ebuild:
+ Marking torque-2.4.16 ppc64 for bug 397831
+
+ 07 Mar 2012; Justin Bronder <jsbronder@gentoo.org> torque-3.0.4.ebuild,
+ metadata.xml:
+ Enable nvidia gpu support re #400991
+
+*torque-3.0.4 (07 Mar 2012)
+
+ 07 Mar 2012; Justin Bronder <jsbronder@gentoo.org> +torque-3.0.4.ebuild:
+ version bump
+
+ 07 Mar 2012; Justin Bronder <jsbronder@gentoo.org> torque-2.3.13.ebuild,
+ torque-2.4.16.ebuild, torque-2.5.9.ebuild, torque-3.0.3.ebuild:
+ Correctly update src_uri
+
+ 07 Mar 2012; Justin Bronder <jsbronder@gentoo.org> torque-2.3.13.ebuild,
+ torque-2.4.16.ebuild, torque-2.5.9.ebuild, torque-3.0.3.ebuild:
+ Update homepage and src_uri
+
+ 07 Mar 2012; Justin Bronder <jsbronder@gentoo.org>
+ -files/0003-disable-automagic-doc-building-2.4.12.patch,
+ -torque-2.4.14.ebuild:
+ cleanup old
+
+ 06 Mar 2012; Brent Baude <ranger@gentoo.org> torque-2.4.16.ebuild:
+ Marking torque-2.4.16 ppc for bug 397831
+
+ 23 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> torque-2.3.13.ebuild,
+ torque-2.4.14.ebuild, torque-2.4.16.ebuild:
+ Fix dependency on app-doc/doxygen wrt converting useflag 'nodot' to 'dot'.
+ Fixes bug 405457 by Marien Zwart <marienz@gentoo.org>
18 Jan 2012; Jeroen Roovers <jer@gentoo.org> torque-2.4.16.ebuild:
Stable for HPPA (bug #397831).
@@ -2,14 +2,18 @@ AUX pbs_mom-gpu_string-buffer-overflow 401 RMD160 b06aa9ff2b72cac63de333613f53f2
AUX pbs_mom-init.d 1093 RMD160 ade6389bcda7974fd17c56c5f6f7a1c5b19c7fda SHA1 051455da4526b908ddb2346c912b68ba22245209 SHA256 ce5dfb1db62de8611974dcf15698dce75ef289f2a13d6a95039aec724748e64d
AUX pbs_mom-init.d-munge 1158 RMD160 ffc102972f3b635ae548af78f2e2e103448ccc45 SHA1 998c9c6eb89cee8f5707b36ea268462445febaee SHA256 ddd9f28a4c32bf09005ee2af0b7b930777dd46a95067b012ee4908b3ec5c3f92
AUX pbs_sched-init.d 1174 RMD160 d39789a7675487065094083c1ebb6da6e8246818 SHA1 c550cd7606da18a74e736c7f0d26d04deea3d34b SHA256 b1edba8149cc3962e147d8e16148113ad629c5c7ab54ea629d5c106aea337afe
-AUX pbs_server-init.d 1624 RMD160 219aa2087c42da6f71cee7a11eaa060e67a9c30f SHA1 59b915f5447f32dbd75d1b2d0c4ce6b77c961dac SHA256 40657ded082a7e0815d3efcd90a5ae9f2d1cf61b1a933a37366a73254874520b
+AUX pbs_server-init.d 1834 RMD160 f395f1ce0967b54988c30598cae2a1ff312ab1ec SHA1 a6bfe9b53ad377ddb30c26a92bae828702112e8c SHA256 2e0cadf71428f2f4189fba18f3f541998eadd2f98bab773a24c443e4894b0acb
AUX pbs_server-init.d-munge 1698 RMD160 0edde27c17b048f9f9ab9172446a20968a0fb9ba SHA1 df89d0ec6710e4a1dbd5d7dd7e79e881e258103b SHA256 e90bef374157860f92fc72182ffd7d422a3f8fca9abc2480cd296325cb656a6e
+AUX torque-3.0.5-cpusets.patch 5103 RMD160 f150f22f1f7f540ab03d3a6b3ea2a2bd4d2429d5 SHA1 a091409aeff69f167402eef2ce73ca000e20f725 SHA256 84949321076f18b8822c816605b38243742cf3b2771533686f0d880e5acf0260
+AUX torque-3.0.5-write_pid.patch 473 RMD160 9b9715e6fc9de6bef591984b555fb3d96f188838 SHA1 98b6de2a06d898c3faeda2f0c9d70c19972ba263 SHA256 b039f7454f25d96684d4f628a7b93dd389a745f121fee25d7e05dfabfe766d59
AUX torque-conf.d 649 RMD160 d8a8cec80a86fdea54545d64df9276db0386d688 SHA1 115fc52661a003b69be2dfb716e29f8d86461ca3 SHA256 4139da44a55dbcb4a8227fd0aedede8e091971fd63c0e08644712f4a91e7b174
AUX torque-conf.d-munge 784 RMD160 3cd95c08d31e54286fc57e24a93b800327f5abc3 SHA1 9026271b2eadce4999230f37e6dc7274026b6e10 SHA256 7b8e47737211fd0d05dcc7938021ea5dbb1575010c53075440ef0b6b5d43d8b1
AUX torque-env.d 260 RMD160 d16f5490599c9f2a2db493cdeedaf777e19bc6a4 SHA1 85ad40b92ec2573aae1536aa35995ca3d7deb222 SHA256 3f1c12897f3a5993a634da35a069360b0069ad189309175a0276d32b06b2d67a
DIST torque-3.0.4.tar.gz 5885721 RMD160 8679da928c00c7cf569a35cf7cce83e994626329 SHA1 074329b17b46eac3991bddbfeca4d646a5383d11 SHA256 f73780adf897a18b6e45a17bace3d4ad0091a20de51275c2ef770f1ce1243852
+DIST torque-3.0.5.tar.gz 5890335 RMD160 032185f0de962635c8110e632dc232c1f011045e SHA1 4da5b97f1cd3b7316f02559f6bb3fb70ba969b59 SHA256 1b17d69f28fbdf8eb44dde47f6c312a47ffc7514a5ba315d005058dfa312cd42
EBUILD torque-3.0.4-r1.ebuild 7906 RMD160 10dd3d065e842e409e7bad36b9d4015aef2e74c6 SHA1 ea933de6a384dc5f2ac55cf195400242676ee953 SHA256 5a39dd21b59fac2b59291a82bbd0a7f708a077081ecb0cd6fa864ec060c37b0a
EBUILD torque-3.0.4-r2.ebuild 7963 RMD160 8f20a0c9d6f5b4883b5d5fafaf92519291b52c71 SHA1 89600a69d56cc141918f6d49f7693890efc4bd5e SHA256 514e3b2ccb224014568e52e89e258df5f09169a208ffe4d2b4e472321aaf805a
EBUILD torque-3.0.4.ebuild 7907 RMD160 72528e9322c82c02b95a96c47b6791b9ea3bd934 SHA1 d2ba16cde194c5d3133153c7357ccd923abeb592 SHA256 c924f366c4ab969adfd0c1c2fa15527dfad1c1532393da56e54d95b3ef16e8b5
-MISC ChangeLog 21959 RMD160 1dad1654ebaeebf09db4d1a77f175233a488f6c2 SHA1 da6f38016f85f87d3d5001f8d2fad139da78eb03 SHA256 7a12a024aa2f8a1db1c0a220160c03ee69005b397d9a84235e9a7dd62d9701f2
-MISC metadata.xml 549 RMD160 9fb7dd9648470fa355b59cb855da7a1abbbc92d4 SHA1 3ce3726e415cf3e0a7aabb9bd71adee605d5cb5d SHA256 64bc2bf6a305af729513a2223a96b4255ce8e15391e4d22fda15d7b346baba4a
+EBUILD torque-3.0.5.ebuild 8075 RMD160 c47b725928efeac3f366e7902bee4a4f70cbc2a9 SHA1 433116863dc70f8fb6cbcdfe79611484ae88baae SHA256 008c3430c5138b06e2edc5b2826c37b437d5128312a1529b80cbc8f1d3c8a197
+MISC ChangeLog 23346 RMD160 25ff8b89e6c8b046334148e767ee1e19ef6b14c5 SHA1 776415a9d98e765ca3f57d995ce4bc541ef581d5 SHA256 59b54a12f18b82e0e65b5aa82020324afe97e196f8d424fb13a5b296f86183b0
+MISC metadata.xml 611 RMD160 6c342bd97b85abd6b673d74da3d268510b911ce9 SHA1 b71810fc0a447a6651c505caf189a66791e0face SHA256 80f22bc514020233d34ae83f25dd84b1696d053f0eeb32e924b55b8437ac1734
@@ -2,14 +2,15 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-. /etc/conf.d/torque
+. /etc/conf.d/torque
PBS_SERVER_HOME="$(. /etc/env.d/25torque; echo ${PBS_SERVER_HOME})"
depend() {
- need net
- before pbs_sched
- before pbs_mom
+ local _need="net"
+ before pbs_sched pbs_mom
after logger
+ [ ${PBS_USE_MUNGE} -ne 0 ] && _need="${_need} munged"
+ need ${_need}
}
checkconfig() {
@@ -53,8 +54,15 @@ stop() {
ewarn "PBS_SERVER_STOP is not defined, defaulting to quick"
stop_type=quick
fi
-
- /usr/bin/qterm -t ${stop_type} || start-stop-daemon --stop -p ${PBS_SERVER_HOME}/server_priv/server.lock
- eend ${?}
+
+ # workaround bogus 141 code
+ /usr/bin/qterm -t ${stop_type}
+ ret=$?
+ [[ ${ret} -eq 141 ]] && ret=0
+ [[ ${ret} -gt 0 ]] && {
+ start-stop-daemon --stop -p ${PBS_SERVER_HOME}/server_priv/server.lock
+ ret=$?
+ }
+ eend ${ret}
}
# vim:ts=4
@@ -0,0 +1,176 @@
+--- torque-3.0.4/src/resmom/linux/cpuset.c.orig 2011-07-13 02:07:28.000000000 +0400
++++ torque-3.0.4/src/resmom/linux/cpuset.c 2012-05-01 06:10:46.793651949 +0400
+@@ -37,6 +37,13 @@
+ extern int num_numa_nodes;
+ #endif /* NUMA_SUPPORT */
+
++#include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
++#define CPUSET_PREFIX "cpuset."
++#else
++#define CPUSET_PREFIX ""
++#endif
++
+ extern long system_ncpus;
+
+ /* FIXME: TODO: TTORQUECPUSET_PATH, enabling cpuset support, and correct error
+@@ -442,7 +449,7 @@
+
+ /* make sure cpusets are available */
+
+- sprintf(path, "%s/cpus", TROOTCPUSET_PATH);
++ sprintf(path, "%s/%scpus", TROOTCPUSET_PATH, CPUSET_PREFIX);
+
+ if (lstat(path, &statbuf) != 0)
+ {
+@@ -480,8 +487,8 @@
+
+ /* load cpus in root set */
+
+- sprintf(path, "%s/cpus",
+- TROOTCPUSET_PATH);
++ sprintf(path, "%s/%scpus",
++ TROOTCPUSET_PATH, CPUSET_PREFIX);
+
+ fp = fopen(path, "r");
+
+@@ -519,8 +526,8 @@
+
+ /* NOTE: load 'boot' set */
+
+- sprintf(path, "%s/boot/cpus",
+- TROOTCPUSET_PATH);
++ sprintf(path, "%s/boot/%scpus",
++ TROOTCPUSET_PATH, CPUSET_PREFIX);
+
+ fp = fopen(path, "r");
+
+@@ -554,8 +561,8 @@
+
+ /* create new TORQUE cpus set */
+
+- sprintf(path, "%s/cpus",
+- TTORQUECPUSET_PATH);
++ sprintf(path, "%s/%scpus",
++ TTORQUECPUSET_PATH, CPUSET_PREFIX);
+
+ fp = fopen(path, "w");
+
+@@ -588,8 +595,8 @@
+
+ /* add all mems to torqueset */
+
+- sprintf(path, "%s/mems",
+- TROOTCPUSET_PATH);
++ sprintf(path, "%s/%smems",
++ TROOTCPUSET_PATH, CPUSET_PREFIX);
+
+ fp = fopen(path, "r");
+
+@@ -622,8 +629,8 @@
+
+ /* NOTE: load 'boot' set */
+
+- sprintf(path, "%s/boot/mems",
+- TROOTCPUSET_PATH);
++ sprintf(path, "%s/boot/%smems",
++ TROOTCPUSET_PATH, CPUSET_PREFIX);
+
+ fp = fopen(path, "r");
+
+@@ -657,8 +664,8 @@
+
+ /* create new TORQUE mems set */
+
+- sprintf(path, "%s/mems",
+- TTORQUECPUSET_PATH);
++ sprintf(path, "%s/%smems",
++ TTORQUECPUSET_PATH, CPUSET_PREFIX);
+
+ fp = fopen(path, "w");
+
+@@ -1015,7 +1022,7 @@
+ /* don't "else return(FAILURE);" because the directory doesn't necessarily exist */
+
+ /* create the directory and copy the relevant memory data */
+- snprintf(tmppath,sizeof(tmppath),"%s/mems",TTORQUECPUSET_PATH);
++ snprintf(tmppath,sizeof(tmppath),"%s/%smems",TTORQUECPUSET_PATH, CPUSET_PREFIX);
+ if (access(TTORQUECPUSET_PATH, F_OK) == 0)
+ {
+
+@@ -1040,7 +1047,7 @@
+ }
+
+ fclose(fd);
+- snprintf(tmppath,sizeof(tmppath),"%s/mems",path);
++ snprintf(tmppath,sizeof(tmppath),"%s/%smems",path, CPUSET_PREFIX);
+ fd = fopen(tmppath, "w");
+ if (fd)
+ {
+@@ -1088,6 +1095,7 @@
+ vnodent *np;
+ int j;
+ int rc = SUCCESS;
++ int tmppath_len;
+
+ char *id = "create_vnodesets";
+ char cpusbuf[MAXPATHLEN+1];
+@@ -1105,7 +1113,8 @@
+ mkdir(tmppath, 0755);
+ chmod(tmppath, 00755);
+ sprintf(tasksbuf, "%d", np->vn_index);
+- strcat(tmppath, "/cpus");
++ tmppath_len=strlen(tmppath);
++ snprintf(tmppath+tmppath_len, sizeof(tmppath)-tmppath_len, "/%scpus", CPUSET_PREFIX);
+ sprintf(log_buffer, "TASKSET: %s cpus %s\n", tmppath, tasksbuf);
+ log_event(PBSEVENT_SYSTEM,
+ PBS_EVENTCLASS_SERVER,
+@@ -1129,7 +1138,7 @@
+ memset(tasksbuf, '\0', sizeof(tasksbuf));
+
+ /* add all mems to torqueset - membuf has info stored */
+- sprintf(tmppath, "%s/%d/%s",path,np->vn_node,"/mems");
++ sprintf(tmppath, "%s/%d/%smems",path,np->vn_node,CPUSET_PREFIX);
+ fd = fopen(tmppath, "w");
+
+ if (fd)
+@@ -1200,7 +1209,7 @@
+ get_cpu_string(pjob,cpusbuf);
+ #endif /* end NUMA_SUPPORT */
+
+- snprintf(tmppath,sizeof(tmppath),"%s/cpus",path);
++ snprintf(tmppath,sizeof(tmppath),"%s/%scpus",path, CPUSET_PREFIX);
+
+ sprintf(log_buffer, "CPUSET: %s job %s path %s\n", cpusbuf,
+ pjob->ji_qs.ji_jobid, tmppath);
+@@ -1231,7 +1240,7 @@
+
+ fclose(fd);
+ #ifdef NUMA_SUPPORT
+- snprintf(tmppath,sizeof(tmppath),"%s/mems",path);
++ snprintf(tmppath,sizeof(tmppath),"%s/%smems",path, CPUSET_PREFIX);
+ fd = fopen(tmppath, "w");
+ if (fd)
+ {
+@@ -1705,7 +1714,7 @@
+
+ if (LOGLEVEL >= 6)
+ {
+- sprintf(log_buffer, "cpuset %s/memory_pressure=%d", path, rc);
++ sprintf(log_buffer, "cpuset %s/%smemory_pressure=%d", path, CPUSET_PREFIX, rc);
+ log_record(PBSEVENT_DEBUG, 0, id, log_buffer);
+ }
+
+@@ -1714,9 +1723,10 @@
+ /* Construct the name of the cpuset's memory_pressure file */
+
+ if (cpusetname[0] == '/')
+- snprintf(path, sizeof(path), "%s/memory_pressure", cpusetname);
++ snprintf(path, sizeof(path), "%s/%smemory_pressure", cpusetname, CPUSET_PREFIX);
+ else
+- snprintf(path, sizeof(path), "%s/%s/memory_pressure", TTORQUECPUSET_PATH, cpusetname);
++ snprintf(path, sizeof(path), "%s/%s/%smemory_pressure", TTORQUECPUSET_PATH,
++ cpusetname, CPUSET_PREFIX);
+
+ /* Open, read, close */
+
@@ -0,0 +1,14 @@
+Index: src/lib/Libifl/tm.c
+===================================================================
+--- src/lib/Libifl/tm.c (revision 6091)
++++ src/lib/Libifl/tm.c (working copy)
+@@ -1739,8 +1739,7 @@
+ return TM_ENOTCONNECTED;
+
+ /* write the pid so the adopted process can be part of the cpuset if needed */
+-
+- if (diswsi(local_conn,sid) != DIS_SUCCESS)
++ if (diswsi(local_conn, pid) != DIS_SUCCESS)
+ return TM_ENOTCONNECTED;
+
+ /* send job or alternative id */
@@ -9,6 +9,7 @@
<flag name='cpusets'>Enable pbs_mom to utilize linux cpusets if available</flag>
<flag name='drmaa'>Enable the Distributed Resource Management Application API</flag>
<flag name='munge'>Enable authentication via munge</flag>
+ <flag name='nvidia'>Enable management of Nvidia GPUs</flag>
<flag name='server'>Enable compilation of pbs_server and pbs_sched</flag>
</use>
</pkgmetadata>
Oops, something went wrong.

0 comments on commit 4069aa0

Please sign in to comment.