Switch to use 'ndims' instead of 'skip_1d' in templates

Makefile

@@ -4,8 +4,6 @@ PYTHON=python
 
 srcdir := bottleneck/src
 
-NDIM_MAX=3
-
 help:
 	@echo "Available tasks:"
 	@echo "help    -->  This help page"
@@ -22,7 +20,7 @@ help:
 all: clean pyx cfiles build test
 
 pyx:
-	${PYTHON} -c "from bottleneck.src.makepyx import makepyx; makepyx(${NDIM_MAX})"
+	${PYTHON} -c "from bottleneck.src.makepyx import makepyx; makepyx();"
 
 cfiles:
 	cython ${srcdir}/func/func.pyx

bottleneck/src/makepyx.py

@@ -4,6 +4,6 @@
 from bottleneck.src.template.move.move import movepyx
 
 
-def makepyx(ndim_max=3):
-    funcpyx(ndim_max=ndim_max)
-    movepyx(ndim_max=ndim_max)
+def makepyx():
+    funcpyx()
+    movepyx()

bottleneck/src/template/func/allnan.py

@@ -2,6 +2,7 @@
 
 from copy import deepcopy
 import bottleneck as bn
+from bottleneck.src.template.template import NDIM_MAX
 
 __all__ = ["allnan"]
 
@@ -12,10 +13,10 @@
 
 floats = {}
 floats['dtypes'] = FLOAT_DTYPES
+floats['ndims'] = range(2, NDIM_MAX + 1)
 floats['axisNone'] = False
 floats['force_output_dtype'] = 'bool'
 floats['reuse_non_nan_func'] = False
-floats['skip_1d'] = True
 
 floats['top'] = """
 @cython.boundscheck(False)
@@ -43,8 +44,8 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a):
 # Float dtypes (axis=None) --------------------------------------------------
 
 floats_None = deepcopy(floats)
+floats_None['ndims'] = range(1, NDIM_MAX + 1)
 floats_None['axisNone'] = True
-floats_None['skip_1d'] = False
 
 floats_None['loop'] = """\
     for iINDEXN in PRODUCT_RANGE|nINDEXN|NDIM|:
@@ -72,8 +73,8 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a):
 # Int dtypes (axis=None) ----------------------------------------------------
 
 ints_None = deepcopy(ints)
+ints_None['ndims'] = range(1, NDIM_MAX + 1)
 ints_None['axisNone'] = True
-floats_None['skip_1d'] = False
 
 ints_None['loop'] = """\
     if PyArray_SIZE(a) == 0:

bottleneck/src/template/func/anynan.py

@@ -2,6 +2,7 @@
 
 from copy import deepcopy
 import bottleneck as bn
+from bottleneck.src.template.template import NDIM_MAX
 
 __all__ = ["anynan"]
 
@@ -12,10 +13,10 @@
 
 floats = {}
 floats['dtypes'] = FLOAT_DTYPES
+floats['ndims'] = range(2, NDIM_MAX + 1)
 floats['axisNone'] = False
 floats['force_output_dtype'] = 'bool'
 floats['reuse_non_nan_func'] = False
-floats['skip_1d'] = True
 
 floats['top'] = """
 @cython.boundscheck(False)
@@ -44,7 +45,7 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a):
 
 floats_None = deepcopy(floats)
 floats_None['axisNone'] = True
-floats_None['skip_1d'] = False
+floats_None['ndims'] = range(1, NDIM_MAX + 1)
 
 floats_None['loop'] = """\
     for iINDEXN in PRODUCT_RANGE|nINDEXN|NDIM|:
@@ -69,7 +70,7 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a):
 
 ints_None = deepcopy(ints)
 ints_None['axisNone'] = True
-ints_None['skip_1d'] = False
+ints_None['ndims'] = range(1, NDIM_MAX + 1)
 
 ints_None['loop'] = """\
     return np.bool_(False)

bottleneck/src/template/func/func.py

@@ -119,9 +119,9 @@
 """
 
 
-def funcpyx(funcs=funcs, ndim_max=3):
+def funcpyx(funcs=funcs):
     for func in funcs:
-        template(funcs[func], ndim_max)
+        template(funcs[func])
     template_path = os.path.dirname(tempmod.__file__)
     fid = open(os.path.join(template_path, '..', "func/func.pyx"), 'w')
     fid.write(header)

bottleneck/src/template/func/nanmax.py

@@ -2,6 +2,7 @@
 
 from copy import deepcopy
 import bottleneck as bn
+from bottleneck.src.template.template import NDIM_MAX
 
 __all__ = ["nanmax"]
 
@@ -13,9 +14,9 @@
 floats = {}
 floats['dtypes'] = FLOAT_DTYPES
 floats['axisNone'] = False
+floats['ndims'] = range(2, NDIM_MAX + 1)
 floats['force_output_dtype'] = False
 floats['reuse_non_nan_func'] = False
-floats['skip_1d'] = True
 
 floats['top'] = """
 @cython.boundscheck(False)
