Changeset 9529

Timestamp:

Jan 28, 2015, 3:24:01 PM (9 years ago)

Author:

steve

Message:

Removed pypar_extras folder as it really only contains two files

Location:

trunk/anuga_core/source/anuga

Files:

• operators/setup.py (modified) (1 diff)
• parallel/distribute_mesh.py (modified) (1 diff)
• parallel/parallel_generic_communications.py (modified) (2 diffs)
• parallel/pypar_extras (deleted)
• pymetis (moved) (moved from trunk/anuga_core/source/anuga/parallel/pymetis)
• pymetis/Makefile (modified) (3 diffs)
• pymetis/bridge.h (copied) (copied from trunk/anuga_core/source/anuga/parallel/pymetis/pymetis/bridge.h)
• pymetis/get_module.py (copied) (copied from trunk/anuga_core/source/anuga/parallel/pymetis/pymetis/get_module.py)
• pymetis/metis-4.0/Makefile (modified) (1 diff)
• pymetis/metis.c (copied) (copied from trunk/anuga_core/source/anuga/parallel/pymetis/pymetis/metis.c)
• pymetis/metis_bridge.c (copied) (copied from trunk/anuga_core/source/anuga/parallel/pymetis/pymetis/metis_bridge.c)
• pymetis/pymetis/bridge.h (deleted)
• pymetis/pymetis/get_module.py (deleted)
• pymetis/pymetis/metis.c (deleted)
• pymetis/pymetis/metis_bridge.c (deleted)
• pymetis/pymetis/setup.py (deleted)
• pymetis/setup.py (copied) (copied from trunk/anuga_core/source/anuga/parallel/pymetis/pymetis/setup.py) (1 diff)
• pymetis/test (added)
• pymetis/test/__init__.py (added)
• pymetis/test/test_metis.py (copied) (copied from trunk/anuga_core/source/anuga/parallel/pymetis/test_metis.py) (1 diff)
• pymetis/test_all.py (deleted)
• pymetis/test_metis.py (deleted)

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

@@ -36 +36 @@
     from numpy.distutils.core import setup
     setup(configuration=configuration)
+ 

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

@@ -123 +123 @@
 
 try:
-    from pymetis.metis import partMeshNodal
+    from anuga.pymetis.metis import partMeshNodal
 except ImportError:
     print "***************************************************"

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

@@ -40 +40 @@
 
 
-    import anuga.parallel.pypar_extras as par_exts
+    import anuga.parallel.pypar_ext as par_exts
 
     par_exts.allreduce(domain.local_timestep, pypar.MIN,
@@ -176 +176 @@
     # Do all the comuunication using isend/irecv via the buffers in the
     # full_send_dict and ghost_recv_dict
-    from anuga.parallel.pypar_extras import mpiextras
+    from anuga.parallel import mpiextras
 
     mpiextras.send_recv_via_dicts(domain.full_send_dict,domain.ghost_recv_dict)

trunk/anuga_core/source/anuga/pymetis/Makefile

@@ -20 +20 @@
 
 pymetis_module:
-        (cd pymetis; METIS_DIR=$(METIS_DIR) python setup.py build; python get_module.py)
+        (METIS_DIR=$(METIS_DIR) python setup.py build_ext --inplace)
 
 for_win32: metis_win32 pymetis_module_win32
@@ -31 +31 @@
 
 pymetis_module_win32:
-        (cd pymetis; METIS_DIR=$(METIS_DIR) python setup.py build --compiler=mingw32; python get_module.py)
+        (METIS_DIR=$(METIS_DIR) python setup.py build_ext --compiler=mingw32 --inplace)
 
 ###
@@ -40 +40 @@
         make -C $(METIS_DIR) clean
         make -C win32 clean
-        -(cd pymetis; rm -rf build)
-        -(cd pymetis; rm *~)
+        -(rm -rf build)
         -rm *~
 

trunk/anuga_core/source/anuga/pymetis/metis-4.0/Makefile

@@ -2 +2 @@
 
 default:
+        (cd Lib ; make ) 
+
+full:
         (cd Lib ; make ) 
         (cd Programs ; make ) 

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

@@ -5 +5 @@
 metis = Extension('metis',
                   sources = ['metis.c', 'metis_bridge.c'],
-                  include_dirs = ['..' + os.sep + os.environ['METIS_DIR'] + os.sep + 'Lib' ] + get_numpy_include_dirs(),
+                  include_dirs = [os.environ['METIS_DIR'] + os.sep + 'Lib' ] + get_numpy_include_dirs(),
                   libraries = ['metis', 'm'],
-                  library_dirs = ['..' + os.sep + os.environ['METIS_DIR']]);
+                  library_dirs = [os.environ['METIS_DIR']]);
 
 setup(name = 'PyMetis',

trunk/anuga_core/source/anuga/pymetis/test/test_metis.py

@@ -9 +9 @@
 # path.append('..' + sep + 'pymetis')
 
-import anuga.parallel.pymetis.metis  as metis
+import anuga.pymetis.metis as metis
 
 class TestMetis(unittest.TestCase):