Changeset 2806

Timestamp:

May 5, 2006, 4:27:36 PM (17 years ago)

Author:

jack

Message:

Update to use long as the index type. Needs verification on 32-bit
machines.

Location:

inundation/pymetis

Files:

• Makefile (modified) (4 diffs)
• README (modified) (1 diff)
• long_idxtype.patch (added)
• metis-4.0/Lib/struct.h (modified) (1 diff)
• pymetis/metis.c (modified) (2 diffs)
• test_metis.py (modified) (1 diff)

inundation/pymetis/Makefile

@@ -15 +15 @@
 pymetis: metis pymetis_module
 
-metis:
+metis: patched
         make -C $(METIS_DIR)
 
@@ -23 +23 @@
 for_win32: metis_win32 pymetis_module_win32
 
-metis_win32:
+metis_win32: patched
         make -C win32 METIS_DIR=$(METIS_DIR)
 ########make -C $(METIS_DIR)/Lib is implied by make -C win32
@@ -33 +33 @@
 
 ###
+# Patch the metis sources to use long as the idxtype
+# (for x86_64 mainly, but this allows a drop-in of the metis dir.)
+#
+patched:
+        patch -p0<long_idxtype.patch
+        touch patched
+
+###
 # Clean
 #
-
 clean:
         make -C $(METIS_DIR) clean
@@ -47 +54 @@
         -rm -f metis.so
         -rm -f metis.pyd
+        patch -p0 -R<long_idxtype.patch
+        -rm -f patched

inundation/pymetis/README

@@ -10 +10 @@
 Should the metis version change, the new metis package should be in a new
 subdirectory. Metis 4.0 is in metis-4.0
+
+The build scripts patch the metis sources to use longs instead of ints for the
+index type. If a future metis version does not require manually patching,
+either edit the makefile or create an empty file with the name `patched' in
+the top pymetis directory.
 
 The METIS_DIR= line in the makefile will need to be changed appropriately.

inundation/pymetis/metis-4.0/Lib/struct.h

@@ -12 +12 @@
  */
 
-/* Undefine the following #define in order to use short int as the idxtype */
-#define IDXTYPE_INT
-
-/* Indexes are as long as integers for now */
-#ifdef IDXTYPE_INT
-typedef int idxtype;
-#else
-typedef short idxtype;
-#endif
+typedef long idxtype;
 
 #define MAXIDX  (1<<8*sizeof(idxtype)-2)

inundation/pymetis/pymetis/metis.c

@@ -3 +3 @@
 
 /* This must be the same as the metis idxtype */
-typedef int idxtype;
+typedef long idxtype;
 
 #include "bridge.h"
@@ -61 +61 @@
     return NULL;
 
-  elem_arr = (PyArrayObject *) PyArray_ContiguousFromObject(elements, PyArray_INT, 1, 1);
+  elem_arr = (PyArrayObject *) PyArray_ContiguousFromObject(elements, PyArray_LONG, 1, 1);
 
   if(!elem_arr)

inundation/pymetis/test_metis.py

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