Changeset 2eac950

Timestamp:

06/22/11 16:37:50 (2 years ago)

Author:

Oleg Batrashev <ogbash@…>

Branches:

external

Parents:

e991513

git-author:

Oleg Batrashev <ogbash@…> (06/22/11 16:37:50)

git-committer:

Oleg Batrashev <ogbash@…> (06/22/11 16:37:50)

Message:

Run PCG from Python.

Location:

src/ext

Files:

• C/doug_ext.f90 (modified) (1 diff)
• C/doug_ext.h (modified) (1 diff)
• C/main_aggr.c (modified) (1 diff)
• Python/dougmodule.c (modified) (4 diffs)
• Python/run.py (added)

src/ext/C/doug_ext.f90

@@ -40 +40 @@
 
 ! Allocate memory for Distribution class.
-subroutine ext_Distribution_NewInit(D, input_type, nparts)
+subroutine ext_Distribution_Init(D, input_type, nparts)
   use Distribution_mod
   use Distribution_base_mod
   use globals
 
-  type(Distribution),pointer :: D
+  type(Distribution),intent(inout) :: D
   integer, intent(in) :: input_type
   integer, intent(in) :: nparts
   integer, dimension(6) :: part_opts
-
-  allocate(D)
-  D = Distribution_NewInit(sctls%input_type, nparts, part_opts)
-end subroutine ext_Distribution_NewInit
+  
+  D = Distribution_NewInit(input_type, nparts, part_opts)
+end subroutine ext_Distribution_Init
 
 function ext_Distribution_Get_Nlf(D) result(nlf)

src/ext/C/doug_ext.h

@@ -6 +6 @@
 extern void alloc_spmtx_(void **A);
 extern void alloc_mesh_(void **M);
+extern double ext_vec_dot_(double *v, double *x, double *y, int *nlf);
 extern void ext_distribution_new_(void **D);
-extern double ext_vec_dot_(double *v, double *x, double *y, int *nlf);
+extern void ext_distribution_init_(void *D, int *input_type, int *nparts);
 extern int ext_distribution_get_nlf_(void *D);
+extern void ext_finepreconditioner_new_(void **FP, void *D);
 extern void ext_pcg(void *D, double *xl, int nlf, void *FP);
-extern void ext_finepreconditioner_new_(void **FP, void *D);
 
 #endif

src/ext/C/main_aggr.c

@@ -11 +11 @@
   int nparts=1;
   int init_type=1;
+  int input_type=3;
   int nlf, i;
 
   ext_doug_init_(&init_type); // parallel
-  ext_distribution_newinit_(&D);
+  ext_distribution_new_(&D);
+  ext_distribution_init_(D, &input_type, &nparts);
   nlf = ext_distribution_get_nlf_(D);
   printf("Initialized, Distribution %x, nlf=%d\n", D, nlf);

src/ext/Python/dougmodule.c

@@ -2 +2 @@
 
 #include "../C/doug_ext.h"
-
-/* init & finalize */ 
-
-static PyObject *
-doug_init(PyObject *self, PyObject *args)
-{
-    int init_type;
-
-    if (!PyArg_ParseTuple(args, "i", &init_type))
-        return NULL;
-    ext_doug_init_(&init_type);
-    Py_RETURN_NONE;
-}
 
 /* types */
@@ -79 +66 @@
 }
 
+static int
+Distribution_init(Distribution *self, PyObject *args, PyObject *kwds)
+{
+  PyObject *tmp;
+  int input_type=0, nparts=1;
+
+  static char *kwlist[] = {"input_type", "nparts", NULL};
+
+  if (! PyArg_ParseTupleAndKeywords(args, kwds, "i|i", kwlist, 
+                                    &input_type, 
+                                    &nparts))
+    return -1;
+
+  ext_distribution_init_(self->fObj, &input_type, &nparts);
+
+  return 0;
+}
+
+// Fine Preconditioner
+
+typedef struct {
+    PyObject_HEAD
+    /* Type-specific fields go here. */
+    void *fObj;
+} FinePreconditioner;
+
+static PyTypeObject FinePreconditionerType = {
+    PyObject_HEAD_INIT(NULL)
+    0,                         /*ob_size*/
+    "doug.FinePreconditioner",        /*tp_name*/
+    sizeof(FinePreconditioner)    /*tp_basicsize*/
+};
+
+static PyMethodDef FinePreconditioner_methods[] = {
+    {NULL}  /* Sentinel */
+};
+
+static void
+FinePreconditioner_dealloc(FinePreconditioner* self)
+{
+  printf("FP dealloc %x\n", self);
+  self->ob_type->tp_free((PyObject*)self);
+}
+
+static int
+FinePreconditioner_init(FinePreconditioner *self, PyObject *args, PyObject *kwds)
+{
+  Distribution *d;
+  int input_type=0, nparts=1;
+
+  if (!PyArg_ParseTuple(args, "O!", &DistributionType, &d))
+    return -1;
+
+  ext_finepreconditioner_new_(&self->fObj, d->fObj);
+
+  return 0;
+}
+
 /* module methods */
+
+/* init & finalize */ 
+
+static PyObject *
+doug_init(PyObject *self, PyObject *args)
+{
+    int init_type;
+
+    if (!PyArg_ParseTuple(args, "i", &init_type))
+        return NULL;
+    ext_doug_init_(&init_type);
+    Py_RETURN_NONE;
+}
+
+static PyObject *
+doug_pcg(PyObject *self, PyObject *args)
+{
+  Distribution *d;
+  FinePreconditioner *fp;
+  int nlf;
+  double *xl;
+
+  if (!PyArg_ParseTuple(args, "O!O!", &DistributionType, &d, 
+                        &FinePreconditionerType, &fp))
+    return NULL;
+
+  nlf = ext_distribution_get_nlf_(d->fObj);
+  xl = malloc(nlf*sizeof(double));
+
+  printf("nlf %d\n", nlf);
+
+  ext_pcg_(d->fObj, xl, &nlf, fp->fObj);
+  Py_RETURN_NONE;
+}
 
 static PyMethodDef DougMethods[] = {
     {"init",  doug_init, METH_VARARGS, "Initialize DOUG."},
+    {"pcg",  doug_pcg, METH_VARARGS, "Preconditioned Conjugate Gradient."},
     {NULL, NULL, 0, NULL} /* Sentinel */
 };
@@ -95 +175 @@
 
     DistributionType.tp_new = Distribution_new;
+    DistributionType.tp_init = (initproc)Distribution_init;
     DistributionType.tp_dealloc = (destructor)Distribution_dealloc;
     if (PyType_Ready(&DistributionType) < 0)
+        return;
+
+    FinePreconditionerType.tp_new = PyType_GenericNew;
+    FinePreconditionerType.tp_init = (initproc)FinePreconditioner_init;
+    FinePreconditionerType.tp_dealloc = (destructor)FinePreconditioner_dealloc;
+    FinePreconditionerType.tp_flags = Py_TPFLAGS_DEFAULT;
+    FinePreconditionerType.tp_doc = "FinePreconditioner objects";
+    if (PyType_Ready(&FinePreconditionerType) < 0)
         return;
 
@@ -103 +192 @@
     Py_INCREF(&DistributionType);
     PyModule_AddObject(m, "Distribution", (PyObject *)&DistributionType);
+    Py_INCREF(&FinePreconditionerType);
+    PyModule_AddObject(m, "FinePreconditioner", (PyObject *)&FinePreconditionerType);
 }