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 & test relocatability #3490

Merged
merged 7 commits into from
Dec 20, 2023
Merged

Fix & test relocatability #3490

merged 7 commits into from
Dec 20, 2023

Conversation

SimonDanisch
Copy link
Member

No description provided.

@MakieBot
Copy link
Collaborator

MakieBot commented Dec 19, 2023

Compile Times benchmark

Note, that these numbers may fluctuate on the CI servers, so take them with a grain of salt. All benchmark results are based on the mean time and negative percent mean faster than the base branch. Note, that GLMakie + WGLMakie run on an emulated GPU, so the runtime benchmark is much slower. Results are from running:

using_time = @ctime using Backend
# Compile time
create_time = @ctime fig = scatter(1:4; color=1:4, colormap=:turbo, markersize=20, visible=true)
display_time = @ctime Makie.colorbuffer(display(fig))
# Runtime
create_time = @benchmark fig = scatter(1:4; color=1:4, colormap=:turbo, markersize=20, visible=true)
display_time = @benchmark Makie.colorbuffer(fig)
using create display create display
GLMakie 3.50s (3.41, 3.60) 0.06+- 389.14ms (374.34, 402.63) 13.24+- 457.85ms (451.00, 468.53) 6.33+- 7.21ms (7.03, 7.46) 0.19+- 25.42ms (25.22, 25.86) 0.27+-
master 3.49s (3.42, 3.56) 0.05+- 386.07ms (374.73, 399.14) 9.85+- 476.99ms (463.21, 512.70) 17.08+- 7.25ms (7.04, 7.51) 0.16+- 25.54ms (25.31, 25.93) 0.23+-
evaluation 1.00x invariant, 0.0s (0.07d, 0.89p, 0.06std) 0.99x invariant, 3.07ms (0.26d, 0.63p, 11.54std) 1.04x faster ✓, -19.13ms (-1.49d, 0.03p, 11.71std) 1.01x invariant, -0.04ms (-0.23d, 0.68p, 0.17std) 1.00x invariant, -0.12ms (-0.48d, 0.38p, 0.25std)
CairoMakie 2.99s (2.98, 3.01) 0.01+- 310.31ms (307.62, 312.52) 1.73+- 138.48ms (136.95, 139.59) 0.88+- 7.05ms (7.00, 7.13) 0.04+- 599.33μs (593.42, 606.58) 4.92+-
master 2.98s (2.96, 2.99) 0.01+- 310.44ms (308.00, 312.09) 1.27+- 138.57ms (137.01, 139.13) 0.72+- 7.04ms (6.99, 7.09) 0.03+- 598.11μs (596.03, 605.22) 3.36+-
evaluation 1.00x invariant, 0.01s (0.81d, 0.15p, 0.01std) 1.00x invariant, -0.13ms (-0.09d, 0.88p, 1.50std) 1.00x invariant, -0.09ms (-0.11d, 0.84p, 0.80std) 1.00x invariant, 0.0ms (0.10d, 0.86p, 0.04std) 1.00x invariant, 1.22μs (0.29d, 0.60p, 4.14std)
WGLMakie 3.69s (3.66, 3.73) 0.03+- 313.14ms (310.55, 317.76) 2.63+- 8.44s (8.40, 8.50) 0.04+- 9.01ms (8.94, 9.17) 0.08+- 72.97ms (67.25, 78.11) 4.24+-
master 3.68s (3.66, 3.73) 0.02+- 316.01ms (311.72, 319.50) 3.36+- 8.44s (8.35, 8.59) 0.08+- 9.11ms (8.81, 9.73) 0.30+- 73.75ms (66.27, 91.78) 8.58+-
evaluation 1.00x invariant, 0.01s (0.36d, 0.52p, 0.03std) 1.01x invariant, -2.87ms (-0.95d, 0.10p, 2.99std) 1.00x invariant, 0.01s (0.09d, 0.88p, 0.06std) 1.01x invariant, -0.09ms (-0.42d, 0.46p, 0.19std) 1.01x invariant, -0.78ms (-0.12d, 0.83p, 6.41std)

@bjarthur
Copy link
Contributor

bjarthur commented Dec 19, 2023

thanks!

i was wondering whether there might also need to be another RelocatableFolders.@path added here. according to the RelocatableFolders.jl docs, there should be one for any joinpath.

also, i noticed that the file separators here (and elsewhere in that same file) are not OS-agnostic. might that cause problems in some corner case?

@SimonDanisch
Copy link
Member Author

SimonDanisch commented Dec 19, 2023

I guess it does pass the test and works on linux + windows... So maybe fine as is?

@SimonDanisch SimonDanisch merged commit adc5c91 into master Dec 20, 2023
16 checks passed
@SimonDanisch SimonDanisch deleted the sd/relocatability branch December 20, 2023 00:33
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