[Swift-commit] r4155 - SwiftApps/SwiftR/Swift/exec

[noreply at svn.ci.uchicago.edu]

Author: tga
Date: 2011-02-28 16:35:41 -0600 (Mon, 28 Feb 2011)
New Revision: 4155

Modified:
   SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh
   SwiftApps/SwiftR/Swift/exec/SwiftRServer.R
   SwiftApps/SwiftR/Swift/exec/configure-server-local
Log:
Got SwiftR working on Beagle login node finally by passing LD_LIBRARY_PATH.


Modified: SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh
===================================================================
--- SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh	2011-02-28 21:48:24 UTC (rev 4154)
+++ SwiftApps/SwiftR/Swift/exec/EvalRBatchPersistent.sh	2011-02-28 22:35:41 UTC (rev 4155)
@@ -129,6 +129,7 @@
   
   echo LD_LIBRARYPATH= $LD_LIBRARY_PATH
   PATH=.:$PATH
+  echo PATH= $PATH
   $RServerScript $SLOTDIR >> $SLOTDIR/R.log 2>&1 &   # launch R server
   # idletimer $SLOTDIR </dev/null >/dev/null 2>&1 & # R saves pid in R.pid for idletimer to kill it
   echo "$0: INFO: Launched $RServerScript $SLOTDIR Rscript"

Modified: SwiftApps/SwiftR/Swift/exec/SwiftRServer.R
===================================================================
--- SwiftApps/SwiftR/Swift/exec/SwiftRServer.R	2011-02-28 21:48:24 UTC (rev 4154)
+++ SwiftApps/SwiftR/Swift/exec/SwiftRServer.R	2011-02-28 22:35:41 UTC (rev 4155)
@@ -93,8 +93,7 @@
       # Load contents into local environment
       success <- try(load(callBatchFileName, envir=environment()));
       if (inherits(success, "try-error")) {
-        failBatch(rcall, paste(callBatchFileName, "could not be opened"), 
-                    resultBatchFileName)
+        stop(paste(callBatchFileName, "could not be opened"))
         return()
       }
       success <- try(loadImports(rcall$imports))

Modified: SwiftApps/SwiftR/Swift/exec/configure-server-local
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-local	2011-02-28 21:48:24 UTC (rev 4154)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-local	2011-02-28 22:35:41 UTC (rev 4155)
@@ -44,6 +44,7 @@
     <execution provider="local" url="none" />
     <profile key="jobThrottle" namespace="karajan">$throttleOneCore</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
+    <profile namespace="env" key="LD_LIBRARY_PATH">$LD_LIBRARY_PATH</profile>
     <filesystem provider="local" url="none" />
     <workdirectory>$(pwd)/swiftwork</workdirectory>
   </pool>