Changeset 6993

Timestamp:

May 7, 2009, 1:32:46 PM (14 years ago)

Author:

rwilson

Message:

Changes to run specified version of python.

Location:

branches/numpy_misc/tools/acceptance_tests

Files:

• test_dump_python_environment.py (modified) (2 diffs)
• test_filesystem_accessibility.py (modified) (1 diff)
• test_latency_bandwidth.py (modified) (1 diff)
• test_python_packages.py (modified) (1 diff)
• test_quadrature_parallel_interleaved.py (modified) (1 diff)
• test_ssh_to_compute_nodes.py (modified) (1 diff)
• test_test_all.py (modified) (3 diffs)
• test_test_pypar.py (modified) (3 diffs)

branches/numpy_misc/tools/acceptance_tests/test_dump_python_environment.py

@@ -20 +20 @@
     util.log_print_nl(logfile)
 
+    # show value of PYTHON environment variable
+    python_env_var = os.getenv('PYTHON', '')
+    util.log_print_nl(logfile, 'PYTHON environment variable = %s' % python_env_var)
+    if python_env_var == '':
+        util.log_print_nl(logfile, "Assume 'export PYTHON=python'")
+    util.log_print_nl(logfile)
+    python_env_var = os.getenv('PYTHON', 'python')
+
     # show python version being used
+    cmd = '%s -c "import sys;print sys.version"' % python_env_var
+    fd = os.popen(cmd, 'r')
+    python_version = fd.read()
+    fd.close() 
     util.log_print_nl(logfile, 'Python version: %s' % sys.version.replace('\n', ' '))
     util.log_print_nl(logfile)
@@ -26 +38 @@
     # show PYTHONPATH value
     pythonpath = os.getenv('PYTHONPATH')
-    util.log_print_nl(logfile, 'PYTHONPATH: %s' % pythonpath)
+    util.log_print_nl(logfile, 'PYTHONPATH environment variable = %s' % pythonpath)
     util.log_print_nl(logfile)
 

branches/numpy_misc/tools/acceptance_tests/test_filesystem_accessibility.py

@@ -20 +20 @@
 
     util.header(logfile, 'Test of filesystem accessibility on %s.' % cluster)
+    # get python to run
+    python_env_var = os.getenv('PYTHON', 'python')
 
     # get max width of the filesystem paths

branches/numpy_misc/tools/acceptance_tests/test_latency_bandwidth.py

@@ -16 +16 @@
 
     util.header(logfile, 'Running latency/bandwidth test on %s.' % cluster)
+
+    # get python to run
+    python_env_var = os.getenv('PYTHON', 'python')
 
     # compile C code

branches/numpy_misc/tools/acceptance_tests/test_python_packages.py

@@ -24 +24 @@
 
     util.header(logfile, 'Test if python packages are importable on %s.' % cluster)
+
+    # get python to run
+    python_env_var = os.getenv('PYTHON', 'python')
 
     # get max width of the import tests

branches/numpy_misc/tools/acceptance_tests/test_quadrature_parallel_interleaved.py

@@ -16 +16 @@
 
     util.header(logfile, 'Running quadrature parallel interleaved test on %s.' % cluster)
+
+    # get python to run
+    python_env_var = os.getenv('PYTHON', 'python')
 
     # compile C code

branches/numpy_misc/tools/acceptance_tests/test_ssh_to_compute_nodes.py

@@ -15 +15 @@
 
     util.header(logfile, 'Test of compute-node accessibility via ssh on %s.' % cluster)
+
+    # get python to run
+    python_env_var = os.getenv('PYTHON', 'python')
 
     # get cluster-specific information

branches/numpy_misc/tools/acceptance_tests/test_test_all.py

@@ -16 +16 @@
     util.header(logfile, 'Running ANUGA test_all.py on %s.' % cluster)
 
+    # get python to run
+    python_env_var = os.getenv('PYTHON', 'python')
+
     # remember the directory we are in and go to ANUGA test directory
     home_directory = os.getcwd()
@@ -23 +26 @@
 
     # compile C code
-    util.log_print_nl(logfile, 'python compile_all.py')
-    (_, fd) = os.popen4('python compile_all.py')
+    util.log_print_nl(logfile, '%s compile_all.py') % python_env_var
+    (_, fd) = os.popen4('%s compile_all.py')  % python_env_var
     compile_result = fd.read()
     status = fd.close()
@@ -30 +33 @@
 
     # run test_all.py
-    util.log_print_nl(logfile, 'python test_all.py')
-    (_, fd) = os.popen4('python test_all.py')
+    util.log_print_nl(logfile, '%s test_all.py') % python_env_var
+    (_, fd) = os.popen4('%s test_all.py') % python_env_var
     test_result = fd.read()
     status = fd.close()

branches/numpy_misc/tools/acceptance_tests/test_test_pypar.py

@@ -17 +17 @@
     util.header(logfile, 'Running pypar test on %s.' % cluster)
 
+    # get python to run
+    python_env_var = os.getenv('PYTHON', 'python')
+
     # run the test_pypar.py tests
     machines_file = '~/.machines_%s' % cluster
     for num_procs in Processor_Numbers:
-        cmd = ('mpirun -np %2d -hostfile %s python test_pypar.py'
-               % (num_procs, machines_file))
+        cmd = ('mpirun -np %2d -hostfile %s %s test_pypar.py'
+               % (num_procs, machines_file, python_env_var))
         util.log_print(logfile, cmd + ' ...')
         fd = os.popen(cmd)
@@ -46 +49 @@
     home_directory = os.getcwd()
     os.chdir('mandelbrot')
-    
-    util.log_print_nl(logfile, 'python compile_mandelbrot_c_extensions.py')
-    fd = os.popen('python compile_mandelbrot_c_extensions.py')
+   
+    cmd = '%s compile_mandelbrot_c_extensions.py' % python_env_var 
+    util.log_print_nl(logfile, cmd)
+    fd = os.popen(cmd)
     compile_result = fd.read()
     status = fd.close()
@@ -59 +63 @@
     result_data = []
     for num_procs in Processor_Numbers:
-        cmd = ('mpirun -np %2d -hostfile %s python mandel_parallel_cyclic.py'
-               % (num_procs, machines_file))
+        cmd = ('mpirun -np %2d -hostfile %s %s mandel_parallel_cyclic.py'
+               % (num_procs, machines_file, python_env_var))
         util.log_print(logfile, cmd + ' ...')
         fd = os.popen(cmd)