[m-rev.] for review: modified gator's configuration files to have more sensible defaults

[Samrith UONG]

For review by Ralph.

Estimated hours taken: 0.2

Changed the configuration files so that the program will work without
any additional configuration.

mercury/extras/gator/evaluate.conf:
        Instead of using the benchmark programs in the benchmarks
directory (which
        the user might not have access to), use mercury/samples/hello.m as the
        benchmark program.

mercury/extras/gator/evolve.conf:
        Since the evaluate.conf file was changed so that there is only
one benchmark
        program, we need to change the length of the first term.

mercury/extras/gator/gator.conf:
        In the previous revision, the hosts sophie, boadicea,
surprise, lively and
        leopard were used.  Rather than use these hosts, which are
only available to
        Mercury developers, use `hostname` instead.

Index: evaluate.conf
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/extras/gator/evaluate.conf,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 evaluate.conf
--- evaluate.conf	13 Feb 2006 01:42:02 -0000	1.1.1.1
+++ evaluate.conf	13 Feb 2006 04:55:02 -0000
@@ -1,7 +1,7 @@
 #
 # num_progs: the number of programs used for benchmarking.
 #
-num_progs=5
+num_progs=1

 #
 # For each program, the following variables need to be defined.
@@ -19,30 +19,10 @@
 # run$i: the command used to run the program.
 #

-prog1="$benchmarks"/progs/icfp2000/main
-clean1="mmc --make main.realclean; rm -rf Mercury"
-compile1="mmc --make -O0 $flags main"
-run1="./main <dice.cpp"
-
-prog2="$benchmarks"/progs/icfp2001/smlngopt
-clean2="mmc --make smlngopt.realclean; rm -rf Mercury"
-compile2="mmc --make -O0 $flags smlngopt"
-run2="./smlngopt OUTPUT <103-the-random-returns.txt"
-
-prog3="$benchmarks"/progs/nuc/nuc5
-clean3="mmc --make nuc5.realclean; rm -rf Mercury"
-compile3="mmc --make -O0 $flags nuc5"
-run3="./nuc5"
-
-prog4="$benchmarks"/progs/ray/proj
-clean4="mmc --make proj.realclean; rm -rf Mercury"
-compile4="mmc --make -O0 $flags proj"
-run4="./proj -f 100 -S -s 0.4 2 -a 0.1 dh.scene 140 140 0 0 0 >dh.ppm"
-
-prog5="$benchmarks"/progs/tree234/treetest
-clean5="mmc --make treetest.realclean; rm -rf Mercury"
-compile5="mmc --make -O0 $flags treetest"
-run5="./treetest"
+prog1="$benchmarks"/hello
+clean1="mmc --make hello.realclean; rm -rf Mercury"
+compile1="mmc --make -O0 $flags hello"
+run1="./hello"

 #
 # Some of the benchmarks can overflow the detstack.  Set it high enough
Index: evolve.conf
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/extras/gator/evolve.conf,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 evolve.conf
--- evolve.conf	13 Feb 2006 01:42:02 -0000	1.1.1.1
+++ evolve.conf	13 Feb 2006 05:00:26 -0000
@@ -1,8 +1,4 @@
-[
-	0.0, 0.0, 0.0, 0.0, 0.0,
-	0.0, 0.0, 0.0, 0.0, 0.0,
-	1.0, 1.0, 1.0, 1.0, 1.0
-].
+[ 1.0, 1.0, 1.0 ].

 [
 	"--no-inlining",
Index: gator.conf
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/extras/gator/gator.conf,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 gator.conf
--- gator.conf	13 Feb 2006 01:42:02 -0000	1.1.1.1
+++ gator.conf	13 Feb 2006 04:54:46 -0000
@@ -4,7 +4,7 @@
 #	being used to run the benchmarks.
 #

-num_hosts=5
+num_hosts=1

 #
 # For each host, the following variables need to be defined.
@@ -26,27 +26,7 @@
 #	pre-pended to $PATH in the evaluate script.
 #

-host1=sophie
-workspace1=/home/mercury/samrith/gator
-benchmarks1=/home/sophie/samrith/benchmarks
-path1=/home/sophie/public/mercury-latest/i686-pc-linux-gnu/bin
-
-host2=boadicea
-workspace2=/home/mercury/samrith/gator
-benchmarks2=/home/boadicea/samrith/benchmarks
-path2=/home/boadicea/public/mercury-latest/i686-pc-linux-gnu/bin
-
-host3=surprise
-workspace3=/home/mercury/samrith/gator
-benchmarks3=/home/surprise/samrith/benchmarks
-path3=/home/surprise/public/mercury-latest/i686-pc-linux-gnu/bin
-
-host4=lively
-workspace4=/home/mercury/samrith/gator
-benchmarks4=/home/lively/samrith/benchmarks
-path4=/home/lively/public/mercury-latest/i686-pc-linux-gnu/bin
-
-host5=leopard
-workspace5=/home/mercury/samrith/gator
-benchmarks5=/home/leopard/samrith/benchmarks
-path5=/home/leopard/public/mercury-latest/i686-pc-linux-gnu/bin
+host1=`hostname`
+workspace1="$HOME"/mercury/extras/gator
+benchmarks1="$HOME"/mercury/samples
+path1=`which mmc | xargs dirname`

--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------