[cig-commits] r4216 - mc/3D/CitcomS/trunk/module/PyxMPI
luis at geodynamics.org
luis at geodynamics.org
Thu Aug 3 04:17:03 PDT 2006
Author: luis
Date: 2006-08-03 04:17:02 -0700 (Thu, 03 Aug 2006)
New Revision: 4216
Modified:
mc/3D/CitcomS/trunk/module/PyxMPI/PyxMPI.c
Log:
Regenerated PyxMPI.c with Pyrex 0.9.4 to fix GCC4 lvalue-casting error.
Modified: mc/3D/CitcomS/trunk/module/PyxMPI/PyxMPI.c
===================================================================
--- mc/3D/CitcomS/trunk/module/PyxMPI/PyxMPI.c 2006-08-03 11:14:07 UTC (rev 4215)
+++ mc/3D/CitcomS/trunk/module/PyxMPI/PyxMPI.c 2006-08-03 11:17:02 UTC (rev 4216)
@@ -1,10 +1,16 @@
-/* Generated by Pyrex 0.9.3 on Wed Jul 5 18:14:01 2006 */
+/* Generated by Pyrex 0.9.4.1 on Thu Aug 3 04:09:56 2006 */
#include "Python.h"
#include "structmember.h"
#ifndef PY_LONG_LONG
#define PY_LONG_LONG LONG_LONG
#endif
+#ifdef __cplusplus
+#define __PYX_EXTERN_C extern "C"
+#else
+#define __PYX_EXTERN_C extern
+#endif
+__PYX_EXTERN_C double pow(double, double);
#include "stdlib.h"
#include "mpi.h"
@@ -36,14 +42,13 @@
static PyObject *__pyx_b;
static int __pyx_lineno;
static char *__pyx_filename;
-staticforward char **__pyx_f;
+static char **__pyx_f;
/* Declarations from cmpi */
/* Declarations from PyxMPI */
-staticforward PyTypeObject __pyx_type_6PyxMPI_MPI_Comm;
struct __pyx_obj_6PyxMPI_MPI_Comm {
PyObject_HEAD
@@ -70,7 +75,7 @@
if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return -1;
Py_INCREF(__pyx_v_self);
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":17 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":17 */
((struct __pyx_obj_6PyxMPI_MPI_Comm *)__pyx_v_self)->comm = MPI_COMM_WORLD;
__pyx_r = 0;
@@ -105,16 +110,16 @@
static char *__pyx_argnames[] = {"argv",0};
if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_argv)) return 0;
Py_INCREF(__pyx_v_argv);
- __pyx_v_myargv = Py_None; Py_INCREF(__pyx_v_myargv);
- __pyx_v_arg = Py_None; Py_INCREF(__pyx_v_arg);
+ __pyx_v_myargv = Py_None; Py_INCREF(Py_None);
+ __pyx_v_arg = Py_None; Py_INCREF(Py_None);
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":30 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":30 */
__pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 30; goto __pyx_L1;}
Py_DECREF(__pyx_v_myargv);
__pyx_v_myargv = __pyx_1;
__pyx_1 = 0;
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":33 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":33 */
__pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; goto __pyx_L1;}
__pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; goto __pyx_L1;}
Py_INCREF(__pyx_v_argv);
@@ -126,13 +131,13 @@
Py_DECREF(__pyx_3); __pyx_3 = 0;
__pyx_v_cargc = __pyx_4;
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":34 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":34 */
__pyx_v_cargv = ((char (*(*)))malloc(((__pyx_v_cargc + 1) * (sizeof(char (*))))));
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":35 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":35 */
for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_cargc; ++__pyx_v_i) {
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":36 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":36 */
__pyx_1 = PyInt_FromLong(__pyx_v_i); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; goto __pyx_L1;}
__pyx_2 = PyObject_GetItem(__pyx_v_argv, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; goto __pyx_L1;}
Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -140,7 +145,7 @@
__pyx_v_arg = __pyx_2;
__pyx_2 = 0;
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":37 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":37 */
__pyx_3 = PyObject_GetAttr(__pyx_v_myargv, __pyx_n_append); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 37; goto __pyx_L1;}
__pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 37; goto __pyx_L1;}
Py_INCREF(__pyx_v_arg);
@@ -150,30 +155,30 @@
Py_DECREF(__pyx_1); __pyx_1 = 0;
Py_DECREF(__pyx_2); __pyx_2 = 0;
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":38 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":38 */
__pyx_5 = PyString_AsString(__pyx_v_arg); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; goto __pyx_L1;}
(__pyx_v_cargv[__pyx_v_i]) = __pyx_5;
__pyx_L2:;
}
__pyx_L3:;
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":39 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":39 */
(__pyx_v_cargv[__pyx_v_cargc]) = 0;
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":42 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":42 */
__pyx_v_mycargv = __pyx_v_cargv;
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":43 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":43 */
__pyx_v_error = MPI_Init((&__pyx_v_cargc),(&__pyx_v_cargv));
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":44 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":44 */
__pyx_4 = (__pyx_v_error != MPI_SUCCESS);
if (__pyx_4) {
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":45 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":45 */
free(__pyx_v_mycargv);
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":46 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":46 */
__pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_MPI_Error); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; goto __pyx_L1;}
__pyx_1 = PyInt_FromLong(__pyx_v_error); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; goto __pyx_L1;}
__Pyx_Raise(__pyx_3, __pyx_1, 0);
@@ -184,13 +189,13 @@
}
__pyx_L4:;
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":49 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":49 */
if (PySequence_DelSlice(__pyx_v_argv, 0, 0x7fffffff) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; goto __pyx_L1;}
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":50 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":50 */
for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_cargc; ++__pyx_v_i) {
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":51 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":51 */
__pyx_2 = PyObject_GetAttr(__pyx_v_argv, __pyx_n_append); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; goto __pyx_L1;}
__pyx_3 = PyString_FromString((__pyx_v_cargv[__pyx_v_i])); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; goto __pyx_L1;}
__pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; goto __pyx_L1;}
@@ -204,14 +209,14 @@
}
__pyx_L6:;
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":52 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":52 */
free(__pyx_v_mycargv);
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":54 */
- __pyx_r = Py_None; Py_INCREF(__pyx_r);
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":54 */
+ __pyx_r = Py_None; Py_INCREF(Py_None);
goto __pyx_L0;
- __pyx_r = Py_None; Py_INCREF(__pyx_r);
+ __pyx_r = Py_None; Py_INCREF(Py_None);
goto __pyx_L0;
__pyx_L1:;
Py_XDECREF(__pyx_1);
@@ -236,14 +241,14 @@
static char *__pyx_argnames[] = {0};
if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":59 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":59 */
__pyx_v_error = MPI_Finalize();
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":60 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":60 */
__pyx_1 = (__pyx_v_error != MPI_SUCCESS);
if (__pyx_1) {
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":61 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":61 */
__pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_MPI_Error); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; goto __pyx_L1;}
__pyx_3 = PyInt_FromLong(__pyx_v_error); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; goto __pyx_L1;}
__Pyx_Raise(__pyx_2, __pyx_3, 0);
@@ -254,11 +259,11 @@
}
__pyx_L2:;
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":62 */
- __pyx_r = Py_None; Py_INCREF(__pyx_r);
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":62 */
+ __pyx_r = Py_None; Py_INCREF(Py_None);
goto __pyx_L0;
- __pyx_r = Py_None; Py_INCREF(__pyx_r);
+ __pyx_r = Py_None; Py_INCREF(Py_None);
goto __pyx_L0;
__pyx_L1:;
Py_XDECREF(__pyx_2);
@@ -282,22 +287,22 @@
static char *__pyx_argnames[] = {"comm",0};
if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_comm)) return 0;
Py_INCREF(__pyx_v_comm);
- ((PyObject*)__pyx_v_c_comm) = Py_None; Py_INCREF(((PyObject*)__pyx_v_c_comm));
+ __pyx_v_c_comm = ((struct __pyx_obj_6PyxMPI_MPI_Comm *)Py_None); Py_INCREF(Py_None);
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":69 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":69 */
if (!__Pyx_TypeTest(__pyx_v_comm, __pyx_ptype_6PyxMPI_MPI_Comm)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; goto __pyx_L1;}
Py_INCREF(__pyx_v_comm);
Py_DECREF(((PyObject *)__pyx_v_c_comm));
- ((PyObject *)__pyx_v_c_comm) = __pyx_v_comm;
+ __pyx_v_c_comm = ((struct __pyx_obj_6PyxMPI_MPI_Comm *)__pyx_v_comm);
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":70 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":70 */
__pyx_v_error = MPI_Comm_rank(__pyx_v_c_comm->comm,(&__pyx_v_rank));
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":71 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":71 */
__pyx_1 = (__pyx_v_error != MPI_SUCCESS);
if (__pyx_1) {
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":72 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":72 */
__pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_MPI_Error); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; goto __pyx_L1;}
__pyx_3 = PyInt_FromLong(__pyx_v_error); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; goto __pyx_L1;}
__Pyx_Raise(__pyx_2, __pyx_3, 0);
@@ -308,13 +313,13 @@
}
__pyx_L2:;
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":73 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":73 */
__pyx_2 = PyInt_FromLong(__pyx_v_rank); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; goto __pyx_L1;}
__pyx_r = __pyx_2;
__pyx_2 = 0;
goto __pyx_L0;
- __pyx_r = Py_None; Py_INCREF(__pyx_r);
+ __pyx_r = Py_None; Py_INCREF(Py_None);
goto __pyx_L0;
__pyx_L1:;
Py_XDECREF(__pyx_2);
@@ -433,7 +438,7 @@
0, /*bf_getcharbuffer*/
};
-statichere PyTypeObject __pyx_type_6PyxMPI_MPI_Comm = {
+PyTypeObject __pyx_type_6PyxMPI_MPI_Comm = {
PyObject_HEAD_INIT(0)
0, /*ob_size*/
"PyxMPI.MPI_Comm", /*tp_name*/
@@ -454,7 +459,7 @@
0, /*tp_getattro*/
0, /*tp_setattro*/
&__pyx_tp_as_buffer_MPI_Comm, /*tp_as_buffer*/
- Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE, /*tp_flags*/
+ Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
0, /*tp_doc*/
__pyx_tp_traverse_6PyxMPI_MPI_Comm, /*tp_traverse*/
__pyx_tp_clear_6PyxMPI_MPI_Comm, /*tp_clear*/
@@ -489,11 +494,14 @@
{0, 0, 0, 0}
};
-DL_EXPORT(void) initPyxMPI(void); /*proto*/
-DL_EXPORT(void) initPyxMPI(void) {
+static void __pyx_init_filenames(void); /*proto*/
+
+PyMODINIT_FUNC initPyxMPI(void); /*proto*/
+PyMODINIT_FUNC initPyxMPI(void) {
PyObject *__pyx_1 = 0;
PyObject *__pyx_2 = 0;
PyObject *__pyx_3 = 0;
+ __pyx_init_filenames();
__pyx_m = Py_InitModule4("PyxMPI", __pyx_methods, 0, 0, PYTHON_API_VERSION);
if (!__pyx_m) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4; goto __pyx_L1;};
__pyx_b = PyImport_AddModule("__builtin__");
@@ -504,14 +512,14 @@
if (PyObject_SetAttrString(__pyx_m, "MPI_Comm", (PyObject *)&__pyx_type_6PyxMPI_MPI_Comm) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 12; goto __pyx_L1;}
__pyx_ptype_6PyxMPI_MPI_Comm = &__pyx_type_6PyxMPI_MPI_Comm;
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":20 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":20 */
__pyx_1 = PyTuple_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; goto __pyx_L1;}
__pyx_2 = PyObject_CallObject(((PyObject*)__pyx_ptype_6PyxMPI_MPI_Comm), __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; goto __pyx_L1;}
Py_DECREF(__pyx_1); __pyx_1 = 0;
if (PyObject_SetAttr(__pyx_m, __pyx_n_MPI_COMM_WORLD, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; goto __pyx_L1;}
Py_DECREF(__pyx_2); __pyx_2 = 0;
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":23 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":23 */
__pyx_1 = PyDict_New(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 23; goto __pyx_L1;}
__pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_EnvironmentError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 23; goto __pyx_L1;}
__pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 23; goto __pyx_L1;}
@@ -520,12 +528,12 @@
__pyx_2 = __Pyx_CreateClass(__pyx_3, __pyx_1, __pyx_n_MPI_Error, "PyxMPI"); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 23; goto __pyx_L1;}
Py_DECREF(__pyx_3); __pyx_3 = 0;
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":24 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":24 */
if (PyObject_SetAttr(__pyx_m, __pyx_n_MPI_Error, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 23; goto __pyx_L1;}
Py_DECREF(__pyx_2); __pyx_2 = 0;
Py_DECREF(__pyx_1); __pyx_1 = 0;
- /* "/home/leif/dv/CitcomS/module/PyxMPI/PyxMPI.pyx":65 */
+ /* "/home/luis/work/CitcomS/module/PyxMPI/PyxMPI.pyx":65 */
return;
__pyx_L1:;
Py_XDECREF(__pyx_1);
@@ -537,10 +545,13 @@
static char *__pyx_filenames[] = {
"PyxMPI.pyx",
};
-statichere char **__pyx_f = __pyx_filenames;
/* Runtime support code */
+static void __pyx_init_filenames(void) {
+ __pyx_f = __pyx_filenames;
+}
+
static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name) {
PyObject *result;
result = PyObject_GetAttr(dict, name);
More information about the cig-commits
mailing list