Changeset 2033 for trunk/tsuite

Timestamp:

05/09/08 08:56:01 (8 months ago)

Author:

peter

Message:

tsuite/slow/run_parallel.pl:

Port changes from version in auto test suite, update sequence to put h2 models upfront.

Files:

• trunk/tsuite/slow/run_parallel.pl (modified) (7 diffs)

trunk/tsuite/slow/run_parallel.pl

@@ -3 +3 @@
 # I have written a little perl script that runs the test suite in
 # parallel on suitable machines. The syntax is:
+#
+# run_parallel.pl cloudy.exe
+#
+# or
 #
 # run_parallel.pl cloudy.exe 16
@@ -9 +13 @@
 # should either be in your search path, or the full pathname should
 # be used. The second number is the number of processors to use. It
-# can be any number >= 1. However, using numbers larger than roughly
+# can be any number >= 0. However, using numbers larger than roughly
 # 16 will not give any speed advantage since the time will then be
-# set by the longest running test sims.
+# set by the longest running test sims. The second number is optional
+# and will default to the number of processosrs on your computer
+# (this number is only correctly determined under Linux and Windows,
+# it will be set to 1 on other systems).
+#
+# If the number of processors is set to 0, the script will exit after
+# creating the Makefile (i.e., the test suite will not be run).
+#
+# NB NB - The script will first delete any remaining output from a
+# previous run of the test suite by calling the script clean_tsuite.pl
+# (this includes calls with the number of processors set to 0) !
 #
 # The script uses "gmake" (GNU make) to run the test cases. In case
@@ -17 +31 @@
 # "make". If the version is not too old, that should work as well
 # provided it supports the -j parameter for parallel execution.
-# The script may need some other tinkering too, but I find it very
-# useful here.
+#
 # Peter van Hoof
 
 if( "$ARGV[0]" eq "" ) {
-    print "The name for the cloudy binary must be supplied...\n";
+    print "The path to the cloudy binary must be supplied as the first parameter to this script...\n";
     exit;
 }
 
 if( "$ARGV[1]" eq "" ) {
-    print "The number of processors must be supplied...\n";
-    exit;
+#     the following should work under Windows.
+    $nproc = $ENV{'NUMBER_OF_PROCESSORS'};
+    if( $nproc eq "" )
+    {
+#         this branch is for non-Windows
+        if( -r "/proc/cpuinfo" )
+        {
+#             this branch is for Linux
+            $nproc = 0;
+            open( foo, "</proc/cpuinfo" );
+            while( <foo> )
+            {
+                if( /^processor/ )
+                {
+                    ++$nproc;
+                }
+            }
+            close( foo );
+        }
+        else
+        {
+#             we don't know how to determine the number of CPUs
+            $nproc = 1;
+        }
+    }
+}
+else {
+    $nproc = $ARGV[1];
 }
 
@@ -43 +82 @@
 $i = 0;
 
-while( defined( $input = glob("*.in") ) ) {
+# this funny sequence is to assure that the heavy jobs are upfront...
+while( defined( $input = glob("h*.in [A-Za-gi-z]*.in") ) ) {
     $i++;
     $output = $input;
+    $output2 = $input;
     $output =~ s/\.in/.out/gi;
+    $output2 =~ s/\.in/.err/gi;
     $all = "$all$output ";
     if( $i%4 == 0 ) {
@@ -52 +94 @@
     }
     $rules = "$rules$output: $input\n";
-    $rules = "$rules\t$ARGV[0] < $input > $output\n"
+    $rules = "$rules\t$ARGV[0] < $input > $output 2> $output2\n"
 }
 open( foo, ">Makefile" );
@@ -61 +103 @@
 
 # if number of processors is 0 only create Makefile and exit
-if( $ARGV[1] > 0 ) {
+if( $nproc > 0 ) {
+    print "\nNow I will run the test suite using $nproc processors\n\n";
+
 #     this does the heavy lifting...
 #     try make instead if gmake doesn't exist on your system
-    system "gmake -i -j $ARGV[1]";
+    system "gmake -i -j $nproc";
 
 #     this was produced by the optimizers and is not really part of the test suite
@@ -70 +114 @@
     unlink "optimal.in";
 
-    if( $ARGV[1] > 1 ) {
+    if( $nproc > 1 ) {
 #         just in case func_trans_read was run before func_trans_punch was complete
         unlink "func_trans_read.out";
 #         try make instead if gmake doesn't exist on your system
-        system "gmake -i -j $ARGV[1]";
+        system "gmake -i -j $nproc";
     }