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

Split CLI tools into a separate package #1308

Merged
merged 2 commits into from
Jul 12, 2024
Merged

Split CLI tools into a separate package #1308

merged 2 commits into from
Jul 12, 2024

Conversation

rinon
Copy link
Collaborator

@rinon rinon commented Jul 11, 2024

No description provided.

@randomPoison
Copy link
Collaborator

Looks like you need to add features for asm, bitdepth_8, and bitdepth_16 to the new tools crate to be able to build with the same feature flags that we have on the main rav1d crate. You can add the following to tools/Cargo.toml to set this up:

[features]
default = ["asm", "bitdepth_8", "bitdepth_16"]
asm = ["rav1d/asm"]
bitdepth_8 = ["rav1d/bitdepth_8"]
bitdepth_16 = ["rav1d/bitdepth_16"]

Cargo.toml Outdated Show resolved Hide resolved
tools/Cargo.toml Outdated Show resolved Hide resolved
@rinon
Copy link
Collaborator Author

rinon commented Jul 11, 2024

It looks like fixing the workspace fixed the features, as they can now be used when building. I don't think we need to explicitly pass them from the binaries unless we want a different set of defaults.

@kkysen kkysen mentioned this pull request Jul 12, 2024
5 tasks
@rinon rinon merged commit 5c1a5c7 into main Jul 12, 2024
27 checks passed
@rinon rinon deleted the sjc/split_bins branch July 12, 2024 18:19
@kkysen
Copy link
Collaborator

kkysen commented Jul 15, 2024

It looks like fixing the workspace fixed the features, as they can now be used when building. I don't think we need to explicitly pass them from the binaries unless we want a different set of defaults.

@rinon, I don't think this is fixed. @fbossen says that building with --no-default-features --features bitdepth_8,bitdepth_16 no longer disables asm. rav1d-cli is probably depending on rav1d with default features, whereas we need to forward them. Not sure exactly how to do that.

@rinon
Copy link
Collaborator Author

rinon commented Jul 15, 2024

cargo clean && cargo build --no-default-features --features=bitdepth_8,bitdepth_16 results in a build with no assembly. I'll investigate to see what's going on.

edit: can replicate now

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants