Changeset 2845

Timestamp:

May 11, 2006, 3:10:59 PM (19 years ago)

Author:

jack

Message:

Added (hopefully) safe downcasting of the long array passed to pymetis.

Location:

inundation/pymetis

Files:

• long_idxtype.patch (deleted)
• pymetis/metis.c (modified) (4 diffs)
• test_metis.py (modified) (1 diff)

inundation/pymetis/pymetis/metis.c

@@ -42 +42 @@
  */
 static PyObject * metis_partMeshNodal(PyObject * self, PyObject * args){
+  int i;
   int ne;
   int nn;
@@ -56 +57 @@
 
   /* These are all of the metis idxtype */
+  idxtype * elem_c_arr;
   idxtype * epart;
   idxtype * npart;
@@ -61 +63 @@
     return NULL;
 
-  elem_arr = (PyArrayObject *) PyArray_ContiguousFromObject(elements, PyArray_INT, 1, 1);
+  elem_arr = (PyArrayObject *) PyArray_ContiguousFromObject(elements, PyArray_NOTYPE, 1, 1);
 
   if(!elem_arr)
     return NULL;
+
+  /* x86_64 will create arrays of longs and they need to be
+   * converted to arrays of idxtype for metis to work on them.
+   */
+  if(elem_arr->descr->type_num == PyArray_LONG){
+    elem_c_arr = (idxtype *)malloc(*(elem_arr->dimensions) * sizeof(idxtype));
+    if(!elem_c_arr)
+        return NULL;
+    for(i = 0 ; i < *(elem_arr->dimensions) ; i++){
+      elem_c_arr[i] = (idxtype)(((long *)elem_arr->data)[i]);
+      if(elem_c_arr[i] != ((long *)elem_arr->data)[i]) /* i.e. downcast failed */
+        return null;
+    }
+  }else
+    elem_c_arr = (idxtype *)elem_arr->data;
 
   epart = (idxtype *)malloc(ne * sizeof(idxtype));
@@ -77 +94 @@
     return NULL;
   }
-  bridge_partMeshNodal(&ne, &nn, (idxtype *)elem_arr->data, &etype, &numflag, &nparts, &edgecut, epart, npart);
+  bridge_partMeshNodal(&ne, &nn, elem_c_arr, &etype, &numflag, &nparts, &edgecut, epart, npart);
 
   dims[0] = ne;

inundation/pymetis/test_metis.py

@@ +1 @@
+#!/usr/bin/env python
 from os import sep
 from sys import path