Changeset 8071 for branches/anuga_1_2_0/misc/tools/acceptance_tests/test_test_pypar.py

Timestamp:

Nov 17, 2010, 3:45:44 PM (13 years ago)

Author:

gray

Message:

modified acceptance tests to test the cen-4470-test HPC.

File:

• branches/anuga_1_2_0/misc/tools/acceptance_tests/test_test_pypar.py (modified) (3 diffs)

branches/anuga_1_2_0/misc/tools/acceptance_tests/test_test_pypar.py

@@ -7 +7 @@
 import test_utils as util
 
-Processor_Numbers = [1, 2, 4, 8, 16]
+Processor_Numbers = [1, 20, 24, 28, 30, 32]
 
 name = 'Running pypar test'
@@ -18 +18 @@
     # get python to run
     python_env_var = os.getenv('PYTHON')
+    if python_env_var is None:
+        python_env_var = 'python'
 
     # run the test_pypar.py tests
     #machines_file = os.path.join('~', '.machines_%s' % cluster)
-    for num_procs in Processor_Numbers:
-        cmd = ('mpirun -nolocal -np %2d -hostfile %s %s test_pypar.py'
-               % (num_procs, util.machines_file, python_env_var))
+    for num_procs in Processor_Numbers: 
+        if cluster == 'cen-4470-test':
+            cmd = ('mpirun -np %2d %s test_pypar.py'
+                   % (num_procs, python_env_var))
+        else:
+            cmd = ('mpirun -nolocal -np %2d -hostfile %s %s test_pypar.py'
+                   % (num_procs, util.machines_file, python_env_var))
         util.log_print(logfile, cmd + ' ...')
         fd = os.popen(cmd)
@@ -69 +75 @@
     machines_file = os.path.join('..', util.machines_file)
     result_data = []
-    for num_procs in Processor_Numbers:
-        cmd = ('mpirun -nolocal -np %2d -hostfile %s %s mandel_parallel_cyclic.py'
+    for num_procs in Processor_Numbers: 
+        if cluster == 'cen-4470-test':
+            cmd = ('mpirun -np %2d %s mandel_parallel_cyclic.py'
+                   % (num_procs, python_env_var))
+        else:
+            cmd = ('mpirun -nolocal -np %2d -hostfile %s %s mandel_parallel_cyclic.py'
                % (num_procs, machines_file, python_env_var))
         util.log_print(logfile, cmd + ' ...')