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 cairo1 & cairo2 builds in Makefile #1390

Merged
merged 7 commits into from
Aug 22, 2023
Merged

Conversation

fmoletta
Copy link
Member

@fmoletta fmoletta commented Aug 18, 2023

In order to install versions 1 & 2 of the cairo compiler for both macos and not macos systems, a rule was used to check weather the directory existed and build it. As two different behaviours where expected when building for macos and not for macos, two rules were added, one for the cairoX directory and one for cairoX-macos directory, but both of them built the cairoX directory. This lead to makefile erros when building for macos, as the rule would check for the cairoX-macos directory which didn't exist and then fail when the cairoX directory did exist.
This PR uses conditionals to check weather the directory cairoX exists, solving this issue.
Closes #1389
Also contains fix from #1388

@fmoletta fmoletta added the pipelines This PR/issue is exclusively about improving our CI label Aug 18, 2023
@fmoletta fmoletta marked this pull request as ready for review August 18, 2023 15:54
@codecov
Copy link

codecov bot commented Aug 18, 2023

Codecov Report

Merging #1390 (fd4ba3a) into main (f81b1d2) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #1390   +/-   ##
=======================================
  Coverage   97.49%   97.49%           
=======================================
  Files          93       93           
  Lines       37913    37913           
=======================================
  Hits        36962    36962           
  Misses        951      951           

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

@github-actions
Copy link

github-actions bot commented Aug 18, 2023

Benchmark Results for unmodified programs 🚀

Command Mean [s] Min [s] Max [s] Relative
base big_factorial 4.629 ± 0.056 4.525 4.708 1.04 ± 0.04
head big_factorial 4.434 ± 0.150 4.156 4.596 1.00
Command Mean [s] Min [s] Max [s] Relative
base big_fibonacci 3.603 ± 0.101 3.463 3.736 1.00
head big_fibonacci 3.608 ± 0.096 3.515 3.827 1.00 ± 0.04
Command Mean [s] Min [s] Max [s] Relative
base blake2s_integration_benchmark 9.971 ± 0.158 9.741 10.181 1.02 ± 0.02
head blake2s_integration_benchmark 9.789 ± 0.116 9.655 10.026 1.00
Command Mean [s] Min [s] Max [s] Relative
base compare_arrays_200000 3.687 ± 0.096 3.533 3.810 1.01 ± 0.03
head compare_arrays_200000 3.650 ± 0.070 3.558 3.805 1.00
Command Mean [s] Min [s] Max [s] Relative
base dict_integration_benchmark 2.381 ± 0.029 2.347 2.436 1.02 ± 0.02
head dict_integration_benchmark 2.335 ± 0.023 2.307 2.388 1.00
Command Mean [s] Min [s] Max [s] Relative
base field_arithmetic_get_square_benchmark 1.759 ± 0.042 1.709 1.831 1.01 ± 0.03
head field_arithmetic_get_square_benchmark 1.741 ± 0.017 1.726 1.780 1.00
Command Mean [s] Min [s] Max [s] Relative
base integration_builtins 9.621 ± 0.131 9.457 9.891 1.00
head integration_builtins 10.332 ± 0.599 9.648 11.081 1.07 ± 0.06
Command Mean [s] Min [s] Max [s] Relative
base keccak_integration_benchmark 11.073 ± 0.109 10.902 11.219 1.00 ± 0.01
head keccak_integration_benchmark 11.053 ± 0.069 10.969 11.212 1.00
Command Mean [s] Min [s] Max [s] Relative
base linear_search 3.960 ± 0.071 3.831 4.042 1.00
head linear_search 3.986 ± 0.015 3.958 4.003 1.01 ± 0.02
Command Mean [s] Min [s] Max [s] Relative
base math_cmp_and_pow_integration_benchmark 2.895 ± 0.022 2.866 2.938 1.01 ± 0.01
head math_cmp_and_pow_integration_benchmark 2.865 ± 0.009 2.852 2.881 1.00
Command Mean [s] Min [s] Max [s] Relative
base math_integration_benchmark 2.556 ± 0.012 2.545 2.577 1.00
head math_integration_benchmark 2.562 ± 0.031 2.508 2.590 1.00 ± 0.01
Command Mean [s] Min [s] Max [s] Relative
base memory_integration_benchmark 2.323 ± 0.027 2.291 2.361 1.02 ± 0.02
head memory_integration_benchmark 2.284 ± 0.031 2.235 2.329 1.00
Command Mean [s] Min [s] Max [s] Relative
base operations_with_data_structures_benchmarks 2.484 ± 0.028 2.438 2.529 1.00
head operations_with_data_structures_benchmarks 2.518 ± 0.021 2.485 2.550 1.01 ± 0.01
Command Mean [ms] Min [ms] Max [ms] Relative
base pedersen 928.0 ± 8.3 920.7 947.5 1.00
head pedersen 930.0 ± 4.4 923.3 938.4 1.00 ± 0.01
Command Mean [s] Min [s] Max [s] Relative
base poseidon_integration_benchmark 1.626 ± 0.028 1.594 1.672 1.00
head poseidon_integration_benchmark 1.651 ± 0.042 1.603 1.726 1.02 ± 0.03
Command Mean [s] Min [s] Max [s] Relative
base secp_integration_benchmark 3.174 ± 0.046 3.119 3.261 1.00 ± 0.02
head secp_integration_benchmark 3.164 ± 0.055 3.080 3.257 1.00
Command Mean [s] Min [s] Max [s] Relative
base set_integration_benchmark 1.620 ± 0.033 1.566 1.665 1.00
head set_integration_benchmark 1.632 ± 0.021 1.606 1.671 1.01 ± 0.02
Command Mean [s] Min [s] Max [s] Relative
base uint256_integration_benchmark 7.069 ± 0.075 6.939 7.203 1.00
head uint256_integration_benchmark 7.136 ± 0.067 7.077 7.252 1.01 ± 0.01

Makefile Outdated Show resolved Hide resolved
Co-authored-by: Mario Rugiero <[email protected]>
@pefontana pefontana added this pull request to the merge queue Aug 22, 2023
Merged via the queue into main with commit 6828b6a Aug 22, 2023
38 checks passed
@pefontana pefontana deleted the fix-cairo-2-compiler-build branch August 22, 2023 21:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pipelines This PR/issue is exclusively about improving our CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Makefile target build-cairo-2-compiler-macos depends on a directory that is never built
3 participants