Skip to content

Commit 421b5b1

Browse files
authored
Merge pull request #77 from awxkee/f16
Dropping half, reworking to nightly f16
2 parents 71943ec + 3ed2648 commit 421b5b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+893
-668
lines changed

.github/workflows/build_push.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,13 @@ jobs:
2727
- uses: actions-rust-lang/setup-rust-toolchain@v1
2828
- run: rustup target add aarch64-unknown-linux-gnu x86_64-unknown-linux-gnu i686-unknown-linux-gnu powerpc-unknown-linux-gnu armv7-unknown-linux-gnueabi
2929
- run: RUSTFLAGS="-C target-feature=+neon" cargo build --target aarch64-unknown-linux-gnu --features image
30+
- run: RUSTFLAGS="-C target-feature=+neon" cargo +nightly build --target aarch64-unknown-linux-gnu --features image,nightly_f16
3031
- run: RUSTFLAGS="-C target-feature=+sse4.1" cargo build --target i686-unknown-linux-gnu --features image
32+
- run: RUSTFLAGS="-C target-feature=+sse4.1" cargo +nightly build --target i686-unknown-linux-gnu --features image,nightly_f16
3133
- run: cargo build --target powerpc-unknown-linux-gnu
34+
- run: cargo +nightly build --target powerpc-unknown-linux-gnu --features nightly_f16
3235
- run: RUSTFLAGS="-C target-feature=+avx2,+f16c" cargo build --target x86_64-unknown-linux-gnu --features image
36+
- run: RUSTFLAGS="-C target-feature=+avx2,+f16c" cargo +nightly build --target x86_64-unknown-linux-gnu --features image,nightly_f16
3337
- run: cargo build --target armv7-unknown-linux-gnueabi
3438

3539
clippy:

Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ workspace = { members = ["fuzz", "app/accelerate", "app"] }
22

33
[package]
44
name = "libblur"
5-
version = "0.19.4"
5+
version = "0.20.0"
66
edition = "2021"
77
description = "Fast image blurring in pure Rust"
88
readme = "./README.md"
@@ -21,12 +21,11 @@ name = "libblur"
2121
path = "src/lib.rs"
2222

2323
[dependencies]
24-
half = { version = "2.6", features = ["num-traits"] }
2524
num-traits = "0.2"
2625
rayon = "1.10"
2726
image = { version = "0.25", optional = true, default-features = false }
2827
rustfft = { version = "6.3", optional = true }
29-
fast_transpose = { version = "0.2.5", optional = true }
28+
fast_transpose = { version = "0.2", optional = true }
3029
num-complex = "0.4"
3130
novtb = "^0.1.6"
3231

@@ -40,6 +39,8 @@ rdm = ["neon"]
4039
nightly_avx512 = []
4140
# Enables NEON fcma, used in FFT and filter 1d complex. Requires nightly.
4241
nightly_fcma = []
42+
# Enables core::f16 support. Requires nightly.
43+
nightly_f16 = []
4344
# Enables AVX intrinsics
4445
avx = []
4546
# Enables SSE4.1 intrinsics

app/Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
colorutils-rs = "0.7.0"
87
half = "2.4.1"
98
image = "0.25.5"
10-
libblur = { path = "../", features = [], default-features = false }
9+
libblur = { path = "../", features = ["nightly_f16", "sse", "avx"], default-features = false }
1110
accelerate = { path = "accelerate" }
1211
rayon = "1.10.0"
1312
fast_transpose = "0.2.5"
1413
num-complex = "0.4"
1514

1615
[dev-dependencies]
17-
criterion = "0.6.0"
18-
opencv = { version = "0.94.2", default-features = false, features = ["imgcodecs", "imgproc", "clang-runtime"] }
16+
criterion = "0.7.0"
17+
opencv = { version = "0.95.1", default-features = false, features = ["imgcodecs", "imgproc", "clang-runtime"] }
1918

2019
[[bench]]
2120
name = "gauss"

0 commit comments

Comments
 (0)