Numpification of contour, stage 1

efiring · efiring · commit 160d38e78096 · 2007-06-19T21:27:59.000Z
svn path=/trunk/matplotlib/; revision=3401
diff --git a/lib/matplotlib/_contour.py b/lib/matplotlib/_contour.py
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -15,7 +15,7 @@
      cos, nonzero, take, concatenate, all, newaxis
 
 from mlab import linspace, meshgrid
-import _contour
+import matplotlib._cntr as _cntr
 from cm import ScalarMappable
 from cbook import iterable, is_string_like, flatten, enumerate, \
      allequal, dict_delall, strip_math, popall, silent_list
@@ -449,7 +449,7 @@ def __init__(self, ax, *args, **kwargs):
                 self.linewidths = 0.05 # Good default for Postscript.
             if iterable(self.linewidths):
                 self.linewidths = self.linewidths[0]
-            C = _contour.Cntr(x, y, z.filled(), ma.getmaskorNone(z))
+            C = _cntr.Cntr(x, y, z.filled(), ma.getmaskorNone(z))
             lowers = self._levels[:-1]
             uppers = self._levels[1:]
             for level, level_upper in zip(lowers, uppers):
@@ -465,7 +465,7 @@ def __init__(self, ax, *args, **kwargs):
         else:
             tlinewidths = self._process_linewidths()
             self.tlinewidths = tlinewidths
-            C = _contour.Cntr(x, y, z.filled(), ma.getmaskorNone(z))
+            C = _cntr.Cntr(x, y, z.filled(), ma.getmaskorNone(z))
             for level, width in zip(self.levels, tlinewidths):
                 nlist = C.trace(level, points = 0)
                 col = LineCollection(nlist,
diff --git a/setup.py b/setup.py
@@ -275,7 +275,7 @@ def havegtk():
     build_image(ext_modules, packages, NUMERIX)
 
 if 1:  # I don't think we need to make these optional
-    build_contour(ext_modules, packages, NUMERIX)
+    build_contour(ext_modules, packages)
     build_nxutils(ext_modules, packages, NUMERIX)
 
 for mod in ext_modules:
diff --git a/setupext.py b/setupext.py
@@ -844,43 +844,18 @@ def build_enthought(ext_modules, packages):
                      ])
     BUILT_ENTHOUGHT = True
 
-def build_contour(ext_modules, packages, numerix):
+def build_contour(ext_modules, packages):
     global BUILT_CONTOUR
     if BUILT_CONTOUR: return # only build it if you you haven't already
 
-    if 'numarray' in numerix: # Build for numarray
-        temp_copy('src/cntr.c', 'src/_na_cntr.c')
-        module = Extension(
-            'matplotlib._na_cntr',
-            [  'src/_na_cntr.c',],
-            include_dirs=numarray_inc_dirs,
-            )
-        module.extra_compile_args.append('-DNUMARRAY=1')
-        add_base_flags(module)
-        ext_modules.append(module)
-
-    if 'Numeric' in numerix: # Build for Numeric
-        temp_copy('src/cntr.c', 'src/_nc_cntr.c')
-        module = Extension(
-            'matplotlib._nc_cntr',
-            [ 'src/_nc_cntr.c'],
-            include_dirs=numeric_inc_dirs,
-            )
-        module.extra_compile_args.append('-DNUMERIC=1')
-        add_base_flags(module)
-        ext_modules.append(module)
-    if 'numpy' in numerix: # Build for numpy
-        temp_copy('src/cntr.c', 'src/_ns_cntr.c')
-        module = Extension(
-            'matplotlib._ns_cntr',
-            [ 'src/_ns_cntr.c'],
-            include_dirs=numeric_inc_dirs,
-            )
-        add_numpy_flags(module)
-        module.extra_compile_args.append('-DSCIPY=1')
-        add_base_flags(module)
-        ext_modules.append(module)
-
+    module = Extension(
+        'matplotlib._cntr',
+        [ 'src/cntr.c'],
+        include_dirs=numeric_inc_dirs,
+        )
+    add_numpy_flags(module)
+    add_base_flags(module)
+    ext_modules.append(module)
 
     BUILT_CONTOUR = True
 
diff --git a/src/cntr.c b/src/cntr.c
@@ -1731,71 +1731,16 @@ static PyMethodDef module_methods[] = {
     {NULL}  /* Sentinel */
 };
 
-
-#ifdef NUMARRAY
-#if PY_MINOR_VERSION > 2
-PyMODINIT_FUNC
-#else
-DL_EXPORT(void)
-#endif
-init_na_cntr(void)
-{
-    PyObject* m;
-
-    if (PyType_Ready(&CntrType) < 0)
-        return;
-
-    m = Py_InitModule3("_na_cntr", module_methods,
-                       "Contouring engine as an extension type (numarray).");
-
-    if (m == NULL)
-      return;
-
-    import_array();
-    Py_INCREF(&CntrType);
-    PyModule_AddObject(m, "Cntr", (PyObject *)&CntrType);
-}
-#endif
-#ifdef NUMERIC
-#if PY_MINOR_VERSION > 2
-PyMODINIT_FUNC
-#else
-DL_EXPORT(void)
-#endif
-init_nc_cntr(void)
-{
-    PyObject* m;
-
-    if (PyType_Ready(&CntrType) < 0)
-        return;
-
-    m = Py_InitModule3("_nc_cntr", module_methods,
-                       "Contouring engine as an extension type (Numeric).");
-
-    if (m == NULL)
-      return;
-
-    import_array();
-    Py_INCREF(&CntrType);
-    PyModule_AddObject(m, "Cntr", (PyObject *)&CntrType);
-}
-#endif
-
-#ifdef SCIPY
-#if PY_MINOR_VERSION > 2
 PyMODINIT_FUNC
-#else
-DL_EXPORT(void)
-#endif
-init_ns_cntr(void)
+init_cntr(void)
 {
     PyObject* m;
 
     if (PyType_Ready(&CntrType) < 0)
         return;
 
-    m = Py_InitModule3("_ns_cntr", module_methods,
-                       "Contouring engine as an extension type (Scipy).");
+    m = Py_InitModule3("_cntr", module_methods,
+                       "Contouring engine as an extension type (numpy).");
 
     if (m == NULL)
       return;
@@ -1804,6 +1749,5 @@ init_ns_cntr(void)
     Py_INCREF(&CntrType);
     PyModule_AddObject(m, "Cntr", (PyObject *)&CntrType);
 }
-#endif
 
 
