Changeset 9576

Timestamp:

Feb 1, 2015, 6:41:57 PM (9 years ago)

Author:

steve

Message:

Don't copy over parallel tests if parallel envionment not setup via pypar

File:

• trunk/anuga_core/source/anuga/parallel/setup.py (modified) (3 diffs)

trunk/anuga_core/source/anuga/parallel/setup.py

@@ -63 +63 @@
     from numpy.distutils.system_info import get_info
     
-    mpi_flags = parse_command(getoutput_mpicc())
+  
     
     #print(mpi_flags)
@@ -69 +69 @@
     config = Configuration('parallel', parent_package, top_path)
 
-    config.add_data_dir('tests')
-    config.add_data_dir('data')
+    try:
+        # Use this import to check if we are in a parallel environment
+        import pypar
 
-    try:
-        import pypar
-    
+        #We are parallel!
+        mpi_flags = parse_command(getoutput_mpicc())
+
+        config.add_data_dir('tests')
+        config.add_data_dir('data')
+         
         config.add_extension('mpiextras',
                          sources=['mpiextras.c'],
@@ -83 +87 @@
                          undef_macros=mpi_flags['undef_macros'])
     except:
-        #No parallel support
+        #No parallel support, so just copy over the py files
         pass