Skip to content

Commit

Permalink
Remove previously deprecated functions (#23)
Browse files Browse the repository at this point in the history
* Remove deprecated sporco.fista modules

* Remove redirects for previously renamed functions

* Add entries to change summary

* Silence imp DeprecationWarning from future

* Address warning regarding deprecation of get_geometry

* Fix change summary
  • Loading branch information
bwohlberg committed Oct 31, 2023
1 parent 7748e52 commit cb05a56
Show file tree
Hide file tree
Showing 14 changed files with 3 additions and 2,412 deletions.
3 changes: 2 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ SPORCO Release Notes
Version 0.2.2 (unreleased)
----------------------------

• No changes yet
• Removed deprecated sporco.fista modules
• Removed deprecation warning redirects for functions renamed in 0.2.0


Version 0.2.1 (2022-02-17)
Expand Down
2 changes: 1 addition & 1 deletion sporco/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import absolute_import

__version__ = '0.2.2a1'
__version__ = '0.2.2a2'


# This is a temporary solution to the circular imports resulting from the
Expand Down
7 changes: 0 additions & 7 deletions sporco/array.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@

import numpy as np

from sporco._util import renamed_function


__author__ = """Brendt Wohlberg <[email protected]>"""

Expand Down Expand Up @@ -94,7 +92,6 @@ def transpose_ntpl_list(lst):



@renamed_function(depname='zpad', depmod='sporco.linalg')
def zpad(x, pd, ax):
"""Zero-pad array `x` with `pd = (leading, trailing)` zeros on axis `ax`.
Expand All @@ -119,7 +116,6 @@ def zpad(x, pd, ax):



@renamed_function(depname='zdivide', depmod='sporco.linalg')
def zdivide(x, y):
"""Return `x`/`y`, with 0 instead of NaN where `y` is 0.
Expand All @@ -141,7 +137,6 @@ def zdivide(x, y):



@renamed_function(depname='promote16', depmod='sporco.linalg')
def promote16(u, fn=None, *args, **kwargs):
r"""Promote ``np.float16`` arguments to ``np.float32`` dtype.
Expand Down Expand Up @@ -191,7 +186,6 @@ def promote16(u, fn=None, *args, **kwargs):



@renamed_function(depname='atleast_nd', depmod='sporco.linalg')
def atleast_nd(n, u):
"""Append axes to an array so that it is ``n`` dimensional.
Expand Down Expand Up @@ -219,7 +213,6 @@ def atleast_nd(n, u):



@renamed_function(depname='split', depmod='sporco.linalg')
def split(u, axis=0):
"""Split an array into a list of arrays on the specified axis.
Expand Down
14 changes: 0 additions & 14 deletions sporco/fft.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
else:
have_pyfftw = True

from sporco._util import renamed_function


__author__ = """Brendt Wohlberg <[email protected]>"""
Expand Down Expand Up @@ -60,7 +59,6 @@ def is_complex_dtype(dtype):



@renamed_function(depname='complex_dtype', depmod='sporco.linalg')
def complex_dtype(dtype):
"""Construct the corresponding complex dtype for a given real dtype.
Expand Down Expand Up @@ -105,7 +103,6 @@ def real_dtype(dtype):



@renamed_function(depname='pyfftw_byte_aligned', depmod='sporco.linalg')
def byte_aligned(array, dtype=None, n=None):
"""Construct a byte-aligned array for FFTs.
Expand All @@ -131,7 +128,6 @@ def byte_aligned(array, dtype=None, n=None):



@renamed_function(depname='pyfftw_empty_aligned', depmod='sporco.linalg')
def empty_aligned(shape, dtype, order='C', n=None):
"""Construct an empty byte-aligned array for FFTs.
Expand Down Expand Up @@ -160,7 +156,6 @@ def empty_aligned(shape, dtype, order='C', n=None):



@renamed_function(depname='pyfftw_rfftn_empty_aligned', depmod='sporco.linalg')
def rfftn_empty_aligned(shape, axes, dtype, order='C', n=None):
"""Construct an empty byte-aligned array for real FFTs.
Expand Down Expand Up @@ -201,7 +196,6 @@ def rfftn_empty_aligned(shape, axes, dtype, order='C', n=None):



@renamed_function(depname='fftn', depmod='sporco.linalg')
def fftn(a, s=None, axes=None):
"""Multi-dimensional discrete Fourier transform.
Expand Down Expand Up @@ -231,7 +225,6 @@ def fftn(a, s=None, axes=None):



@renamed_function(depname='ifftn', depmod='sporco.linalg')
def ifftn(a, s=None, axes=None):
"""Multi-dimensional inverse discrete Fourier transform.
Expand Down Expand Up @@ -261,7 +254,6 @@ def ifftn(a, s=None, axes=None):



@renamed_function(depname='rfftn', depmod='sporco.linalg')
def rfftn(a, s=None, axes=None):
"""Multi-dimensional discrete Fourier transform for real input.
Expand Down Expand Up @@ -291,7 +283,6 @@ def rfftn(a, s=None, axes=None):



@renamed_function(depname='irfftn', depmod='sporco.linalg')
def irfftn(a, s, axes=None):
"""Multi-dimensional inverse discrete Fourier transform for real input.
Expand Down Expand Up @@ -324,7 +315,6 @@ def irfftn(a, s, axes=None):



@renamed_function(depname='dctii', depmod='sporco.linalg')
def dctii(x, axes=None):
"""Multi-dimensional DCT-II.
Expand Down Expand Up @@ -354,7 +344,6 @@ def dctii(x, axes=None):



@renamed_function(depname='idctii', depmod='sporco.linalg')
def idctii(x, axes=None):
"""Multi-dimensional inverse DCT-II.
Expand Down Expand Up @@ -384,7 +373,6 @@ def idctii(x, axes=None):



@renamed_function(depname='fftconv', depmod='sporco.linalg')
def fftconv(a, b, axes=None, origin=None):
"""Multi-dimensional convolution via the Discrete Fourier Transform.
Expand Down Expand Up @@ -430,7 +418,6 @@ def fftconv(a, b, axes=None, origin=None):



@renamed_function(depname='fl2norm2', depmod='sporco.linalg')
def fl2norm2(xf, axis=(0, 1)):
r"""Compute the squared :math:`\ell_2` norm in the DFT domain.
Expand Down Expand Up @@ -459,7 +446,6 @@ def fl2norm2(xf, axis=(0, 1)):



@renamed_function(depname='rfl2norm2', depmod='sporco.linalg')
def rfl2norm2(xf, xs, axis=(0, 1)):
r"""Compute the squared :math:`\ell_2` norm in the real DFT domain.
Expand Down
9 changes: 0 additions & 9 deletions sporco/fista/__init__.py

This file was deleted.

Loading

0 comments on commit cb05a56

Please sign in to comment.