[Swift-commit] r4160 - SwiftApps/SwiftR/Swift/tests

[noreply at svn.ci.uchicago.edu]

Author: tga
Date: 2011-03-02 15:55:50 -0600 (Wed, 02 Mar 2011)
New Revision: 4160

Added:
   SwiftApps/SwiftR/Swift/tests/batch_test.R
   SwiftApps/SwiftR/Swift/tests/pbs_test.sub
Removed:
   SwiftApps/SwiftR/Swift/tests/cobalt_script.R
Modified:
   SwiftApps/SwiftR/Swift/tests/cobalt_test.sub
Log:
Added batch submit script for cobalt


Copied: SwiftApps/SwiftR/Swift/tests/batch_test.R (from rev 4159, SwiftApps/SwiftR/Swift/tests/cobalt_script.R)
===================================================================
--- SwiftApps/SwiftR/Swift/tests/batch_test.R	                        (rev 0)
+++ SwiftApps/SwiftR/Swift/tests/batch_test.R	2011-03-02 21:55:50 UTC (rev 4160)
@@ -0,0 +1,35 @@
+require(Swift)
+
+server <- commandArgs(TRUE)[[1]]
+
+
+x1 <- getNodeList()
+print("Auto:")
+print(x1)
+
+if (server == "cobalt") {
+    x2 <- getNodeList("cobalt")
+    print("cobalt:")
+    print(x2)
+}
+if (server %in% c("pbs", "pbsf")) {
+    x2 <- getNodeList("pbs")
+    print("pbs:")
+    print(x2)
+
+    x3 <- getNodeList("pbsf")
+    print("pbsf:")
+    print(x3)
+}
+if (server == "sge")) {
+    x2 <- getNodeList("sge")
+    print("sge:")
+    print(x2)
+
+    x3 <- getNodeList("pbsf")
+    print("pbsf:")
+    print(x3)
+}
+
+runAllSwiftTests(server="ssh", hosts=x1[[1]], cores=8)
+

Deleted: SwiftApps/SwiftR/Swift/tests/cobalt_script.R
===================================================================
--- SwiftApps/SwiftR/Swift/tests/cobalt_script.R	2011-03-02 21:42:42 UTC (rev 4159)
+++ SwiftApps/SwiftR/Swift/tests/cobalt_script.R	2011-03-02 21:55:50 UTC (rev 4160)
@@ -1,11 +0,0 @@
-require(Swift)
-
-x1 <- getNodeList()
-print("Auto:")
-print(x1)
-
-x2 <- getNodeList("cobalt")
-print("pbs:")
-print(x2)
-
-runAllSwiftTests(server="ssh", hosts=x2[[1]], cores=8)

Modified: SwiftApps/SwiftR/Swift/tests/cobalt_test.sub
===================================================================
--- SwiftApps/SwiftR/Swift/tests/cobalt_test.sub	2011-03-02 21:42:42 UTC (rev 4159)
+++ SwiftApps/SwiftR/Swift/tests/cobalt_test.sub	2011-03-02 21:55:50 UTC (rev 4160)
@@ -1,12 +1,12 @@
 #!/bin/sh
 export WORKER_LOGGING_LEVEL=ERROR
-echo '***' COBALT_NODEFILE file: $COBALT_NODEFILE CONTACT:http://10.40.9.151:47853
+echo '***' COBALT_NODEFILE file: $COBALT_NODEFILE 
 cat $COBALT_NODEFILE
 echo '***' unique nodes are:
 sort < $COBALT_NODEFILE|uniq
 
 echo GLOBUS_HOSTNAME $GLOBUS_HOSTNAME
 export GLOBUS_HOSTNAME=""
-Rscript `dirname $0`/cobalt_script.R
+Rscript `dirname $0`/cobalt_script.R cobalt
 
 

Added: SwiftApps/SwiftR/Swift/tests/pbs_test.sub
===================================================================
--- SwiftApps/SwiftR/Swift/tests/pbs_test.sub	                        (rev 0)
+++ SwiftApps/SwiftR/Swift/tests/pbs_test.sub	2011-03-02 21:55:50 UTC (rev 4160)
@@ -0,0 +1,18 @@
+#PBS -S /bin/sh
+#PBS -N SwiftR-batch
+#PBS -m n
+#PBS -l nodes=1
+#PBS -l walltime=00:30:00
+
+export WORKER_LOGGING_LEVEL=ERROR # FIXME: parameterize; fix w PBS -v
+#cd / && /usr/bin/perl /autonfs/home/tga/R/x86_64-unknown-linux-gnu-library/2.12/Swift/exec/../swift/bin/worker.pl http://192.5.86.6:48998 SwiftR-workers /home/tga/.globus/coasters 864000
+HOST=$(echo http://192.5.86.6:48998 | sed -e 's,^http://,,' -e 's/:.*//')
+PORT=$(echo http://192.5.86.6:48998 | sed -e 's,^.*:,,')
+echo '***' PBS_NODEFILE file: $PBS_NODEFILE 
+cat $PBS_NODEFILE
+echo '***' unique nodes are:
+sort < $PBS_NODEFILE|uniq
+
+echo GLOBUS_HOSTNAME=$GLOBUS_HOSTNAME
+echo PATH=$PATH
+Rscript `dirname $0`/cobalt_script.R pbs