[Swift-commit] r5579 - SwiftApps/SciColSim

Fri Feb 10 09:45:29 CST 2012

Author: wilde
Date: 2012-02-10 09:45:29 -0600 (Fri, 10 Feb 2012)
New Revision: 5579

Added:
   SwiftApps/SciColSim/getboost.sh
   SwiftApps/SciColSim/setup.sh
Modified:
   SwiftApps/SciColSim/Makefile
   SwiftApps/SciColSim/README
   SwiftApps/SciColSim/getswift.sh
   SwiftApps/SciColSim/swiftopt.sh
Log:
Enhanced readme and installation process. some changes to swiftop.sh

Modified: SwiftApps/SciColSim/Makefile
===================================================================

--- SwiftApps/SciColSim/Makefile	2012-02-10 01:37:02 UTC (rev 5578)
+++ SwiftApps/SciColSim/Makefile	2012-02-10 15:45:29 UTC (rev 5579)
@@ -8,7 +8,7 @@
 	g++ -DP_OPENMP -fopenmp -I boost_1_47_0 -o openmp-optimizer optimizer.cpp
 
 clean:
-	rm -rf mac-openmp-optimizer mac-dispatch-optimizer mac-orig-optimizer
+	rm -rf openmp-optimizer
 
 endif
 

Modified: SwiftApps/SciColSim/README
===================================================================
--- SwiftApps/SciColSim/README	2012-02-10 01:37:02 UTC (rev 5578)
+++ SwiftApps/SciColSim/README	2012-02-10 15:45:29 UTC (rev 5579)
@@ -1,25 +1,27 @@
-*** FIXME: New quiskstart to integrate
 
-#-----
+*** Getting started
 
-cd $HOME
-svn co https://svn.ci.uchicago.edu/svn/vdl2/SwiftApps/SciColSim
-cd SciColSim
 
-./getswift.sh  # just do this one
+To run shorter tests on single local hosts (Mac, Linux, Beagle
+Sandbox, Swift lab machines):
 
-./swiftopt.sh -s local -p Fast01 &    # Tells you what run dir its in.  Note the "&" !!!
+  cd $HOME
+  svn co https://svn.ci.uchicago.edu/svn/vdl2/SwiftApps/SciColSim
+  cd SciColSim
 
-cd runNNN                             # cd to that run dir eg run007
-tail -f swift.out                     # to view progress
-tail -f best_some_opt_swift.txt       # to view optimization results
+  ./setup.sh  # just do this once. Will install Boost and Swift, and compile the optimizer
 
-./swiftopt.sh -s pads  -p ARtest01    # Etc.
+  ./swiftopt.sh -s local -p Fast01 &    # Tells you what run dir its in.  Note the "&" !!!
 
-#-----
+  cd runNNN                             # cd to that run dir eg run007
+  tail -f swift.out                     # to view progress
+  tail -f best_some_opt_swift.txt       # to view optimization results
 
-Args:
+  ./swiftopt.sh -s pads  -p params/ARtest01    # Etc.
 
+
+swiftopt.sh command line arguments:
+
   -s site to run on: can be local, pads, beagle 
 
   -p param set to use, from param/ dir
@@ -31,13 +33,34 @@
   FIXME: create a few more tet variations
 
 
-You can add new param sets in the param dir: just copy an existing one and change the params.
+Contents of parameter file:
 
-You can add new sites in the conf/ dir.  FIXME: for now, add gen.SITENAME files. Limited flexibility w/ tc
+#--------  params/Fast01
 
+min_target_innovation         58     # starting target innovation value to try
+max_target_innovation         109    # stops before this target innovation value
+target_innovation_increment   50     # increment target innovation by this amount 
 
+annealing_repeats             1      # times to repeate the entire optimization process for each target_innovation
+annealing_cycles              10     # times to perform the simulated annealing loop for all non-fixed parameters
 
+evolve_reruns                 8      # times to perform evolve_to_target_and_save() (objective function - is batched)
+nworkers                      1      # number of parallel threads (cores) to use per invocation of C++ optimizer
+reruns_per_opt_invocation     2      # reruns_per_opt_invocation mod nworkers must == 0 !!! <=== NOTE WELL !!!
 
