Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/ezmsg/sigproc/adaptive_lattice_notch.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
import numpy as np
import numpy.typing as npt
import scipy.signal
from ezmsg.baseproc import BaseStatefulTransformer, processor_state
from ezmsg.baseproc import BaseStatefulTransformer, processor_state, resolve_configured_chunk_dim
from ezmsg.util.messages.axisarray import AxisArray, CoordinateAxis
from ezmsg.util.messages.util import replace

from .util.deprecation import warn_axis_deprecated
from .util.message import resolve_configured_chunk_dim


class AdaptiveLatticeNotchFilterSettings(ez.Settings):
Expand Down
2 changes: 1 addition & 1 deletion src/ezmsg/sigproc/adaptive_lnc.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@
BaseStatefulTransformer,
BaseTransformerUnit,
processor_state,
resolve_configured_chunk_dim,
)
from ezmsg.util.messages.axisarray import AxisArray
from ezmsg.util.messages.util import replace

from .util.deprecation import warn_axis_deprecated
from .util.message import resolve_configured_chunk_dim

# Optional Apple-Silicon GPU backend. The canceller is an LTI SOS notch
# cascade (see `design_lnc_sos`), so on MLX arrays we dispatch to the Metal
Expand Down
4 changes: 3 additions & 1 deletion src/ezmsg/sigproc/affinetransform.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,18 @@
BaseStatefulTransformer,
BaseTransformerUnit,
processor_state,
resolve_feature_dim,
)
from ezmsg.util.messages.axisarray import AxisArray, AxisBase
from ezmsg.util.messages.util import replace

from ezmsg.sigproc.util.array import array_device, is_float_dtype, xp_asarray, xp_copy, xp_create, xp_empty
from ezmsg.sigproc.util.blockdiag import plan_block_matmul
from ezmsg.sigproc.util.channels import ChannelGroupSpec, resolve_channel_groups
from ezmsg.sigproc.util.message import resolve_feature_dim, with_fingerprint
from ezmsg.sigproc.util.rereference import RereferenceKind, rereference_matrix

from .util.message import with_fingerprint

KERNELS = ("auto", "dense", "blocks")
"""Valid values for :attr:`AffineTransformSettings.kernel`."""

Expand Down
3 changes: 2 additions & 1 deletion src/ezmsg/sigproc/aggregate.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
BaseTransformer,
BaseTransformerUnit,
processor_state,
resolve_feature_dim,
)
from ezmsg.util.messages.axisarray import (
AxisArray,
Expand All @@ -29,7 +30,7 @@
)

from .spectral import OptionsEnum
from .util.message import resolve_feature_dim, with_fingerprint
from .util.message import with_fingerprint


class AggregationFunction(OptionsEnum):
Expand Down
2 changes: 1 addition & 1 deletion src/ezmsg/sigproc/align.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

import ezmsg.core as ez
import numpy as np
from ezmsg.baseproc import resolve_configured_chunk_dim
from ezmsg.baseproc.protocols import processor_state
from ezmsg.baseproc.stateful import BaseStatefulTransformer
from ezmsg.util.messages.axisarray import AxisArray

from .util.axisarray_buffer import HybridAxisArrayBuffer
from .util.deprecation import warn_axis_deprecated
from .util.message import resolve_configured_chunk_dim


class AlignAlongAxisSettings(ez.Settings):
Expand Down
3 changes: 2 additions & 1 deletion src/ezmsg/sigproc/binned_aggregate.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
BaseStatefulTransformer,
BaseTransformerUnit,
processor_state,
resolve_configured_chunk_dim,
)
from ezmsg.util.messages.axisarray import (
AxisArray,
Expand All @@ -57,7 +58,7 @@
from .util.array import xp_copy
from .util.binning import BinSchedule, BinStep
from .util.deprecation import warn_axis_deprecated
from .util.message import is_empty_along, resolve_configured_chunk_dim, with_fingerprint
from .util.message import is_empty_along, with_fingerprint


class BinnedAggregateSettings(ez.Settings):
Expand Down
3 changes: 1 addition & 2 deletions src/ezmsg/sigproc/butterworthzerophase.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import numpy as np
import scipy.signal
from array_api_compat import get_namespace, is_numpy_array
from ezmsg.baseproc import BaseTransformerUnit
from ezmsg.baseproc import BaseTransformerUnit, resolve_configured_chunk_dim
from ezmsg.baseproc.composite import CompositeProcessor
from ezmsg.util.messages.axisarray import AxisArray, slice_along_axis
from ezmsg.util.messages.util import replace
Expand All @@ -32,7 +32,6 @@
_sosfilt_mlx_metal_xp,
)
from .util.array import xp_asarray, xp_copy, xp_empty, xp_flip
from .util.message import resolve_configured_chunk_dim

if _HAS_MLX_METAL:
import mlx.core as _mx
Expand Down
3 changes: 2 additions & 1 deletion src/ezmsg/sigproc/concat.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
from ezmsg.util.messages.util import replace

