[Swift-commit] r5103 - in SwiftApps/SwiftR: . Swift swift-patches

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-09-12 17:24:01 -0500 (Mon, 12 Sep 2011)
New Revision: 5103

Added:
   SwiftApps/SwiftR/swift-patches/
   SwiftApps/SwiftR/swift-patches/swift-0.92.1-changes.patch
Modified:
   SwiftApps/SwiftR/IMMEDIATE-TODO
   SwiftApps/SwiftR/Makefile
   SwiftApps/SwiftR/Swift/DESCRIPTION
Log:
*Changed build process to checkout out swift source and build directly.
*Bumped version number

This will ultimately make it easier to distribute a source-only package to comply with CRAN requirements. The build process now depends on subversion, which we cannot realistically assume will be present on all systems: it may be wise in the future to switch to using wget to download the source from a URL.



Modified: SwiftApps/SwiftR/IMMEDIATE-TODO
===================================================================
--- SwiftApps/SwiftR/IMMEDIATE-TODO	2011-09-12 17:29:10 UTC (rev 5102)
+++ SwiftApps/SwiftR/IMMEDIATE-TODO	2011-09-12 22:24:01 UTC (rev 5103)
@@ -1,9 +1,15 @@
 
+
+
+
 3) speed: where is bottleneck?  how to measure and tune?
 - ParallelCI and ParallelBoostrap benchmarks
 - smaller focused micro-tests to create plots of speed vs param size and efficiency vs runtime of the evaluated function.
 
 HIGH:
+-- Check that 0.2.6 works on mac.
+
+HIGH:
 -- OpenMx Benchmarking on Beagle
 
 HIGH:

Modified: SwiftApps/SwiftR/Makefile
===================================================================
--- SwiftApps/SwiftR/Makefile	2011-09-12 17:29:10 UTC (rev 5102)
+++ SwiftApps/SwiftR/Makefile	2011-09-12 22:24:01 UTC (rev 5103)
@@ -11,10 +11,13 @@
 # Version: (major).(minor)
 SWIFTR_VERSION=$(shell sed -n -r 's/^Version:(\W*)([[:digit:]]+\.[[:digit:].]+)/\2/p' Swift/DESCRIPTION)
 
-SW = $(shell which swift)
-SWD = $(shell dirname $(SW))
-SWIFT_PATH = $(shell cd $(SWD)/..; pwd)
+COG_SRC = cog-svn
 
+SWIFT_SRC = $(COG_SRC)/modules/swift
+
+SWIFT_DIST = $(SWIFT_SRC)/dist/swift-svn
+
+
 TBALL=Swift_$(SWIFTR_VERSION).tar.gz
 
 
@@ -22,11 +25,25 @@
 
 build: 	$(TBALL)
 
+$(COG_SRC)/.checkedout: 
+	if [ -d $(COG_SRC) ] ; then rm -rf $(COG_SRC); fi
+	echo Checking out CoG source
+	svn co https://cogkit.svn.sourceforge.net/svnroot/cogkit/tags/swift_0.92.1 $(COG_SRC)
+	echo Checking out Swift source
+	(cd $(COG_SRC)/modules; \
+		svn co https://svn.ci.uchicago.edu/svn/vdl2/tags/release-0.92.1 swift)
+	patch -d cog-svn/ -p0 < swift-patches/swift-0.92.1-changes.patch # hacky way to apply customisations
+	touch $(COG_SRC)/.checkedout
+
+
+$(SWIFT_SRC)/.built: $(COG_SRC)/.checkedout
+	(cd $(SWIFT_SRC) && ant dist && touch .built)
+
+
 # Target to make sure that swift exists
-Swift/inst/swift/bin/swift:
-	$(if $(SW),, $(error swift could not be found using which))
-	mkdir -p Swift/inst/swift
-	cp -r $(SWIFT_PATH)/* Swift/inst/swift
+Swift/inst/swift/bin/swift: $(SWIFT_SRC)/.built
+	mkdir -p Swift/inst/
+	cp -r $(SWIFT_DIST) Swift/inst/swift
 
 publish: $(TBALL)
 	cp $(TBALL) ~/public_html
@@ -41,9 +58,11 @@
 	Rscript Swift/tests/runtests.R
 
 clean: 
-	rm -rf Swift/inst/swift/*
-	rm $(TBALL)
+	rm -rf $(COG_SRC)
+	rm -rf Swift/inst/swift/
+	rm -f $(TBALL)
 
+
 $(TBALL): Swift/inst/swift/bin/swift $(PKG_FILES) Makefile
 	- if [ -d .svn -a -x "`which svn`" ]; then svn info > Swift/svninfo; fi
 	R CMD build Swift

Modified: SwiftApps/SwiftR/Swift/DESCRIPTION
===================================================================
--- SwiftApps/SwiftR/Swift/DESCRIPTION	2011-09-12 17:29:10 UTC (rev 5102)
+++ SwiftApps/SwiftR/Swift/DESCRIPTION	2011-09-12 22:24:01 UTC (rev 5103)
@@ -1,12 +1,12 @@
 Package: Swift
 Type: Package
 Title: R interface to Swift parallel scripting languaage
-Version: 0.2.5
-Date: 2011-06-07
+Version: 0.2.6
+Date: 2011-09-12
 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: 2011-06-07; Tim Armstrong
+Packaged: 2011-09-12; Tim Armstrong
 

Added: SwiftApps/SwiftR/swift-patches/swift-0.92.1-changes.patch
===================================================================
--- SwiftApps/SwiftR/swift-patches/swift-0.92.1-changes.patch	                        (rev 0)
+++ SwiftApps/SwiftR/swift-patches/swift-0.92.1-changes.patch	2011-09-12 22:24:01 UTC (rev 5103)
@@ -0,0 +1,13 @@
+Index: modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/CoasterService.java
+===================================================================
+--- modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/CoasterService.java	(revision 3145)
++++ modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/CoasterService.java	(working copy)
+@@ -41,7 +41,7 @@
+     public static final Logger logger = Logger
+             .getLogger(CoasterService.class);
+ 
+-    public static final int IDLE_TIMEOUT = 120 * 1000;
++    public static final int IDLE_TIMEOUT = 120 * 1000 /* extend it: */ * 30 * 240;
+     
+     public static final int CONNECT_TIMEOUT = 2 * 60 * 1000;
+