-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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
[Merged by Bors] - Add cart's fork of ecs_bench_suite #4225
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me. We can revise these further in the future IMO.
I'm not sure if I'm doing something wrong, but if I clone this PR, go to the
I tried doing a cargo clean and I get the same error |
I was able to run the tests just fine. Windows 10, rust 1.59. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Awesome! I agree that we might ultimately want to tweak these to meet our own needs (instead of assuming ecs_bench_suite patterns are the right call). But having these tests in-tree makes optimizing bevy_ecs much easier. This is definitely a win.
bors r+ |
Sorry to do this, but I think we need to revert this. We don't have a license to include the code from We can seperately get in touch with @TomGillen to try and get such a license, but otherwise we can't use this. |
This reverts commit 08ef2f0.
This reverts commit 08ef2f0. # Objective - #4225 was merged without considering the licensing considerations. - It merges in code taken from https://github.com/cart/ecs_bench_suite/tree/bevy-benches/src/bevy. - We can safely assume that we do have a license to cart's contributions. However, these build upon cart/ecs_bench_suite@377e96e, for which we have no license. - This has been verified by looking in the Cargo.toml, the root folder and the readme, none of which mention a license. Additionally, the string "license" [doesn't appear](https://github.com/rust-gamedev/ecs_bench_suite/search?q=license) in the repository. - This means the code is all rights reserved. - (The author of these commits also hasn't commented in #2373, though even if they had, it would be legally *dubious* to rely on that to license any code they ever wrote) - (Note that the latest commit on the head at https://github.com/rust-gamedev/ecs_bench_suite hasn't had a license added either.) - We are currently incorrectly claiming to be able to give an MIT/Apache 2.0 license to this code. ## Solution - Revert it
This was the right call, as we hadn't previously discussed this. But I think generally these fall under the "trivially reproducible / not novel" category of thing. From scratch impls would look pretty much the same. Couple that with me being the one that wrote most of the code here, and I think adding these isn't risky. That being said, its better to ask and be safe. @TomGillen, can we have permission to relicense the bevy ecs_bench_suite tests under bevy's dual MIT/Apache-2.0 license? |
I don't have any problem with that. It should have had such a license in the first place, but it didn't occur to me that someone would want to embed the code into another project or use it as a library. |
…bevyengine#4252)" This reverts commit 95d3f32.
# Objective - Benchmarks are good. - Licensing situation appears to be [cleared up](#4225 (comment)). ## Solution - Add the benchmark suite back in - Suggested PR title: "Revert "Revert "Add cart's fork of ecs_bench_suite (#4225)" (#4252)" Co-authored-by: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>
Thanks @TomGillen! |
# Objective Better benchmarking for ECS. Fix bevyengine#2062. ## Solution Port @cart's fork of ecs_bench_suite to the official bench suite for bevy_ecs, replace cgmath with glam, update to latest bevy.
…gine#4252) This reverts commit 08ef2f0. # Objective - bevyengine#4225 was merged without considering the licensing considerations. - It merges in code taken from https://github.com/cart/ecs_bench_suite/tree/bevy-benches/src/bevy. - We can safely assume that we do have a license to cart's contributions. However, these build upon cart/ecs_bench_suite@377e96e, for which we have no license. - This has been verified by looking in the Cargo.toml, the root folder and the readme, none of which mention a license. Additionally, the string "license" [doesn't appear](https://github.com/rust-gamedev/ecs_bench_suite/search?q=license) in the repository. - This means the code is all rights reserved. - (The author of these commits also hasn't commented in bevyengine#2373, though even if they had, it would be legally *dubious* to rely on that to license any code they ever wrote) - (Note that the latest commit on the head at https://github.com/rust-gamedev/ecs_bench_suite hasn't had a license added either.) - We are currently incorrectly claiming to be able to give an MIT/Apache 2.0 license to this code. ## Solution - Revert it
# Objective - Benchmarks are good. - Licensing situation appears to be [cleared up](bevyengine#4225 (comment)). ## Solution - Add the benchmark suite back in - Suggested PR title: "Revert "Revert "Add cart's fork of ecs_bench_suite (bevyengine#4225)" (bevyengine#4252)" Co-authored-by: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>
# Objective Better benchmarking for ECS. Fix bevyengine#2062. ## Solution Port @cart's fork of ecs_bench_suite to the official bench suite for bevy_ecs, replace cgmath with glam, update to latest bevy.
…gine#4252) This reverts commit 08ef2f0. # Objective - bevyengine#4225 was merged without considering the licensing considerations. - It merges in code taken from https://github.com/cart/ecs_bench_suite/tree/bevy-benches/src/bevy. - We can safely assume that we do have a license to cart's contributions. However, these build upon cart/ecs_bench_suite@377e96e, for which we have no license. - This has been verified by looking in the Cargo.toml, the root folder and the readme, none of which mention a license. Additionally, the string "license" [doesn't appear](https://github.com/rust-gamedev/ecs_bench_suite/search?q=license) in the repository. - This means the code is all rights reserved. - (The author of these commits also hasn't commented in bevyengine#2373, though even if they had, it would be legally *dubious* to rely on that to license any code they ever wrote) - (Note that the latest commit on the head at https://github.com/rust-gamedev/ecs_bench_suite hasn't had a license added either.) - We are currently incorrectly claiming to be able to give an MIT/Apache 2.0 license to this code. ## Solution - Revert it
# Objective - Benchmarks are good. - Licensing situation appears to be [cleared up](bevyengine#4225 (comment)). ## Solution - Add the benchmark suite back in - Suggested PR title: "Revert "Revert "Add cart's fork of ecs_bench_suite (bevyengine#4225)" (bevyengine#4252)" Co-authored-by: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>
Objective
Better benchmarking for ECS. Fix #2062.
Solution
Port @cart's fork of ecs_bench_suite to the official bench suite for bevy_ecs, replace cgmath with glam, update to latest bevy.