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: explicitly set resolver version in virtual manifest #1311

Merged
merged 4 commits into from Jul 4, 2023

Conversation

MegaRedHand
Copy link
Contributor

Closes: #1260

Description

The default for crates with edition >= 2021 is version 2 of the resolver. Virtual manifests, however, default to version 1.
When we moved the VM to its own directory, we unknowingly changed the resolver we used.

Checklist

  • Linked to Github Issue
  • Unit tests added
  • Integration tests added.
  • This change requires new documentation.
    • Documentation has been added/updated.
    • CHANGELOG has been updated.

The default for crates with edition >= 2021 is the version 2 of the resolver.
Virtual manifests, however, default to version 1.
Seems that when we moved the VM to its own directory, we also changed the resolver we used.
@codecov
Copy link

codecov bot commented Jul 3, 2023

Codecov Report

Merging #1311 (cf0723e) into main (7328075) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #1311   +/-   ##
=======================================
  Coverage   97.88%   97.88%           
=======================================
  Files          89       89           
  Lines       35470    35470           
=======================================
  Hits        34721    34721           
  Misses        749      749           

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@github-actions
Copy link

github-actions bot commented Jul 3, 2023

Benchmark Results for unmodified programs 🚀

Command Mean [s] Min [s] Max [s] Relative
base big_factorial 5.045 ± 0.046 4.962 5.136 1.01 ± 0.01
head big_factorial 5.018 ± 0.025 4.965 5.060 1.00
Command Mean [s] Min [s] Max [s] Relative
base big_fibonacci 4.280 ± 0.011 4.253 4.294 1.00 ± 0.01
head big_fibonacci 4.265 ± 0.021 4.236 4.298 1.00
Command Mean [s] Min [s] Max [s] Relative
base blake2s_integration_benchmark 13.238 ± 0.066 13.096 13.305 1.00 ± 0.01
head blake2s_integration_benchmark 13.215 ± 0.055 13.124 13.295 1.00
Command Mean [s] Min [s] Max [s] Relative
base compare_arrays_200000 4.633 ± 0.029 4.600 4.691 1.01 ± 0.01
head compare_arrays_200000 4.582 ± 0.029 4.544 4.631 1.00
Command Mean [s] Min [s] Max [s] Relative
base dict_integration_benchmark 3.073 ± 0.012 3.050 3.095 1.00
head dict_integration_benchmark 3.084 ± 0.018 3.057 3.115 1.00 ± 0.01
Command Mean [s] Min [s] Max [s] Relative
base field_arithmetic_get_square_benchmark 2.334 ± 0.013 2.308 2.353 1.00 ± 0.01
head field_arithmetic_get_square_benchmark 2.326 ± 0.009 2.309 2.340 1.00
Command Mean [s] Min [s] Max [s] Relative
base integration_builtins 11.858 ± 0.040 11.784 11.905 1.00 ± 0.01
head integration_builtins 11.826 ± 0.133 11.684 12.166 1.00
Command Mean [s] Min [s] Max [s] Relative
base keccak_integration_benchmark 13.441 ± 0.049 13.342 13.495 1.01 ± 0.01
head keccak_integration_benchmark 13.333 ± 0.060 13.252 13.431 1.00
Command Mean [s] Min [s] Max [s] Relative
base linear_search 4.677 ± 0.027 4.610 4.718 1.01 ± 0.01
head linear_search 4.652 ± 0.015 4.624 4.668 1.00
Command Mean [s] Min [s] Max [s] Relative
base math_cmp_and_pow_integration_benchmark 3.339 ± 0.018 3.303 3.357 1.01 ± 0.01
head math_cmp_and_pow_integration_benchmark 3.318 ± 0.027 3.269 3.352 1.00
Command Mean [s] Min [s] Max [s] Relative
base math_integration_benchmark 3.025 ± 0.008 3.012 3.037 1.02 ± 0.01
head math_integration_benchmark 2.974 ± 0.025 2.923 3.012 1.00
Command Mean [s] Min [s] Max [s] Relative
base memory_integration_benchmark 2.661 ± 0.016 2.639 2.687 1.01 ± 0.01
head memory_integration_benchmark 2.626 ± 0.025 2.582 2.659 1.00
Command Mean [s] Min [s] Max [s] Relative
base operations_with_data_structures_benchmarks 2.964 ± 0.012 2.940 2.983 1.00
head operations_with_data_structures_benchmarks 2.972 ± 0.023 2.921 2.999 1.00 ± 0.01
Command Mean [s] Min [s] Max [s] Relative
base pedersen 1.015 ± 0.010 0.996 1.037 1.00
head pedersen 1.017 ± 0.006 1.003 1.025 1.00 ± 0.01
Command Mean [s] Min [s] Max [s] Relative
base poseidon_integration_benchmark 1.825 ± 0.009 1.810 1.835 1.00
head poseidon_integration_benchmark 1.829 ± 0.012 1.810 1.846 1.00 ± 0.01
Command Mean [s] Min [s] Max [s] Relative
base secp_integration_benchmark 3.572 ± 0.013 3.543 3.582 1.01 ± 0.01
head secp_integration_benchmark 3.524 ± 0.034 3.469 3.563 1.00
Command Mean [s] Min [s] Max [s] Relative
base set_integration_benchmark 1.943 ± 0.011 1.922 1.960 1.05 ± 0.02
head set_integration_benchmark 1.850 ± 0.032 1.779 1.907 1.00
Command Mean [s] Min [s] Max [s] Relative
base uint256_integration_benchmark 8.516 ± 0.068 8.350 8.597 1.00 ± 0.01
head uint256_integration_benchmark 8.491 ± 0.071 8.363 8.572 1.00

@pefontana pefontana enabled auto-merge July 4, 2023 17:29
@pefontana pefontana added this pull request to the merge queue Jul 4, 2023
Merged via the queue into main with commit 6fc69cd Jul 4, 2023
34 checks passed
@pefontana pefontana deleted the pin-resolver branch July 4, 2023 18:08
kariy pushed a commit to dojoengine/cairo-rs that referenced this pull request Jul 25, 2023
…#1311)

* Explicitly set resolver version in virtual manifest

The default for crates with edition >= 2021 is the version 2 of the resolver.
Virtual manifests, however, default to version 1.
Seems that when we moved the VM to its own directory, we also changed the resolver we used.

* Update changelog

---------

Co-authored-by: Pedro Fontana <fontana.pedro93@gmail.com>
kariy pushed a commit to dojoengine/cairo-rs that referenced this pull request Jul 25, 2023
…#1311)

* Explicitly set resolver version in virtual manifest

The default for crates with edition >= 2021 is the version 2 of the resolver.
Virtual manifests, however, default to version 1.
Seems that when we moved the VM to its own directory, we also changed the resolver we used.

* Update changelog

---------

Co-authored-by: Pedro Fontana <fontana.pedro93@gmail.com>
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.

Fix resolver version or cargo
3 participants