Changeset 3414

Timestamp:

Jul 25, 2006, 1:03:05 PM (18 years ago)

Author:

jack

Message:

Added pymetis to the scons scripts

Files:

• SConstruct (modified) (1 diff)
• build_options.py (modified) (1 diff)
• inundation/SConscript (modified) (1 diff)
• inundation/pymetis/SConscript (added)
• inundation/pymetis/metis-4.0/Lib/meshpart.c (modified) (4 diffs)
• inundation/pymetis/pymetis/metis.c (modified) (4 diffs)
• inundation/pymetis/pymetis/metis_bridge.c (modified) (1 diff)
• inundation/pymetis/test_metis.py (modified) (1 diff)

SConstruct

@@ -12 +12 @@
 opts.Add('GCCFLAGS', 'Flags passed to GCC')
 opts.Add('MSVCFLAGS', 'Flags passed to the MSVC compiler')
+opts.Add('METIS_DIR', 'Location of the metis directory relative to the pymetis directory')
 
 # Create the .pyc builder

build_options.py

@@ -6 +6 @@
 # Flags to pass to MSVC Compiler
 MSVCFLAGS = '/Wall'
+
+# Location of the metis directory relative to the pymetis directory
+METIS_DIR = 'metis-4.0'

inundation/SConscript

@@ -2 +2 @@
 SConscript(['utilities/SConscript'])
 SConscript(['pyvolution/SConscript'])
+SConscript(['pymetis/SConscript'])

inundation/pymetis/metis-4.0/Lib/meshpart.c

@@ -31 +31 @@
   esize = esizes[*etype];
 
-  printf("Inside METIS_PartMeshNodal\n");
-  
   if (*numflag == 1)
     ChangeMesh2CNumbering((*ne)*esize, elmnts);
@@ -39 +37 @@
   adjncy = idxmalloc(20*(*nn), "METIS_MESHPARTNODAL: adjncy");
 
-  printf("Calling METIS_MeshToNodal\n");
   METIS_MeshToNodal(ne, nn, elmnts, etype, &pnumflag, xadj, adjncy);
-  printf("After METIS_MeshToNodal\n");
     
   adjncy = realloc(adjncy, xadj[*nn]*sizeof(idxtype));
 
   options[0] = 0;
-  printf("Calling METIS_PartGraphKway\n");  
   METIS_PartGraphKway(nn, xadj, adjncy, NULL, NULL, &wgtflag, &pnumflag, nparts, options, edgecut, npart);
 
   /* OK, now compute an element partition based on the nodal partition npart */
-  printf("Starting loop 1\n");  
   idxset(*ne, -1, epart);
   pwgts = idxsmalloc(*nparts, 0, "METIS_MESHPARTNODAL: pwgts");
@@ -65 +59 @@
   }
 
-  printf("Starting loop 2\n");    
   maxpwgt = 1.03*(*ne)/(*nparts);
   for (i=0; i<*ne; i++) {
@@ -103 +96 @@
   }
 
-  printf("ChangeMesh2FNumbering2\n");    
   if (*numflag == 1)
     ChangeMesh2FNumbering2((*ne)*esize, elmnts, *ne, *nn, epart, npart);
 
-  printf("Free\n");        
   GKfree(&xadj, &adjncy, &pwgts, LTERM);
-  printf("Done\n");      
-
 }
 

inundation/pymetis/pymetis/metis.c

@@ -64 +64 @@
     return NULL;
 
-  printf("Hello 1\n");
   elem_arr = (PyArrayObject *) PyArray_ContiguousFromObject(elements, PyArray_NOTYPE, 1, 1);
 
@@ -73 +72 @@
    * converted to arrays of idxtype for metis to work on them.
    */
-  printf("Hello 2\n");   
   if(elem_arr->descr->type_num == PyArray_LONG){
     elem_c_arr = (idxtype *)malloc(*(elem_arr->dimensions) * sizeof(idxtype));
@@ -90 +88 @@
     elem_c_arr = (idxtype *)elem_arr->data;
 
-  printf("Hello 3\n");    
   epart = (idxtype *)malloc(ne * sizeof(idxtype));
   if(epart == NULL){
@@ -104 +101 @@
     return NULL;
   }
-  printf("Hello 4\n"); 
   bridge_partMeshNodal(&ne, &nn, elem_c_arr, &etype, &numflag, &nparts, &edgecut, epart, npart);
 
-  printf("Hello 5\n");  
   dims[0] = ne;
   epart_pyarr = (PyArrayObject *)PyArray_FromDimsAndData(1, dims, PyArray_INT, (char *)epart);

inundation/pymetis/pymetis/metis_bridge.c

@@ -13 +13 @@
 
 void bridge_partMeshNodal(int * ne, int * nn, idxtype * elmnts, int * etype, int * numflag, int * nparts, int * edgecut, idxtype * epart, idxtype * npart){
-
-  printf("Inside bridge_PartMeshNodal\n");  
-
   METIS_PartMeshNodal(ne, nn, elmnts, etype, numflag, nparts, edgecut, epart, npart);
 }

inundation/pymetis/test_metis.py

@@ -39 +39 @@
         #print epart
         #print npart
-        epart_expected = array([2, 2, 0, 0, 0, 0], 'i')
-        npart_expected = array([0, 2, 2, 2, 0, 0, 0], 'i')
+        epart_expected = array([2, 2, 1, 1, 1, 1], 'i')
+        npart_expected = array([1, 2, 2, 2, 1, 1, 1], 'i')
         self.assert_(edgecut == 5)
         for i in range(len(epart)):