from ezmsg.sigproc.util.channels import AxisFingerprintMemo
from ezmsg.sigproc.util.message import with_fingerprint

from .util.message import with_fingerprint

logger = logging.getLogger(__name__)

Expand Down
3 changes: 2 additions & 1 deletion src/ezmsg/sigproc/coordinatespaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@
from ezmsg.baseproc import (
BaseTransformer,
BaseTransformerUnit,
resolve_feature_dim,
)
from ezmsg.util.messages.axisarray import AxisArray, replace

from .util.message import resolve_feature_dim, with_fingerprint
from .util.message import with_fingerprint

# -- Utility functions for coordinate transformations --

Expand Down
4 changes: 2 additions & 2 deletions src/ezmsg/sigproc/decimate.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
import typing

import ezmsg.core as ez
from ezmsg.baseproc import BaseTransformerUnit
from ezmsg.baseproc import BaseTransformerUnit, suppress_axis_deprecation
from ezmsg.util.messages.axisarray import AxisArray

from .cheby import ChebyshevFilterSettings, ChebyshevFilterTransformer
from .downsample import Downsample, DownsampleSettings
from .filter import BACoeffs, SOSCoeffs
from .util.deprecation import suppress_axis_deprecation, warn_axis_deprecated
from .util.deprecation import warn_axis_deprecated


class ChebyForDecimateTransformer(ChebyshevFilterTransformer[BACoeffs | SOSCoeffs]):
Expand Down
2 changes: 1 addition & 1 deletion src/ezmsg/sigproc/diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
BaseStatefulTransformer,
BaseTransformerUnit,
processor_state,
resolve_configured_chunk_dim,
)
from ezmsg.util.messages.axisarray import AxisArray, slice_along_axis
from ezmsg.util.messages.util import replace

from .util.array import xp_copy
from .util.deprecation import warn_axis_deprecated
from .util.message import resolve_configured_chunk_dim


class DiffSettings(ez.Settings):
Expand Down
3 changes: 2 additions & 1 deletion src/ezmsg/sigproc/downsample.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
BaseStatefulTransformer,
BaseTransformerUnit,
processor_state,
resolve_chunk_dim,
)
from ezmsg.util.messages.axisarray import (
AxisArray,
replace,
slice_along_axis,
)

from .util.message import is_empty_along, resolve_chunk_dim
from .util.message import is_empty_along


class DownsampleSettings(ez.Settings):
Expand Down
3 changes: 1 addition & 2 deletions src/ezmsg/sigproc/ewma.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@
import numpy.typing as npt
import scipy.signal as sps
from array_api_compat import get_namespace, is_numpy_array
from ezmsg.baseproc import BaseStatefulTransformer, BaseTransformerUnit, processor_state
from ezmsg.baseproc import BaseStatefulTransformer, BaseTransformerUnit, processor_state, resolve_configured_chunk_dim
from ezmsg.util.messages.axisarray import AxisArray, slice_along_axis
from ezmsg.util.messages.util import replace

from ezmsg.sigproc.util.array import np_finfo

from .util.deprecation import warn_axis_deprecated
from .util.message import resolve_configured_chunk_dim


def _ewma_mlx_metal_xp(data, axis_idx: int, zi, alpha: float, chunk_sizes: tuple[int, ...]):
Expand Down
3 changes: 1 addition & 2 deletions src/ezmsg/sigproc/ewmfilter.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@

import ezmsg.core as ez
import numpy as np
from ezmsg.baseproc import resolve_chunk_dim, suppress_axis_deprecation
from ezmsg.util.messages.axisarray import AxisArray
from ezmsg.util.messages.util import replace

from .util.deprecation import suppress_axis_deprecation
from .util.message import resolve_chunk_dim
from .window import Window, WindowSettings


Expand Down
2 changes: 1 addition & 1 deletion src/ezmsg/sigproc/fbcca.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
BaseTransformer,
BaseTransformerUnit,
CompositeProcessor,
suppress_axis_deprecation,
)
from ezmsg.util.messages.axisarray import AxisArray
from ezmsg.util.messages.util import replace
Expand All @@ -22,7 +23,6 @@
)
from .kaiser import KaiserFilterSettings
from .sampler import SampleTriggerMessage
from .util.deprecation import suppress_axis_deprecation
from .util.message import with_fingerprint
from .window import WindowSettings, WindowTransformer

Expand Down
5 changes: 3 additions & 2 deletions src/ezmsg/sigproc/filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@
SettingsType,
TransformerType,
processor_state,
resolve_configured_chunk_dim,
suppress_axis_deprecation,
)
from ezmsg.util.messages.axisarray import AxisArray, slice_along_axis
from ezmsg.util.messages.util import replace
from scipy.fft import next_fast_len as _next_fast_len

from .util import sosfilt_direct
from .util.array import array_device, xp_asarray, xp_create
from .util.deprecation import suppress_axis_deprecation, warn_axis_deprecated
from .util.message import resolve_configured_chunk_dim
from .util.deprecation import warn_axis_deprecated
from .util.threaded_filt import DEFAULT_MIN_BYTES as _DEFAULT_THREAD_MIN_BYTES
from .util.threaded_filt import filt_threaded, should_thread

