Changeset 9535

Timestamp:

Jan 29, 2015, 11:45:09 AM (9 years ago)

Author:

steve

Message:

Fixed up setup.py script to include pymetis

Location:

trunk/anuga_core

Files:

• compile_all.py (modified) (3 diffs)
• source/anuga/setup.py (modified) (1 diff)

trunk/anuga_core/compile_all.py

@@ -59 +59 @@
     os.chdir('source')
     os.chdir('anuga')
-    os.chdir('parallel')
+    #os.chdir('parallel')
     os.chdir('pymetis')
 
     print 'Changing to', os.getcwd()        
 
-    make_logfile = os.path.join(buildroot, 'make_metis.log')
-    options = ''
-    if sys.platform == 'win32':
-        options = 'for_win32'
-    else:
-        if os.name == 'posix':
-            if os.uname()[4] in ['x86_64', 'ia64']:
-                options = ' '
-
-    make_command = 'make %s > %s' % (options, make_logfile)
-    print make_command
-    err = os.system(make_command)
+    cmd = 'python setup.py build_ext --inplace -f '
+    print cmd
+    err = os.system(cmd)
     if err != 0:
-        msg = 'Could not compile Metis '
+        msg = 'Could not compile pymetis '
         msg += 'on platform %s, %s\n' % (sys.platform, os.name)
-        msg += 'You need to compile Metis manually '
+        msg += 'You need to compile metis manually '
         msg += 'if you want to run ANUGA in parallel.'
         raise Exception, msg
     else:
-        msg = 'Compiled Metis succesfully. Output from Make is available in %s'\
-            % make_logfile
+        msg = 'Compiled pymetis successfully.'
         print msg
+
+
+
+    
+    ## make_logfile = os.path.join(buildroot, 'make_metis.log')
+    ## options = ''
+    ## if sys.platform == 'win32':
+    ##     options = 'for_win32'
+    ## else:
+    ##     if os.name == 'posix':
+    ##         if os.uname()[4] in ['x86_64', 'ia64']:
+    ##             options = ' '
+
+    ## make_command = 'make %s > %s' % (options, make_logfile)
+    ## print make_command
+    ## err = os.system(make_command)
+    ## if err != 0:
+    ##     msg = 'Could not compile Metis '
+    ##     msg += 'on platform %s, %s\n' % (sys.platform, os.name)
+    ##     msg += 'You need to compile Metis manually '
+    ##     msg += 'if you want to run ANUGA in parallel.'
+    ##     raise Exception, msg
+    ## else:
+    ##     msg = 'Compiled Metis succesfully. Output from Make is available in %s'\
+    ##         % make_logfile
+    ##     print msg
         
 except:
@@ -102 +118 @@
     print 
     print '-----------------------------------------------'
-    print 'Attempting to compile pypar_extras'
+    print 'Attempting to compile mpiextras'
     print '-----------------------------------------------'
 
@@ -110 +126 @@
     os.chdir('anuga')
     os.chdir('parallel')
-    os.chdir('pypar_extras')
+    #os.chdir('pypar_extras')
 
-    cmd = 'python anuga_setup.py'
+    cmd = 'python setup.py build_ext --inplace -f '
     print cmd
     err = os.system(cmd)
     if err != 0:
-        msg = 'Could not compile pypar_extras '
+        msg = 'Could not compile mpiextras '
         msg += 'on platform %s, %s\n' % (sys.platform, os.name)
-        msg += 'You need to compile pypar_extras manually '
+        msg += 'You need to compile mpiextras manually '
         msg += 'if you want to run ANUGA in parallel.'
         raise Exception, msg
     else:
-        msg = 'Compiled pypar_extras successfully.'
+        msg = 'Compiled mpiextras successfully.'
         print msg
 except:

trunk/anuga_core/source/anuga/setup.py

@@ -27 +27 @@
     config.add_subpackage('parallel')
     config.add_subpackage('pmesh')
+    config.add_subpackage('pymetis')
     config.add_subpackage('shallow_water')
     config.add_subpackage('structures')