Changeset 27

Timestamp:

05/22/07 11:42:51 (2 years ago)

Author:

emuller

Message:

neuron.hoc.test_numpy function added, fixed problems with build process wrt numpy

Files:

• branches/pygetsetcall/src/nrnpython/Makefile.am (modified) (1 diff)
• branches/pygetsetcall/src/nrnpython/nrnpy_hoc.cpp (modified) (4 diffs)
• branches/pygetsetcall/src/nrnpython/setup.py.in (modified) (3 diffs)

branches/pygetsetcall/src/nrnpython/Makefile.am

@@ -2 +2 @@
-
-nsrc=$(top_srcdir)/src
+DEFS = @DEFS@ @NRNPYTHON_DEFINES@
-NRNPYTHON_INCLUDES = @NRNPYTHON_INCLUDES@
-IV_INCLUDES = @IV_INCLUDE@ $(X_CFLAGS)

branches/pygetsetcall/src/nrnpython/nrnpy_hoc.cpp

@@ -77 +77 @@
-}
-
+
+static PyObject* test_numpy(PyObject* self, PyObject* args) {
+
+        if (!PyArg_ParseTuple(args, "")) {
+                return NULL;
+        }
+
+        #ifdef WITH_NUMPY
+
+        PyArrayObject *po = NULL;
+        int dims = 1;
+
+        po = (PyArrayObject*)PyArray_FromDims(1,&dims,PyArray_DOUBLE);
+        *(double*)(po->data) = 0.0;
+        return Py_BuildValue("N",po);
+
+        #else
+
+        // return None
+        return Py_BuildValue("");
+
+        #endif // WITH_NUMPY
+
+
+
+}
+
+
+
-static PyMethodDef HocMethods[] = {
-        {"execute", nrnexec, METH_VARARGS, "Execute a hoc command, return 1 on success, 0 on failure." },
-        {"hoc_ac", hoc_ac, METH_VARARGS, "Get (or set) the scalar hoc_ac_." },
+
+        {"test_numpy", test_numpy, METH_VARARGS, "If numpy support is available, returns an array containing 1 zero, otherwize None." },
+
+
-        {NULL, NULL, 0, NULL}
-};
@@ -741 +774 @@
-};
-
+  /*
-#ifdef WITH_NUMPY
-
@@ -928 +962 @@
-
-#endif //WITH_NUMPY
+
+  */
-
-static PyMemberDef hocobj_members[] = {
@@ -962 +998 @@
-    0,                         /* tp_iter */
-    0,                         /* tp_iternext */
-
+0,//
-    0,//hocobj_members,             /* tp_members */
-    0,                         /* tp_getset */

branches/pygetsetcall/src/nrnpython/setup.py.in

@@ -2 +2 @@
-from distutils.core import setup, Extension
-
+import sys
-
-
+
+
-
+ldefs = extern_defines.split('-D')
-
-# check for numpy+version
+
+with_numpy = False
-
-try:
-    import numpy
-except ImportError:
-Fatal rror: numpy not installed or not in import path
+Warning: numpy not installed or not in import path.
-
-else:
@@ -19 +24 @@
-    if version[0] < '1' or (len(version[1]) > 1 and version[1] < '0rc1'):
-        print "Warning: Old numpy found and not being used.  Please upgrade your version of numpy to > 1.0rc1"
+        
-    else:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        defines.append(('WITH_NUMPY',None))
-
+    else:
+        print "Error: NEURON was build with support for numpy but"
+        print "no suitable installation of numpy could be found."
+        print "1) Check that your numpy version is at least 1.0rc1"
+        print "2) Check that you are using the same python executable"
+        print "to run this setup.py script as specified at configure time:"
+        print "--with-nrnpython[=python_bin] (defaults to 'python' in path)."
+        sys.exit(1)
+
+else:
+    if with_numpy:
+        print "Warning: NEURON was build without support for numpy."
+        print "A suitable installation for numpy was found, but cannot be used." 
-
-
@@ -46 +79 @@
-        "readline"
-      ],
-[numpy_include_path]
+include_dirs
-      define_macros=defines
-    )