Expand Down
2 changes: 1 addition & 1 deletion src/ezmsg/sigproc/filterbank.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
BaseStatefulTransformer,
BaseTransformerUnit,
processor_state,
resolve_configured_chunk_dim,
)
from ezmsg.util.messages.axisarray import AxisArray
from ezmsg.util.messages.util import replace
from scipy.special import lambertw

from .spectrum import OptionsEnum
from .util.deprecation import warn_axis_deprecated
from .util.message import resolve_configured_chunk_dim
from .window import WindowTransformer


Expand Down
5 changes: 3 additions & 2 deletions src/ezmsg/sigproc/filterbankdesign.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
from ezmsg.baseproc import (
BaseStatefulTransformer,
processor_state,
resolve_configured_chunk_dim,
suppress_axis_deprecation,
)
from ezmsg.util.messages.axisarray import AxisArray
from ezmsg.util.messages.util import replace
Expand All @@ -19,8 +21,7 @@
MinPhaseMode,
)
from .kaiser import KaiserFilterSettings, kaiser_design_fun
from .util.deprecation import suppress_axis_deprecation, warn_axis_deprecated
from .util.message import resolve_configured_chunk_dim
from .util.deprecation import warn_axis_deprecated


class FilterbankDesignSettings(ez.Settings):
Expand Down
4 changes: 1 addition & 3 deletions src/ezmsg/sigproc/fir_hilbert.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import ezmsg.core as ez
import numpy as np
import scipy.signal as sps
from ezmsg.baseproc import BaseStatefulTransformer, processor_state
from ezmsg.baseproc import BaseStatefulTransformer, processor_state, resolve_configured_chunk_dim
from ezmsg.util.messages.axisarray import AxisArray
from ezmsg.util.messages.util import replace

Expand All @@ -18,8 +18,6 @@
FilterByDesignTransformer,
)

from .util.message import resolve_configured_chunk_dim


class FIRHilbertFilterSettings(FilterBaseSettings):
"""Settings for :obj:`FIRHilbertFilter`."""
Expand Down
3 changes: 2 additions & 1 deletion src/ezmsg/sigproc/flatten.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@
BaseStatefulTransformer,
BaseTransformerUnit,
processor_state,
resolve_chunk_dim,
)
from ezmsg.util.messages.axisarray import AxisArray, CoordinateAxis, replace

from .util.message import resolve_chunk_dim, with_fingerprint
from .util.message import with_fingerprint


def normalize_axis_label(label):
Expand Down
2 changes: 1 addition & 1 deletion src/ezmsg/sigproc/merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
from __future__ import annotations

import ezmsg.core as ez
from ezmsg.baseproc import suppress_axis_deprecation
from ezmsg.util.messages.axisarray import AxisArray

from .align import AlignAlongAxis, AlignAlongAxisProcessor, AlignAlongAxisSettings
from .concat import Concat, ConcatProcessor, ConcatSettings
from .util.deprecation import suppress_axis_deprecation


class MergeSettings(ez.Settings):
Expand Down
3 changes: 2 additions & 1 deletion src/ezmsg/sigproc/resample.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@
BaseConsumerUnit,
BaseStatefulProcessor,
processor_state,
resolve_configured_chunk_dim,
)
from ezmsg.util.messages.axisarray import AxisArray, LinearAxis, slice_along_axis
from ezmsg.util.messages.util import replace

from .util.axisarray_buffer import HybridAxisArrayBuffer, HybridAxisBuffer
from .util.buffer import UpdateStrategy
from .util.deprecation import warn_axis_deprecated
from .util.message import has_samples_along, resolve_configured_chunk_dim
from .util.message import has_samples_along


def _as_limit(value: float | None) -> float | None:
Expand Down
2 changes: 1 addition & 1 deletion src/ezmsg/sigproc/rollingscaler.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
BaseAdaptiveTransformer,
BaseAdaptiveTransformerUnit,
processor_state,
resolve_configured_chunk_dim,
)
from ezmsg.util.messages.axisarray import AxisArray
from ezmsg.util.messages.util import replace

from .util.deprecation import warn_axis_deprecated
from .util.message import resolve_configured_chunk_dim


class RollingScalerSettings(ez.Settings):
Expand Down
3 changes: 2 additions & 1 deletion src/ezmsg/sigproc/sampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
BaseStatefulTransformer,
BaseTransformerUnit,
processor_state,
resolve_configured_chunk_dim,
)
from ezmsg.util.messages.axisarray import (
AxisArray,
Expand All @@ -24,7 +25,7 @@
from .util.axisarray_buffer import HybridAxisArrayBuffer
from .util.buffer import UpdateStrategy
from .util.deprecation import warn_axis_deprecated
from .util.message import SampleTriggerMessage, resolve_configured_chunk_dim
from .util.message import SampleTriggerMessage
from .util.profile import profile_subpub


Expand Down
Loading
Loading