[Swift-commit] r6686 - in SwiftTutorials/UofC_2013-07-29-uc3: part07 part08 part09
davidk at ci.uchicago.edu
davidk at ci.uchicago.edu
Mon Jul 29 17:39:03 CDT 2013
Author: davidk
Date: 2013-07-29 17:39:03 -0500 (Mon, 29 Jul 2013)
New Revision: 6686
Added:
SwiftTutorials/UofC_2013-07-29-uc3/part07/clean.sh
SwiftTutorials/UofC_2013-07-29-uc3/part09/clean.sh
SwiftTutorials/UofC_2013-07-29-uc3/part09/simulate.sh
SwiftTutorials/UofC_2013-07-29-uc3/part09/stats.sh
Removed:
SwiftTutorials/UofC_2013-07-29-uc3/part07/clean.sh
SwiftTutorials/UofC_2013-07-29-uc3/part08/clean.sh
SwiftTutorials/UofC_2013-07-29-uc3/part09/p01.swift
Modified:
SwiftTutorials/UofC_2013-07-29-uc3/part07/p7.swift
SwiftTutorials/UofC_2013-07-29-uc3/part07/sites.xml
SwiftTutorials/UofC_2013-07-29-uc3/part08/p8.swift
SwiftTutorials/UofC_2013-07-29-uc3/part08/sites.xml
SwiftTutorials/UofC_2013-07-29-uc3/part09/dynamic_bias.dat
SwiftTutorials/UofC_2013-07-29-uc3/part09/p9.swift
SwiftTutorials/UofC_2013-07-29-uc3/part09/sites.xml
Log:
Let uc3 flock to osg to get cores more quickly
Deleted: SwiftTutorials/UofC_2013-07-29-uc3/part07/clean.sh
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part07/clean.sh 2013-07-29 21:58:55 UTC (rev 6685)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part07/clean.sh 2013-07-29 22:39:03 UTC (rev 6686)
@@ -1 +0,0 @@
-link ../clean.sh
\ No newline at end of file
Added: SwiftTutorials/UofC_2013-07-29-uc3/part07/clean.sh
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part07/clean.sh (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part07/clean.sh 2013-07-29 22:39:03 UTC (rev 6686)
@@ -0,0 +1 @@
+rm -rf *.log *.rlog *.d *.kml *.swiftx output _concurrent
Property changes on: SwiftTutorials/UofC_2013-07-29-uc3/part07/clean.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: SwiftTutorials/UofC_2013-07-29-uc3/part07/p7.swift
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part07/p7.swift 2013-07-29 21:58:55 UTC (rev 6685)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part07/p7.swift 2013-07-29 22:39:03 UTC (rev 6686)
@@ -8,7 +8,7 @@
app (file out) simulation (file script, int timesteps, int sim_range)
{
- bash @filename(script) timesteps sim_range stdout=@filename(out);
+ sh @filename(script) timesteps sim_range stdout=@filename(out);
}
# Command line params to this script:
Modified: SwiftTutorials/UofC_2013-07-29-uc3/part07/sites.xml
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part07/sites.xml 2013-07-29 21:58:55 UTC (rev 6685)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part07/sites.xml 2013-07-29 22:39:03 UTC (rev 6686)
@@ -15,7 +15,7 @@
<profile namespace="globus" key="jobType">nonshared</profile>
<!-- Requirements = regexp("uc3-c*", Machine) -->
- <profile namespace="globus" key="condor.Requirements">regexp("uc3-c*", Machine)</profile>
+ <!-- <profile namespace="globus" key="condor.Requirements">regexp("uc3-c*", Machine)</profile> -->
<!-- <profile namespace="globus" key="condor.Requirements">UidDomain == "osg-gk.mwt2.org"</profile> -->
<workdirectory>.</workdirectory>
Deleted: SwiftTutorials/UofC_2013-07-29-uc3/part08/clean.sh
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part08/clean.sh 2013-07-29 21:58:55 UTC (rev 6685)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part08/clean.sh 2013-07-29 22:39:03 UTC (rev 6686)
@@ -1 +0,0 @@
-link ../clean.sh
\ No newline at end of file
Modified: SwiftTutorials/UofC_2013-07-29-uc3/part08/p8.swift
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part08/p8.swift 2013-07-29 21:58:55 UTC (rev 6685)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part08/p8.swift 2013-07-29 22:39:03 UTC (rev 6686)
@@ -37,5 +37,5 @@
sims[i] = simout;
}
-file stats<"data/p01_stats.out">; # Final output file: average of all "simulations"
+file stats<"output/stats.out">; # Final output file: average of all "simulations"
stats = analyze(analysis_script,sims);
Modified: SwiftTutorials/UofC_2013-07-29-uc3/part08/sites.xml
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part08/sites.xml 2013-07-29 21:58:55 UTC (rev 6685)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part08/sites.xml 2013-07-29 22:39:03 UTC (rev 6686)
@@ -15,7 +15,7 @@
<profile namespace="globus" key="jobType">nonshared</profile>
<!-- Requirements = regexp("uc3-c*", Machine) -->
- <profile namespace="globus" key="condor.Requirements">regexp("uc3-c*", Machine)</profile>
+ <!-- <profile namespace="globus" key="condor.Requirements">regexp("uc3-c*", Machine)</profile> -->
<!-- <profile namespace="globus" key="condor.Requirements">UidDomain == "osg-gk.mwt2.org"</profile> -->
<workdirectory>.</workdirectory>
Added: SwiftTutorials/UofC_2013-07-29-uc3/part09/clean.sh
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part09/clean.sh (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part09/clean.sh 2013-07-29 22:39:03 UTC (rev 6686)
@@ -0,0 +1 @@
+rm -rf *.log *.rlog *.d *.kml *.swiftx output _concurrent
Property changes on: SwiftTutorials/UofC_2013-07-29-uc3/part09/clean.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: SwiftTutorials/UofC_2013-07-29-uc3/part09/dynamic_bias.dat
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part09/dynamic_bias.dat 2013-07-29 21:58:55 UTC (rev 6685)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part09/dynamic_bias.dat 2013-07-29 22:39:03 UTC (rev 6686)
@@ -1 +1 @@
-342
+477
Deleted: SwiftTutorials/UofC_2013-07-29-uc3/part09/p01.swift
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part09/p01.swift 2013-07-29 21:58:55 UTC (rev 6685)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part09/p01.swift 2013-07-29 22:39:03 UTC (rev 6686)
@@ -1,41 +0,0 @@
-type file;
-
-# Applications to be called by this script
-
-file simulation_script <"simulate.sh">;
-file analysis_script <"stats.sh">;
-
-# app() functions for application programs to be called:
-
-app (file out) simulation (file script, int timesteps, int sim_range, file bias_file, int scale, int sim_count)
-{
- sh @filename(script) timesteps sim_range @filename(bias_file) scale sim_count stdout=@filename(out);
-}
-
-app (file out) analyze (file script, file s[])
-{
- sh @script @filenames(s) stdout=@filename(out);
-}
-
-# Command line params to this script:
-
-int nsim = @toInt(@arg("nsim", "10")); # number of simulation programs to run
-int steps = @toInt(@arg("steps", "1")); # number of "steps" each simulation (==seconds of runtime)
-int range = @toInt(@arg("range", "100")); # range of the generated random numbers
-int count = @toInt(@arg("count", "10")); # number of random numbers generated per simulation
-
-# Main script and data
-
-tracef("\n*** Script parameters: nsim=%i steps=%i range=%i count=%i\n\n", nsim, steps, range, count);
-
-file sims[]; # Array of files to hold each simulation output
-file bias<"data/bias.dat">; # Input data file to "bias" the numbers:
- # 1 line: scale offset ( N = n*scale + offset)
-foreach i in [0:nsim-1] {
- file simout <single_file_mapper; file=@strcat("data/out_p01/sim_",i,".out")>;
- simout = simulation(simulation_script, steps, range, bias, 100000, count);
- sims[i] = simout;
-}
-
-file stats<"data/p01_stats.out">; # Final output file: average of all "simulations"
-stats = analyze(analysis_script,sims);
Modified: SwiftTutorials/UofC_2013-07-29-uc3/part09/p9.swift
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part09/p9.swift 2013-07-29 21:58:55 UTC (rev 6685)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part09/p9.swift 2013-07-29 22:39:03 UTC (rev 6686)
@@ -48,5 +48,5 @@
sims[i] = simout;
}
-file stats<"data/p02_stats.out">; # Final output file: average of all "simulations"
+file stats<"output/stats.out">; # Final output file: average of all "simulations"
stats = analyze(analysis_script,sims);
Added: SwiftTutorials/UofC_2013-07-29-uc3/part09/simulate.sh
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part09/simulate.sh (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part09/simulate.sh 2013-07-29 22:39:03 UTC (rev 6686)
@@ -0,0 +1 @@
+link ../simulate.sh
\ No newline at end of file
Property changes on: SwiftTutorials/UofC_2013-07-29-uc3/part09/simulate.sh
___________________________________________________________________
Added: svn:special
+ *
Modified: SwiftTutorials/UofC_2013-07-29-uc3/part09/sites.xml
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part09/sites.xml 2013-07-29 21:58:55 UTC (rev 6685)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part09/sites.xml 2013-07-29 22:39:03 UTC (rev 6686)
@@ -15,7 +15,7 @@
<profile namespace="globus" key="jobType">nonshared</profile>
<!-- Requirements = regexp("uc3-c*", Machine) -->
- <profile namespace="globus" key="condor.Requirements">regexp("uc3-c*", Machine)</profile>
+ <!-- <profile namespace="globus" key="condor.Requirements">regexp("uc3-c*", Machine)</profile> -->
<!-- <profile namespace="globus" key="condor.Requirements">UidDomain == "osg-gk.mwt2.org"</profile> -->
<workdirectory>.</workdirectory>
Added: SwiftTutorials/UofC_2013-07-29-uc3/part09/stats.sh
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part09/stats.sh (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part09/stats.sh 2013-07-29 22:39:03 UTC (rev 6686)
@@ -0,0 +1 @@
+link ../stats.sh
\ No newline at end of file
Property changes on: SwiftTutorials/UofC_2013-07-29-uc3/part09/stats.sh
___________________________________________________________________
Added: svn:special
+ *
More information about the Swift-commit
mailing list