@@ -49,7 +50,7 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a):
 
 floats_None = deepcopy(floats)
 floats_None['axisNone'] = True
-floats_None['skip_1d'] = False
+floats_None['ndims'] = range(1, NDIM_MAX + 1)
 
 floats_None['loop'] = """\
     if PyArray_SIZE(a) == 0:
@@ -90,7 +91,7 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a):
 
 ints_None = deepcopy(ints)
 ints_None['axisNone'] = True
-ints_None['skip_1d'] = False
+ints_None['ndims'] = range(1, NDIM_MAX + 1)
 
 ints_None['loop'] = """\
     if PyArray_SIZE(a) == 0:

bottleneck/src/template/func/nanmean.py

@@ -2,6 +2,7 @@
 
 from copy import deepcopy
 import bottleneck as bn
+from bottleneck.src.template.template import NDIM_MAX
 
 __all__ = ["nanmean"]
 
@@ -13,9 +14,9 @@
 floats = {}
 floats['dtypes'] = FLOAT_DTYPES
 floats['axisNone'] = False
+floats['ndims'] = range(2, NDIM_MAX + 1)
 floats['force_output_dtype'] = False
 floats['reuse_non_nan_func'] = False
-floats['skip_1d'] = True
 
 floats['top'] = """
 @cython.boundscheck(False)
@@ -46,7 +47,7 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a):
 
 floats_None = deepcopy(floats)
 floats_None['axisNone'] = True
-floats_None['skip_1d'] = False
+floats_None['ndims'] = range(1, NDIM_MAX + 1)
 
 floats_None['loop'] = """\
     for iINDEXN in PRODUCT_RANGE|nINDEXN|NDIM|:
@@ -91,7 +92,7 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a):
 ints_None = deepcopy(ints)
 ints_None['top'] = ints['top'] + "    cdef Py_ssize_t size\n"
 ints_None['axisNone'] = True
-ints_None['skip_1d'] = False
+ints_None['ndims'] = range(1, NDIM_MAX + 1)
 
 ints_None['loop'] = """\
     size = PyArray_SIZE(a)

bottleneck/src/template/func/nanmin.py

@@ -2,6 +2,7 @@
 
 from copy import deepcopy
 import bottleneck as bn
+from bottleneck.src.template.template import NDIM_MAX
 
 __all__ = ["nanmin"]
 
@@ -13,9 +14,9 @@
 floats = {}
 floats['dtypes'] = FLOAT_DTYPES
 floats['axisNone'] = False
+floats['ndims'] = range(2, NDIM_MAX + 1)
 floats['force_output_dtype'] = False
 floats['reuse_non_nan_func'] = False
-floats['skip_1d'] = True
 
 floats['top'] = """
 @cython.boundscheck(False)
@@ -49,7 +50,7 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a):
 
 floats_None = deepcopy(floats)
 floats_None['axisNone'] = True
-floats_None['skip_1d'] = False
+floats_None['ndims'] = range(1, NDIM_MAX + 1)
 
 floats_None['loop'] = """\
     if PyArray_SIZE(a) == 0:
@@ -90,7 +91,7 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a):
 
 ints_None = deepcopy(ints)
 ints_None['axisNone'] = True
-ints_None['skip_1d'] = False
+ints_None['ndims'] = range(1, NDIM_MAX + 1)
 
 ints_None['loop'] = """\
     if PyArray_SIZE(a) == 0:

bottleneck/src/template/func/nanstd.py

@@ -2,6 +2,7 @@
 
 from copy import deepcopy
 import bottleneck as bn
+from bottleneck.src.template.template import NDIM_MAX
 
 __all__ = ["nanstd"]
 
@@ -13,9 +14,9 @@
 floats = {}
 floats['dtypes'] = FLOAT_DTYPES
 floats['axisNone'] = False
+floats['ndims'] = range(2, NDIM_MAX + 1)
 floats['force_output_dtype'] = False
 floats['reuse_non_nan_func'] = False
-floats['skip_1d'] = True
 
 floats['top'] = """
 @cython.boundscheck(False)
@@ -53,7 +54,7 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a, int ddof):
 
 floats_None = deepcopy(floats)
 floats_None['axisNone'] = True
-floats_None['skip_1d'] = False
+floats_None['ndims'] = range(1, NDIM_MAX + 1)
 
 floats_None['loop'] = """\
     for iINDEXN in PRODUCT_RANGE|nINDEXN|NDIM|:
@@ -111,7 +112,7 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a, int ddof):
 ints_None = deepcopy(ints)
 ints_None['top'] = ints['top'] + "    cdef Py_ssize_t size\n"
 ints_None['axisNone'] = True
