[Swift-commit] r7436 - in SwiftApps/Swift-MapRed/mapred_combiner_V4: . examples/EPlus

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2013-12-17 16:55:25 -0600 (Tue, 17 Dec 2013)
New Revision: 7436

Modified:
   SwiftApps/Swift-MapRed/mapred_combiner_V4/examples/EPlus/cf
   SwiftApps/Swift-MapRed/mapred_combiner_V4/examples/EPlus/cleanup.sh
   SwiftApps/Swift-MapRed/mapred_combiner_V4/examples/EPlus/sweep7-reduce.swift
   SwiftApps/Swift-MapRed/mapred_combiner_V4/map_wrapper.sh
Log:
 

Modified: SwiftApps/Swift-MapRed/mapred_combiner_V4/examples/EPlus/cf
===================================================================
--- SwiftApps/Swift-MapRed/mapred_combiner_V4/examples/EPlus/cf	2013-12-17 20:00:26 UTC (rev 7435)
+++ SwiftApps/Swift-MapRed/mapred_combiner_V4/examples/EPlus/cf	2013-12-17 22:55:25 UTC (rev 7436)
@@ -1,9 +1,9 @@
-tc.file=apps
-sites.file=sites.xml
 use.provider.staging=true
-provider.staging.pin.swiftfiles=true
-wrapperlog.always.transfer=false
-sitedir.keep=false
+use.wrapper.staging=false
+wrapperlog.always.transfer=true
 execution.retries=0
 lazy.errors=false
-use.wrapper.staging=false
+provider.staging.pin.swiftfiles=false
+sitedir.keep=true
+#tcp.port.range=50000,51000
+Dtcp.channel.log.io.performance=true
\ No newline at end of file

Modified: SwiftApps/Swift-MapRed/mapred_combiner_V4/examples/EPlus/cleanup.sh
===================================================================
--- SwiftApps/Swift-MapRed/mapred_combiner_V4/examples/EPlus/cleanup.sh	2013-12-17 20:00:26 UTC (rev 7435)
+++ SwiftApps/Swift-MapRed/mapred_combiner_V4/examples/EPlus/cleanup.sh	2013-12-17 22:55:25 UTC (rev 7436)
@@ -1,5 +1,6 @@
 #!/bin/bash
 
-rm -rf *.log *.rlog *.d sweep1-*-*-* *.kml *.swiftx *.out output outdir logs hw.* _concurrent .swift/tmp
-
+rm -rf map *.log *.rlog *.d sweep1-*-*-* *.kml *.swiftx *.out output outdir logs hw.* _concurrent .swift/tmp
+rm -rfv /scratch/midway/maheshwari/mapdir
+killall timeout
 #stop-coaster-service

Modified: SwiftApps/Swift-MapRed/mapred_combiner_V4/examples/EPlus/sweep7-reduce.swift
===================================================================
--- SwiftApps/Swift-MapRed/mapred_combiner_V4/examples/EPlus/sweep7-reduce.swift	2013-12-17 20:00:26 UTC (rev 7435)
+++ SwiftApps/Swift-MapRed/mapred_combiner_V4/examples/EPlus/sweep7-reduce.swift	2013-12-17 22:55:25 UTC (rev 7436)
@@ -53,16 +53,10 @@
 foreach v7 in pval[7] {
 
  string fileid = @strjoin(["/ep",v0,v1,v2,v3,v4,v5,v6,v7],".");
- /* file outjson <single_file_mapper; file=@strcat(outdir,fileid,".json")>;*/
  
  fileptr map_out <single_file_mapper; file=@strcat("map",fileid,".out")>;
  file map_err <single_file_mapper; file=@strcat("map",fileid,".err")>;
 
- /* outjson = runEP ( epconfig, epweather,
-               [pset[0].pname, v0, pset[1].pname, v1, pset[2].pname, v2, pset[3].pname, v3,
-               pset[4].pname, v4, pset[5].pname, v5, pset[6].pname, v6, pset[7].pname, v7] );
- */
-
  (map_out, map_err) = map_data (map_wrapper, map_func, epconfig, epweather,
                             "outjson", [pset[0].pname, v0, pset[1].pname, v1, pset[2].pname,
                             v2, pset[3].pname, v3, pset[4].pname, v4, pset[5].pname, v5,

Modified: SwiftApps/Swift-MapRed/mapred_combiner_V4/map_wrapper.sh
===================================================================
--- SwiftApps/Swift-MapRed/mapred_combiner_V4/map_wrapper.sh	2013-12-17 20:00:26 UTC (rev 7435)
+++ SwiftApps/Swift-MapRed/mapred_combiner_V4/map_wrapper.sh	2013-12-17 22:55:25 UTC (rev 7436)
@@ -7,7 +7,9 @@
     USER_MAP_SCRIPT=$1;
     shift 1;
 fi
-MAP_ARGS=$*
+
+MAP_ARGS="$@"
+echo $MAP_ARGS >> /scratch/midway/maheshwari/ketan.args
 BEAGLE_USERNAME=ketan
 MIDWAY_USERNAME=maheshwari
 FILE="input_$RANDOM.txt"
@@ -16,14 +18,12 @@
     EXECSERVER=/scratch/midway/$MIDWAY_USERNAME/bin/exec_server
     LOGFOLDER=/scratch/midway/$USER
     FOLDER="/dev/shm"
-    #FOLDER="/scratch/midway/$MIDWAY_USERNAME/mapdir"
     HOSTNAME="midway_$HOSTNAME"
 
 elif [[ "$HOSTNAME" == *nid* ]]; then    # On beagle node
     EXECSERVER=/lustre/beagle/$BEAGLE_USERNAME/bin/exec_server
     LOGFOLDER=/lustre/beagle/$USER
     FOLDER="/dev/shm"
-    #FOLDER="/lustre/beagle/$BEAGLE_USERNAME/mapdir"
     HOSTNAME="beagle_$HOSTNAME"
 fi
 
@@ -50,7 +50,8 @@
 fi
 
 chmod a+x $USER_MAP_SCRIPT
-./$USER_MAP_SCRIPT ${MAP_ARGS[*]} > $FILE
+#./$USER_MAP_SCRIPT ${MAP_ARGS[*]} > $FILE
+./$USER_MAP_SCRIPT "$@" > $FILE
 echo "$HOSTNAME $FILE"
 ps -u $USER 1>&2
 ls -thor $FILE 1>&2