+alpha_i                       0.0    # 5 evolve() parameters: must be decimal values !!!
+alpha_m                       0.0    # alpha_i and alpha_m are fixed for now
+beta                          4.0    # rest are varied by the optimization process
+gamma                         50.0
+delta                         -1.0 
+  
+#-------
+
+You can add new param sets in the param dir (or anywhere): just copy an existing one and change the params.
+
+You can add new sites in the conf/ dir.  FIXME: for now, add gen.SITENAME files. Limited flexibility w/ tc
+
+
 *** QuickStart
 
 mkdir $HOME/SciColSim # scientific collaboration simulation application

Added: SwiftApps/SciColSim/getboost.sh
===================================================================
--- SwiftApps/SciColSim/getboost.sh	                        (rev 0)
+++ SwiftApps/SciColSim/getboost.sh	2012-02-10 15:45:29 UTC (rev 5579)
@@ -0,0 +1,30 @@
+#! /bin/sh
+
+tarfile=boost_1_47_0.tar.gz
+release=$(basename $tarfile .tar.gz)
+boostrel=http://sourceforge.net/projects/boost/files/boost/1.47.0/boost_1_47_0.tar.gz/download
+
+echo
+echo Downloading $release from $boostrel 
+echo
+
+rm -rf $tarfile $release
+
+if [ $(uname) = Linux ]; then
+  wget  $boostrel
+else
+  curl $boostrel > $(basename $boostrel)
+fi
+
+echo
+echo Extracting $release from $tarfile
+echo
+
+tar zxf $tarfile
+
+echo
+echo Boost installed at $(pwd)/$release
+echo
+
+
+


Property changes on: SwiftApps/SciColSim/getboost.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: SwiftApps/SciColSim/getswift.sh
===================================================================
--- SwiftApps/SciColSim/getswift.sh	2012-02-10 01:37:02 UTC (rev 5578)
+++ SwiftApps/SciColSim/getswift.sh	2012-02-10 15:45:29 UTC (rev 5579)
@@ -6,15 +6,20 @@
 
 echo
 echo Downloading $release from $swiftrel 
+echo
 
-rm -f $tarfile
+rm -rf $tarfile $release
 
 if [ $(uname) = Linux ]; then
-  wget -nv $swiftrel
+  wget $swiftrel
 else
   curl $swiftrel > $(basename $swiftrel)
 fi
 
+echo
+echo Extracting $release from $swiftrel 
+echo
+
 tar zxf $tarfile
 
 echo
@@ -27,4 +32,10 @@
 ./swift/bin/swift -version
 rm -f swift.log
 
+echo
+echo Swift installation complete.
+echo
 
+
+
+

Added: SwiftApps/SciColSim/setup.sh
===================================================================
--- SwiftApps/SciColSim/setup.sh	                        (rev 0)
+++ SwiftApps/SciColSim/setup.sh	2012-02-10 15:45:29 UTC (rev 5579)
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+./getswift.sh
+
+./getboost.sh
+
+make clean
+make
+
+echo Setup complete.
\ No newline at end of file


Property changes on: SwiftApps/SciColSim/setup.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: SwiftApps/SciColSim/swiftopt.sh
===================================================================
--- SwiftApps/SciColSim/swiftopt.sh	2012-02-10 01:37:02 UTC (rev 5578)
+++ SwiftApps/SciColSim/swiftopt.sh	2012-02-10 15:45:29 UTC (rev 5579)
@@ -73,7 +73,7 @@
 
 cd $rundir
 
-SWIFT_HEAP_MAX=$ram SWIFT_LIB=.. $swift >& swift.out -tc.file tc -sites.file $execsite.xml -config cf ../annealing.swift $e33 \
+SWIFT_HEAP_MAX=$ram SWIFT_LIB=.. $swift >> swift.out 2>&1 -tc.file tc -sites.file $execsite.xml -config cf ../annealing.swift $e33 \
                                          \
 -minrange=$min_target_innovation         \
 -maxrange=$max_target_innovation         \


