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
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ requires-python = ">=3.10"
dynamic = ["version"]
dependencies = [
"array-api-compat>=1.11.1",
"ezmsg[axisarray]>=3.7.3",
"ezmsg[axisarray]>=3.9.0",
"ezmsg-baseproc>=1.6.0",
"mlx>=0.18.0; sys_platform == 'darwin' and platform_machine == 'arm64'",
"numba>=0.61.0",
Expand Down
4 changes: 2 additions & 2 deletions src/ezmsg/sigproc/align.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ class AlignAlongAxis(ez.Unit):
async def initialize(self) -> None:
self.processor = AlignAlongAxisProcessor(settings=self.SETTINGS)

@ez.subscriber(INPUT_SIGNAL_A, zero_copy=True)
@ez.subscriber(INPUT_SIGNAL_A)
@ez.publisher(OUTPUT_SIGNAL_A)
@ez.publisher(OUTPUT_SIGNAL_B)
async def on_a(self, msg: AxisArray) -> typing.AsyncGenerator:
Expand All @@ -231,7 +231,7 @@ async def on_a(self, msg: AxisArray) -> typing.AsyncGenerator:
yield self.OUTPUT_SIGNAL_A, pair[0]
yield self.OUTPUT_SIGNAL_B, pair[1]

@ez.subscriber(INPUT_SIGNAL_B, zero_copy=True)
@ez.subscriber(INPUT_SIGNAL_B)
@ez.publisher(OUTPUT_SIGNAL_A)
@ez.publisher(OUTPUT_SIGNAL_B)
async def on_b(self, msg: AxisArray) -> typing.AsyncGenerator:
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 @@ -44,8 +44,8 @@ class Decimate(ez.Collection):

SETTINGS = DownsampleSettings

INPUT_SIGNAL = ez.InputStream(AxisArray)
OUTPUT_SIGNAL = ez.OutputStream(AxisArray)
INPUT_SIGNAL = ez.InputTopic(AxisArray)
OUTPUT_SIGNAL = ez.OutputTopic(AxisArray)

FILTER = ChebyForDecimate()
DOWNSAMPLE = Downsample()
Expand Down
6 changes: 3 additions & 3 deletions src/ezmsg/sigproc/merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ class Merge(ez.Collection):

SETTINGS = MergeSettings

INPUT_SIGNAL_A = ez.InputStream(AxisArray)
INPUT_SIGNAL_B = ez.InputStream(AxisArray)
OUTPUT_SIGNAL = ez.OutputStream(AxisArray)
INPUT_SIGNAL_A = ez.InputTopic(AxisArray)
INPUT_SIGNAL_B = ez.InputTopic(AxisArray)
OUTPUT_SIGNAL = ez.OutputTopic(AxisArray)

ALIGN = AlignAlongAxis()
CONCAT = Concat()
Expand Down
2 changes: 1 addition & 1 deletion src/ezmsg/sigproc/resample.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ class ResampleUnit(BaseConsumerUnit[ResampleSettings, AxisArray, ResampleProcess
INPUT_REFERENCE = ez.InputStream(AxisArray)
OUTPUT_SIGNAL = ez.OutputStream(AxisArray)

@ez.subscriber(INPUT_REFERENCE, zero_copy=True)
@ez.subscriber(INPUT_REFERENCE)
async def on_reference(self, message: AxisArray):
self.processor.push_reference(message)

Expand Down
2 changes: 1 addition & 1 deletion src/ezmsg/sigproc/sampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ class Sampler(BaseTransformerUnit[SamplerSettings, AxisArray, AxisArray, Sampler
async def on_trigger(self, msg: SampleTriggerMessage) -> None:
_ = self.processor.push_trigger(msg)

@ez.subscriber(BaseConsumerUnit.INPUT_SIGNAL, zero_copy=True)
@ez.subscriber(BaseConsumerUnit.INPUT_SIGNAL)
@ez.publisher(BaseTransformerUnit.OUTPUT_SIGNAL)
@profile_subpub(trace_oldest=False)
async def on_signal(self, message: AxisArray) -> typing.AsyncGenerator:
Expand Down
2 changes: 1 addition & 1 deletion src/ezmsg/sigproc/util/axisarray_buffer.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ def searchsorted(self, values: typing.Union[float, Array], side: str = "left") -
f_inds = (values - self._linear_axis.offset) / self._linear_axis.gain
res = np.ceil(f_inds)
if side == "right":
res[np.isclose(f_inds, res)] += 1
res[np.isclose(f_inds, res, rtol=0, atol=1e-9)] += 1
return res.astype(int)


Expand Down
2 changes: 1 addition & 1 deletion src/ezmsg/sigproc/window.py
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ class Window(BaseTransformerUnit[WindowSettings, AxisArray, AxisArray, WindowTra
INPUT_SIGNAL = ez.InputStream(AxisArray)
OUTPUT_SIGNAL = ez.OutputStream(AxisArray)

@ez.subscriber(INPUT_SIGNAL, zero_copy=True)
@ez.subscriber(INPUT_SIGNAL)
@ez.publisher(OUTPUT_SIGNAL)
@profile_subpub(trace_oldest=False)
async def on_signal(self, message: AxisArray) -> typing.AsyncGenerator:
Expand Down
Loading