-ints_None['skip_1d'] = False
+ints_None['ndims'] = range(1, NDIM_MAX + 1)
 
 ints_None['loop'] = """\
     size = PyArray_SIZE(a)

bottleneck/src/template/func/nansum.py

@@ -2,6 +2,7 @@
 
 from copy import deepcopy
 import bottleneck as bn
+from bottleneck.src.template.template import NDIM_MAX
 
 __all__ = ["nansum"]
 
@@ -14,9 +15,9 @@
 floats = {}
 floats['dtypes'] = FLOAT_DTYPES
 floats['axisNone'] = False
+floats['ndims'] = range(2, NDIM_MAX + 1)
 floats['force_output_dtype'] = False
 floats['reuse_non_nan_func'] = False
-floats['skip_1d'] = True
 
 floats['top'] = """
 @cython.boundscheck(False)
@@ -47,7 +48,7 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a):
 
 floats_None = deepcopy(floats)
 floats_None['axisNone'] = True
-floats_None['skip_1d'] = False
+floats_None['ndims'] = range(1, NDIM_MAX + 1)
 
 floats_None['loop'] = """\
     for iINDEXN in PRODUCT_RANGE|nINDEXN|NDIM|:
@@ -88,7 +89,7 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a):
 ints_None = deepcopy(ints)
 ints_None['top'] = ints['top'] + "    cdef Py_ssize_t size\n"
 ints_None['axisNone'] = True
-ints_None['skip_1d'] = False
+ints_None['ndims'] = range(1, NDIM_MAX + 1)
 
 ints_None['loop'] = """\
     size = PyArray_SIZE(a)

bottleneck/src/template/func/nanvar.py

@@ -2,6 +2,7 @@
 
 from copy import deepcopy
 import bottleneck as bn
+from bottleneck.src.template.template import NDIM_MAX
 
 __all__ = ["nanvar"]
 
@@ -13,9 +14,9 @@
 floats = {}
 floats['dtypes'] = FLOAT_DTYPES
 floats['axisNone'] = False
+floats['ndims'] = range(2, NDIM_MAX + 1)
 floats['force_output_dtype'] = False
 floats['reuse_non_nan_func'] = False
-floats['skip_1d'] = True
 
 floats['top'] = """
 @cython.boundscheck(False)
@@ -53,7 +54,7 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a, int ddof):
 
 floats_None = deepcopy(floats)
 floats_None['axisNone'] = True
-floats_None['skip_1d'] = False
+floats_None['ndims'] = range(1, NDIM_MAX + 1)
 
 floats_None['loop'] = """\
     for iINDEXN in PRODUCT_RANGE|nINDEXN|NDIM|:
@@ -111,7 +112,7 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a, int ddof):
 ints_None = deepcopy(ints)
 ints_None['top'] = ints['top'] + "    cdef Py_ssize_t size\n"
 ints_None['axisNone'] = True
-ints_None['skip_1d'] = False
+ints_None['ndims'] = range(1, NDIM_MAX + 1)
 
 ints_None['loop'] = """\
     size = PyArray_SIZE(a)

bottleneck/src/template/func/nn.py

@@ -14,6 +14,7 @@
 floats = {}
 floats['dtypes'] = FLOAT_DTYPES
 floats['axisNone'] = False
+floats['ndims'] = [2]
 floats['force_output_dtype'] = False
 floats['reuse_non_nan_func'] = False
 
@@ -28,8 +29,7 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=2] a,
         Py_ssize_t imin = -1, n, a0size
 """
 
-loop = {}
-loop[2] = """\
+floats['loop'] = """\
     a0size = PyArray_SIZE(a0)
     if nAXIS != a0size:
         raise ValueError("`a0` must match size of `a` along specified axis")
@@ -48,7 +48,6 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=2] a,
         dist = sqrt(xsummin)
     return dist, imin
 """
-floats['loop'] = loop
 
 # Int dtypes (not axis=None) ------------------------------------------------
 

bottleneck/src/template/func/ss.py

@@ -2,6 +2,7 @@
 
 from copy import deepcopy
 import bottleneck as bn
+from bottleneck.src.template.template import NDIM_MAX
 
 __all__ = ["ss"]
 
@@ -14,9 +15,9 @@
 floats = {}
 floats['dtypes'] = FLOAT_DTYPES
 floats['axisNone'] = False
+floats['ndims'] = range(2, NDIM_MAX + 1)
 floats['force_output_dtype'] = False
 floats['reuse_non_nan_func'] = False
-floats['skip_1d'] = True
 
 floats['top'] = """
 @cython.boundscheck(False)
@@ -40,7 +41,7 @@ def NAME_NDIMd_DTYPE_axisAXIS(np.ndarray[np.DTYPE_t, ndim=NDIM] a):
 
 floats_None = deepcopy(floats)
 floats_None['axisNone'] = True
-floats_None['skip_1d'] = False
+floats_None['ndims'] = range(1, NDIM_MAX + 1)
 
 floats_None['loop'] = """\
     for iINDEXN in PRODUCT_RANGE|nINDEXN|NDIM|: