Skip to content

Commit c6fbb33

Browse files
committed
Upgrade to easyfft v0.3
Unfortunately this requires an extra Default trait bound which results in requiring a major version change for fftconvolve. Practically it's not an issue since all elements that you'd want to convolve would implement Default, but it's a bit annoying. Default is required for initializing the scratch-buffer, which is strictly not necessary but requires changes to `rustfft`. It's currently pending this issue in rustfft: ejmahler/RustFFT#105
1 parent 14950db commit c6fbb33

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ ndarray = "^0.15"
1919
ndarray-linalg = "^0.16"
2020
num-traits = "^0.2"
2121
num = "^0.4"
22-
easyfft = "^0.2"
22+
easyfft = "^0.3"

src/lib.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use easyfft::prelude::*;
2-
use easyfft::{Complex, FftNum};
2+
use easyfft::FftNum;
3+
use easyfft::num_complex::Complex;
34
use ndarray::{prelude::*, OwnedRepr, DataMut};
45
use ndarray::{Array, ArrayBase, Axis, Data, Dimension, Slice};
56
use num::FromPrimitive;
@@ -77,7 +78,7 @@ pub fn fftconvolve<A, S, D>(
7778
mode: Mode,
7879
) -> Result<ArrayBase<OwnedRepr<A>, D>, Box<dyn Error>>
7980
where
80-
A: FftNum + FromPrimitive,
81+
A: FftNum + FromPrimitive + Default,
8182
S: Data<Elem = A>,
8283
D: Dimension,
8384
{
@@ -138,7 +139,7 @@ pub fn fftcorrelate<A, S, D>(
138139
mode: Mode,
139140
) -> Result<ArrayBase<OwnedRepr<A>, D>, Box<dyn Error>>
140141
where
141-
A: FftNum + FromPrimitive,
142+
A: FftNum + FromPrimitive + Default,
142143
S: Data<Elem = A>,
143144
D: Dimension,
144145
{

0 commit comments

Comments
 (0)