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

WGLMakie relocatability #4467

Merged
merged 8 commits into from
Oct 11, 2024
Merged

WGLMakie relocatability #4467

merged 8 commits into from
Oct 11, 2024

Conversation

jkrumbiegel
Copy link
Member

@jkrumbiegel jkrumbiegel commented Oct 10, 2024

This PR adds only the necessary changes from #3882 to the recent GLMakie relocatability PR #4461. I confirmed locally that this allows to compile a relocatable WGLMakie app using the script that @SimonDanisch introduced in #4461

After both #4461 and this are merged, we can update #4288 so that CI tests CairoMakie and WGLMakie for relocatability as well. Last status there was that I had gotten it to work for CairoMakie but WGLMakie got stuck in CI, probably due to an incorrect setup with xvfb or Electron or so. As I tested locally that it can work, this should not be a fundamental issue.

@jkrumbiegel jkrumbiegel added the skip-changelog Skips changelog enforcer label Oct 10, 2024
@bjarthur
Copy link
Contributor

do your tests cover font handling? i had trouble relocating without the explicit conversion to String when dealing with FreeTypeAbstractions. please consider as necessary the changes i proposed in src/conversions.jl.

@jkrumbiegel
Copy link
Member Author

do your tests cover font handling? i had trouble relocating without the explicit conversion to String

As mentioned in that other PRs comments, I think that was a side effect of the incorrect use of @path

Base automatically changed from sd/relocatable to master October 10, 2024 14:24
@MakieBot
Copy link
Collaborator

MakieBot commented Oct 11, 2024

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 5.17s (5.13, 5.20) 0.03+- 114.94ms (111.22, 122.16) 4.72+- 423.01ms (417.75, 430.33) 5.28+- 9.62ms (9.43, 9.73) 0.09+- 26.27ms (26.18, 26.34) 0.05+-
master 5.15s (5.11, 5.20) 0.03+- 112.31ms (110.50, 114.02) 1.21+- 421.22ms (416.68, 431.72) 5.45+- 9.54ms (9.36, 9.65) 0.09+- 26.21ms (25.98, 26.34) 0.12+-
evaluation 1.00x invariant, 0.01s (0.38d, 0.49p, 0.03std) 0.98x invariant, 2.63ms (0.76d, 0.20p, 2.96std) 1.00x invariant, 1.79ms (0.33d, 0.54p, 5.36std) 0.99x invariant, 0.09ms (0.93d, 0.11p, 0.09std) 1.00x invariant, 0.06ms (0.64d, 0.26p, 0.09std)
CairoMakie 4.89s (4.82, 4.98) 0.05+- 110.28ms (108.57, 112.91) 1.41+- 167.20ms (166.12, 169.55) 1.23+- 9.43ms (9.19, 9.67) 0.20+- 1.18ms (1.14, 1.23) 0.04+-
master 4.87s (4.82, 4.96) 0.05+- 110.65ms (108.66, 114.78) 2.19+- 167.91ms (165.69, 172.05) 2.68+- 9.30ms (9.17, 9.46) 0.13+- 1.18ms (1.14, 1.25) 0.04+-
evaluation 1.00x invariant, 0.02s (0.34d, 0.54p, 0.05std) 1.00x invariant, -0.38ms (-0.20d, 0.71p, 1.80std) 1.00x invariant, -0.71ms (-0.34d, 0.54p, 1.95std) 0.99x invariant, 0.13ms (0.78d, 0.18p, 0.16std) 1.00x invariant, 0.0ms (0.11d, 0.84p, 0.04std)
WGLMakie 5.76s (5.67, 5.83) 0.07+- 114.06ms (109.31, 119.96) 3.98+- 4.88s (4.75, 5.07) 0.11+- 12.69ms (12.23, 13.00) 0.26+- 118.77ms (111.59, 125.74) 4.60+-
master 5.68s (5.42, 5.87) 0.16+- 115.85ms (107.90, 137.16) 10.50+- 5.13s (4.89, 5.52) 0.22+- 12.19ms (11.53, 13.87) 0.87+- 119.05ms (116.17, 121.88) 1.80+-
evaluation 0.99x invariant, 0.08s (0.65d, 0.26p, 0.11std) 1.02x invariant, -1.79ms (-0.23d, 0.68p, 7.24std) 1.05x faster✅, -0.25s (-1.44d, 0.03p, 0.16std) 0.96x invariant, 0.5ms (0.78d, 0.19p, 0.57std) 1.00x invariant, -0.28ms (-0.08d, 0.89p, 3.20std)

@SimonDanisch SimonDanisch merged commit 842ce32 into master Oct 11, 2024
18 checks passed
@SimonDanisch SimonDanisch deleted the jk/relocatable-wglmakie branch October 11, 2024 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip-changelog Skips changelog enforcer
Projects
Status: Merged
Development

Successfully merging this pull request may close these issues.

4 participants