Move generalised ufunc functionality to the gen_ufuncs branch.

stefanv · stefanv · commit 902dc40abae7 · 2008-08-15T23:39:04.000Z
diff --git a/THANKS.txt b/THANKS.txt
@@ -37,4 +37,3 @@ Andrew Straw for help with http://www.scipy.org, documentation, and testing.
 David Cournapeau for scons build support, doc-and-bug fixes, and code contributions including fast_clipping.
 Pierre Gerard-Marchant for his rewrite of the masked array functionality.
 Roberto de Almeida for the buffered array iterator.
-Wenjie Fu and Hans-Andreas Engel for the generalised ufunc infrastructure.
diff --git a/numpy/core/code_generators/ufunc_api_order.txt b/numpy/core/code_generators/ufunc_api_order.txt
@@ -1,5 +1,4 @@
 PyUFunc_FromFuncAndData
-PyUFunc_FromFuncAndDataAndSignature
 PyUFunc_RegisterLoopForType
 PyUFunc_GenericFunction
 PyUFunc_f_f_As_d_d
diff --git a/numpy/core/include/numpy/ndarrayobject.h b/numpy/core/include/numpy/ndarrayobject.h
@@ -39,7 +39,7 @@ extern "C" CONFUSE_EMACS
 #define NPY_SUCCEED 1
 
         /* Helpful to distinguish what is installed */
-#define NPY_VERSION 0x0100000B
+#define NPY_VERSION 0x0100000A
 
         /* Some platforms don't define bool, long long, or long double.
            Handle that here.
diff --git a/numpy/core/include/numpy/ufuncobject.h b/numpy/core/include/numpy/ufuncobject.h
@@ -19,20 +19,6 @@ typedef struct {
         void *ptr;
         PyObject *obj;
 	PyObject *userloops;
-    
-        /* generalized ufunc */
-        int core_enabled;      /* 0 for scalar ufunc; 1 for generalized ufunc */
-        int core_num_dim_ix;   /* number of distinct dimension names in
-                                  signature */
- 
-        /* dimension indices of input/output argument k are stored in
-           core_dim_ixs[core_offsets[k]..core_offsets[k]+core_num_dims[k]-1] */
-        int *core_num_dims;    /* numbers of core dimensions of each argument */
-        int *core_dim_ixs;     /* dimension indices in a flatted form; indices
-                                  are in the range of [0,core_num_dim_ix) */
-        int *core_offsets;     /* positions of 1st core dimensions of each
-                                  argument in core_dim_ixs */
-        char *core_signature;  /* signature string for printing purpose */
 } PyUFuncObject;
 
 #include "arrayobject.h"
@@ -136,11 +122,6 @@ typedef struct {
         int notimplemented; /* The loop caused notimplemented */
         int objfunc; /* This loop calls object functions
                         (an inner-loop function with argument types */
-    
-        /* generalized ufunc */
-        npy_intp *core_dim_sizes;   /* stores sizes of core dimensions;
-                                       contains 1 + core_num_dim_ix elements */
-        npy_intp *core_strides;     /* strides of loop and core dimensions */
 } PyUFuncLoopObject;
 
 /* Could make this more clever someday */
diff --git a/numpy/core/src/ufuncobject.c b/numpy/core/src/ufuncobject.c

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`PyUFunc_FromFuncAndData`
`2`		`-PyUFunc_FromFuncAndDataAndSignature`
`3`	`2`	`PyUFunc_RegisterLoopForType`
`4`	`3`	`PyUFunc_GenericFunction`
`5`	`4`	`PyUFunc_f_f_As_d_d`