c9fd2c425cb873508ba16221819574400ad2443e,dask_image/ndmeasure/__init__.py,,extrema,#,75

Before Change

    out_dtype = numpy.dtype([
        ("min_val", input.dtype),
        ("min_pos", numpy.int),
        ("max_val", input.dtype),
        ("max_pos", numpy.int)
    ])
    default = numpy.zeros((), out_dtype)[()]

    extrema_lbl = labeled_comprehension(
        input, labels, index,
        _utils._extrema, out_dtype, default, pass_positions=True
    )

    extrema_lbl = {k: extrema_lbl[k] for k in extrema_lbl.dtype.names}

    for pos_key in ["min_pos", "max_pos"]:
        pos_1d = extrema_lbl[pos_key]
        if not pos_1d.ndim:
            pos_1d = pos_1d[None]

        pos_nd = _utils._unravel_index(pos_1d, input.shape)

        if index.ndim == 0:
            pos_nd = dask.array.squeeze(pos_nd)
        elif index.ndim > 1:
            pos_nd = pos_nd.reshape(
                (int(numpy.prod(pos_nd.shape[:-1])), pos_nd.shape[-1])
            )

        extrema_lbl[pos_key] = pos_nd

    result = (
        extrema_lbl["min_val"],

After Change

    type_mapping = collections.OrderedDict([
        ("min_val", input.dtype),
        ("max_val", input.dtype),
        ("min_pos", numpy.dtype(numpy.int)),
        ("max_pos", numpy.dtype(numpy.int))
    ])
    out_dtype = numpy.dtype(list(type_mapping.items()))

    default_1d = numpy.zeros((1,), dtype=out_dtype)

    func = functools.partial(_utils._extrema, dtype=out_dtype)
    extrema_lbl = labeled_comprehension(
        input, labels, index,
        func, out_dtype, default_1d[0], pass_positions=True
    )

    extrema_lbl = collections.OrderedDict([
        (k, extrema_lbl[k]) for k in type_mapping.keys()
    ])

    for pos_key in ["min_pos", "max_pos"]:
        pos_1d = extrema_lbl[pos_key]
        if not pos_1d.ndim:
            pos_1d = pos_1d[None]

        pos_nd = _utils._unravel_index(pos_1d, input.shape)

        if index.ndim == 0:
            pos_nd = dask.array.squeeze(pos_nd)
        elif index.ndim > 1:
            pos_nd = pos_nd.reshape(
                (int(numpy.prod(pos_nd.shape[:-1])), pos_nd.shape[-1])
            )

        extrema_lbl[pos_key] = pos_nd

    result = tuple(extrema_lbl.values())

Instances