[Swift-commit] r6338 - in SwiftTutorials/IO/staging-normal: . conf

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-03-06 11:49:11 -0600 (Wed, 06 Mar 2013)
New Revision: 6338

Added:
   SwiftTutorials/IO/staging-normal/clean.sh
   SwiftTutorials/IO/staging-normal/conf/
   SwiftTutorials/IO/staging-normal/conf/local-coasters.cf
   SwiftTutorials/IO/staging-normal/data/
Removed:
   SwiftTutorials/IO/staging-normal/catsn-absolute.swift
   SwiftTutorials/IO/staging-normal/cf
   SwiftTutorials/IO/staging-normal/sites.xml
Modified:
   SwiftTutorials/IO/staging-normal/catsn-random.swift
   SwiftTutorials/IO/staging-normal/setup.sh
Log:
Make it work with swiftrun


Deleted: SwiftTutorials/IO/staging-normal/catsn-absolute.swift
===================================================================
--- SwiftTutorials/IO/staging-normal/catsn-absolute.swift	2013-03-06 16:59:48 UTC (rev 6337)
+++ SwiftTutorials/IO/staging-normal/catsn-absolute.swift	2013-03-06 17:49:11 UTC (rev 6338)
@@ -1,12 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
-  cat @i stdout=@o;
-}
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toInt(@arg("n","10"))] {
-  file data <"file:///home/davidk/test4/data/data.txt">;
-  out[j] = cat(data);
-}

Modified: SwiftTutorials/IO/staging-normal/catsn-random.swift
===================================================================
--- SwiftTutorials/IO/staging-normal/catsn-random.swift	2013-03-06 16:59:48 UTC (rev 6337)
+++ SwiftTutorials/IO/staging-normal/catsn-random.swift	2013-03-06 17:49:11 UTC (rev 6338)
@@ -5,9 +5,9 @@
   cat @i stdout=@o;
 }
 
-file input_files[]<filesys_mapper; location="data", pattern="tmp.*">;
+file input_files[]<filesys_mapper; location="../data", pattern="tmp.*">;
 
 foreach j in input_files {
-  file output<single_file_mapper; location="data", file=@strcat(@filename(j), ".out")>;
+  file output<single_file_mapper; location="../data", file=@strcat(@filename(j), ".out")>;
   output = cat(j);
 }

Deleted: SwiftTutorials/IO/staging-normal/cf
===================================================================
--- SwiftTutorials/IO/staging-normal/cf	2013-03-06 16:59:48 UTC (rev 6337)
+++ SwiftTutorials/IO/staging-normal/cf	2013-03-06 17:49:11 UTC (rev 6338)
@@ -1,8 +0,0 @@
-wrapperlog.always.transfer=true
-sitedir.keep=true
-execution.retries=0
-lazy.errors=true
-status.mode=provider
-use.provider.staging=false
-provider.staging.pin.swiftfiles=false
-use.wrapper.staging=false

Added: SwiftTutorials/IO/staging-normal/clean.sh
===================================================================
--- SwiftTutorials/IO/staging-normal/clean.sh	                        (rev 0)
+++ SwiftTutorials/IO/staging-normal/clean.sh	2013-03-06 17:49:11 UTC (rev 6338)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+rm -rf run*


Property changes on: SwiftTutorials/IO/staging-normal/clean.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: SwiftTutorials/IO/staging-normal/conf/local-coasters.cf
===================================================================
--- SwiftTutorials/IO/staging-normal/conf/local-coasters.cf	                        (rev 0)
+++ SwiftTutorials/IO/staging-normal/conf/local-coasters.cf	2013-03-06 17:49:11 UTC (rev 6338)
@@ -0,0 +1,12 @@
+wrapperlog.always.transfer=true
+sitedir.keep=true
+execution.retries=0
+lazy.errors=true
+status.mode=provider
+use.provider.staging=false
+provider.staging.pin.swiftfiles=false
+use.wrapper.staging=false
+
+#site local-coasters WORK=$HOME/swiftwork
+#site local-coasters SCRATCH=/scratch/local/$USER/swiftwork
+#app cat=/bin/cat

Modified: SwiftTutorials/IO/staging-normal/setup.sh
===================================================================
--- SwiftTutorials/IO/staging-normal/setup.sh	2013-03-06 16:59:48 UTC (rev 6337)
+++ SwiftTutorials/IO/staging-normal/setup.sh	2013-03-06 17:49:11 UTC (rev 6338)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-NUMFILES=500
+NUMFILES=10
 FILESIZE=10
 FILESIZE=$(($FILESIZE*1000000))
 

Deleted: SwiftTutorials/IO/staging-normal/sites.xml
===================================================================
--- SwiftTutorials/IO/staging-normal/sites.xml	2013-03-06 16:59:48 UTC (rev 6337)
+++ SwiftTutorials/IO/staging-normal/sites.xml	2013-03-06 17:49:11 UTC (rev 6338)
@@ -1,10 +0,0 @@
-<config>
-   <pool handle="local">
-      <execution provider="local" url="none"/>
-      <profile namespace="karajan" key="jobThrottle">0</profile>
-      <profile namespace="karajan" key="initialScore">10000</profile>
-      <filesystem provider="local"/>
-      <workdirectory>/home/davidk/swiftwork</workdirectory>
-      <scratch>/scratch/local/davidk/swiftwork</scratch>
-   </pool>
-</config>