Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Linux build: Make the nasm feature a no-op #7675

Merged
merged 5 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
1 change: 1 addition & 0 deletions crates/store/re_video/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ av1 = ["dep:dav1d"]

## Enable faster native video decoding with assembly.
## You need to install [nasm](https://nasm.us/) to compile with this feature.
## TODO(#7671): there is a bug that makes this incompatible with arch linux
emilk marked this conversation as resolved.
Show resolved Hide resolved
nasm = ["dav1d?/default"] # The default feature set of dav1d has asm enabled

[dependencies]
Expand Down
8 changes: 0 additions & 8 deletions crates/store/re_video/src/decode/av1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ impl SyncDav1dDecoder {
pub fn new() -> Result<Self> {
re_tracing::profile_function!();

if !cfg!(feature = "nasm") {
re_log::warn_once!(
"NOTE: native AV1 video decoder is running extra slowly. \
Speed it up by compiling Rerun with the `nasm` feature enabled. \
You'll need to also install nasm: https://nasm.us/"
);
}

// See https://videolan.videolan.me/dav1d/structDav1dSettings.html for settings docs
let mut settings = dav1d::Settings::new();

Expand Down
1 change: 1 addition & 0 deletions crates/top/rerun-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ default = ["native_viewer", "web_viewer"]

## Enable faster native video decoding with assembly.
## You need to install [nasm](https://nasm.us/) to compile with this feature.
## TODO(#7671): there is a bug that makes this incompatible with arch linux
emilk marked this conversation as resolved.
Show resolved Hide resolved
nasm = ["rerun/nasm"]

## Support spawning a native viewer.
Expand Down
1 change: 1 addition & 0 deletions crates/top/rerun/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ log = ["dep:env_logger", "dep:log"]

## Enable faster native video decoding with assembly.
## You need to install [nasm](https://nasm.us/) to compile with this feature.
## TODO(#7671): there is a bug that makes this incompatible with arch linux
emilk marked this conversation as resolved.
Show resolved Hide resolved
nasm = ["re_video/nasm"]

## Support spawning a native viewer.
Expand Down
8 changes: 4 additions & 4 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -122,18 +122,18 @@ man = "cargo --quiet run --package rerun-cli --all-features -- man > docs/conten
# Compile and run the rerun viewer.
#
# You can also give an argument for what to view (e.g. an .rrd file).
rerun = "cargo run --package rerun-cli --no-default-features --features native_viewer,nasm --"
rerun = "cargo run --package rerun-cli --no-default-features --features native_viewer --"

# Compile `rerun-cli` without the web-viewer.
rerun-build = "cargo build --package rerun-cli --no-default-features --features native_viewer,nasm"
rerun-build = "cargo build --package rerun-cli --no-default-features --features native_viewer"

# Compile `rerun-cli` without the web-viewer.
rerun-build-release = "cargo build --package rerun-cli --release --no-default-features --features native_viewer,nasm"
rerun-build-release = "cargo build --package rerun-cli --release --no-default-features --features native_viewer"

# Compile and run the rerun viewer with --release.
#
# You can also give an argument for what to view (e.g. an .rrd file).
rerun-release = "cargo run --package rerun-cli --no-default-features --features native_viewer,nasm --release --"
rerun-release = "cargo run --package rerun-cli --no-default-features --features native_viewer --release --"

# Compile and run the web-viewer via rerun-cli.
#
Expand Down
3 changes: 2 additions & 1 deletion rerun_py/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ default = ["extension-module"]

## The features we turn on when building the `rerun-sdk` PyPi package
## for <https://pypi.org/project/rerun-sdk/>.
pypi = ["extension-module", "nasm", "web_viewer"]
pypi = ["extension-module", "web_viewer"]

## We need to enable the `pyo3/extension-module` when building the SDK,
## but we cannot enable it when building tests and benchmarks, so we
Expand All @@ -30,6 +30,7 @@ extension-module = ["pyo3/extension-module"]

## Enable faster native video decoding with assembly.
## You need to install [nasm](https://nasm.us/) to compile with this feature.
## TODO(#7671): there is a bug that makes this incompatible with arch linux
emilk marked this conversation as resolved.
Show resolved Hide resolved
nasm = ["re_video/nasm"]

## Support serving a web viewer over HTTP with `serve()`.
Expand Down
Loading