Changeset 8071

Timestamp:

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

Author:

gray

Message:

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

Location:

branches/anuga_1_2_0/misc/tools/acceptance_tests

Files:

• test_latency_bandwidth.py (modified) (1 diff)
• test_python_packages.py (modified) (1 diff)
• test_quadrature_parallel_interleaved.py (modified) (3 diffs)
• test_test_pypar.py (modified) (3 diffs)

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

@@ -37 +37 @@
     results = []
     #machines_file = os.path.join('~', '.machines_%s' % cluster)
-    for num_procs in Processor_Numbers:
-        cmd = ('mpirun -nolocal -np %2d -hostfile %s %s'
-               % (num_procs, util.machines_file, obj_file))
+    for num_procs in Processor_Numbers: 
+        if cluster == 'cen-4470-test':
+            cmd = ('mpirun -np %2d %s'
+                   % (num_procs, obj_file))
+        else:
+            cmd = ('mpirun -nolocal -np %2d -hostfile %s %s'
+                   % (num_procs, util.machines_file, obj_file))
         util.log_print(logfile, cmd + ' ...')
         (_, fd) = os.popen4(cmd)

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

@@ -18 +18 @@
                    'import matplotlib',
                    'import pylab',
-                   'import wxPython',
+                   'import wx',
                    'import sqlalchemy',
                   )

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

@@ -7 +7 @@
 import test_utils as util
 
-Processor_Numbers = [1, 2, 4, 8, 16]
+Processor_Numbers = [1, 2, 4, 5, 8, 16, 32, 38, 64, 76]
 
 name = 'Running quadrature parallel interleaved test'
@@ -15 +15 @@
 
     (cluster, domain) = util.get_hostname()
-
+    print "cluster", cluster
+    print "domain", domain
     # get python to run
     python_env_var = os.getenv('PYTHON')
@@ -39 +40 @@
     #machines_file = os.path.join('machines_%s' % cluster)
     single_processor_time = None
-    for num_procs in Processor_Numbers:
-        cmd = ('mpirun -nolocal -np %2d -hostfile %s %s'
-               % (num_procs, util.machines_file, obj_file))
+    for num_procs in Processor_Numbers:  
+        if cluster == 'cen-4470-test':
+            cmd = ('mpirun -np %2d %s'
+                   % (num_procs, obj_file))
+        else:
+            cmd = ('mpirun -nolocal -np %2d -hostfile %s %s'
+                   % (num_procs, util.machines_file, obj_file))
         util.log_print(logfile, cmd + ' ...')
         (_, fd) = os.popen4(cmd)

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 + ' ...')