[Swift-commit] r4168 - in SwiftApps/SwiftR/Swift: . tests

[noreply at svn.ci.uchicago.edu]

Author: tga
Date: 2011-03-03 11:22:13 -0600 (Thu, 03 Mar 2011)
New Revision: 4168

Modified:
   SwiftApps/SwiftR/Swift/DESCRIPTION
   SwiftApps/SwiftR/Swift/tests/batch_test.R
   SwiftApps/SwiftR/Swift/tests/pbs_test.sub
Log:
Tidied up batch test scripts a little.  New version 0.1.5


Modified: SwiftApps/SwiftR/Swift/DESCRIPTION
===================================================================
--- SwiftApps/SwiftR/Swift/DESCRIPTION	2011-03-03 02:38:38 UTC (rev 4167)
+++ SwiftApps/SwiftR/Swift/DESCRIPTION	2011-03-03 17:22:13 UTC (rev 4168)
@@ -1,11 +1,12 @@
 Package: Swift
 Type: Package
 Title: R interface to Swift parallel scripting languaage
-Version: 0.1.4
-Date: 2010-02-24
+Version: 0.1.5
+Date: 2011-04-03
 Author: Michael Wilde
 Maintainer: Michael Wilde <wilde at mcs.anl.gov>
 Description: Routines to invoke R functions on remote resources through Swift.
 License: Apache License
 LazyLoad: yes
-Packaged: 2010-09-17 12:58:48 UTC; wilde
+Packaged: 2011-04-03; Tim Armstrong
+

Modified: SwiftApps/SwiftR/Swift/tests/batch_test.R
===================================================================
--- SwiftApps/SwiftR/Swift/tests/batch_test.R	2011-03-03 02:38:38 UTC (rev 4167)
+++ SwiftApps/SwiftR/Swift/tests/batch_test.R	2011-03-03 17:22:13 UTC (rev 4168)
@@ -3,36 +3,36 @@
 server <- commandArgs(TRUE)[[1]]
 
 
-x1 <- getNodeList()
+hostinfo1 <- getNodeList()
 print("Auto:")
-print(x1)
+print(hostinfo1)
 
 if (server == "cobalt") {
-    x2 <- getNodeList("cobalt")
+    hostinfo2 <- getNodeList("cobalt")
     print("cobalt:")
-    print(x2)
+    print(hostinfo2)
 }
 if (server %in% c("pbs", "pbsf")) {
-    x2 <- getNodeList("pbs")
+    hostinfo2 <- getNodeList("pbs")
     print("pbs:")
-    print(x2)
+    print(hostinfo2)
 
-    x3 <- getNodeList("pbsf")
+    hostinfo3 <- getNodeList("pbsf")
     print("pbsf:")
-    print(x3)
+    print(hostinfo3)
 }
 if (server == "sge") {
-    x2 <- getNodeList("sge")
+    hostinfo2 <- getNodeList("sge")
     print("sge:")
-    print(x2)
+    print(hostinfo2)
 
-    x3 <- getNodeList("pbsf")
+    hostinfo3 <- getNodeList("pbsf")
     print("pbsf:")
-    print(x3)
+    print(hostinfo3)
 }
 
 print ("Hosts:")
-print(x1[[1]])
+print(hostinfo1[[1]])
 
-runAllSwiftTests(server="ssh", hosts=x1[[1]], cores=8)
+runAllSwiftTests(server="ssh", hosts=hostinfo1[[1]], cores=8)
 

Modified: SwiftApps/SwiftR/Swift/tests/pbs_test.sub
===================================================================
--- SwiftApps/SwiftR/Swift/tests/pbs_test.sub	2011-03-03 02:38:38 UTC (rev 4167)
+++ SwiftApps/SwiftR/Swift/tests/pbs_test.sub	2011-03-03 17:22:13 UTC (rev 4168)
@@ -4,8 +4,6 @@
 #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