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 updates for multiple meshes #2277

Merged
merged 6 commits into from
Sep 16, 2022
Merged

fix updates for multiple meshes #2277

merged 6 commits into from
Sep 16, 2022

Conversation

SimonDanisch
Copy link
Member

Should fix #2200

@jkrumbiegel
Copy link
Member

This still doesn't work, but for a different reason:

d = Observable([sin(x) * cos(y) for x in 1:10, y in 1:10])
x = Observable(1:10)
y = Observable(1:10)
f, ax, con = contourf(x, y, d)

##

x.val = 1:20
y.val = 1:20
d[] = randn(20, 20)

@MakieBot
Copy link
Collaborator

MakieBot commented Sep 15, 2022

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(display(fig))
using create display create display
GLMakie 15.76s (15.55, 16.53) 0.34+- 18.28s (17.94, 19.53) 0.55+- 16.67s (16.44, 17.63) 0.42+- 15.84ms (15.63, 16.01) 0.16+- 80.07ms (78.72, 81.33) 0.83+-
master 16.01s (15.56, 17.70) 0.76+- 18.40s (18.05, 19.94) 0.68+- 16.69s (16.43, 17.97) 0.56+- 16.05ms (15.82, 17.11) 0.47+- 80.57ms (78.61, 86.62) 2.71+-
evaluation -1.57%, -0.25s invariant (-0.42d, 0.45p, 0.55std) -0.68%, -0.12s invariant (-0.20d, 0.72p, 0.62std) -0.12%, -0.02s invariant (-0.04d, 0.94p, 0.49std) -1.37%, -0.22ms invariant (-0.62d, 0.28p, 0.31std) -0.63%, -0.51ms invariant (-0.25d, 0.65p, 1.77std)
CairoMakie 17.28s (16.83, 17.71) 0.33+- 25.32s (24.16, 26.38) 0.71+- 4.21s (3.99, 4.48) 0.16+- 25.61ms (24.73, 26.14) 0.55+- 31.53ms (31.03, 31.86) 0.31+-
master 16.99s (16.79, 17.27) 0.16+- 24.97s (24.47, 26.17) 0.59+- 4.08s (3.95, 4.40) 0.16+- 25.55ms (25.24, 25.82) 0.24+- 31.60ms (31.07, 32.30) 0.41+-
evaluation +1.67%, 0.29s invariant (1.12d, 0.07p, 0.24std) +1.39%, 0.35s invariant (0.54d, 0.33p, 0.65std) +2.97%, 0.12s invariant (0.79d, 0.17p, 0.16std) +0.21%, 0.05ms invariant (0.13d, 0.82p, 0.40std) -0.23%, -0.07ms invariant (-0.20d, 0.71p, 0.36std)
WGLMakie 18.91s (18.46, 19.26) 0.28+- 26.50s (26.25, 27.17) 0.32+- 42.69s (42.12, 43.59) 0.47+- 21.67ms (20.49, 23.07) 0.95+- 1.70s (1.69, 1.73) 0.02+-
master 18.92s (18.55, 19.21) 0.27+- 26.58s (26.19, 27.33) 0.37+- 42.44s (41.91, 43.58) 0.54+- 22.09ms (21.30, 23.48) 0.75+- 1.70s (1.67, 1.73) 0.02+-
evaluation -0.08%, -0.01s invariant (-0.05d, 0.92p, 0.27std) -0.27%, -0.07s invariant (-0.21d, 0.70p, 0.34std) +0.59%, 0.25s invariant (0.50d, 0.37p, 0.51std) -1.95%, -0.42ms invariant (-0.49d, 0.37p, 0.85std) +0.28%, 0.0s invariant (0.22d, 0.68p, 0.02std)

@SimonDanisch
Copy link
Member Author

I donnt think we can fix that right now, without a different approach in the conversion pipeline...

@jkrumbiegel
Copy link
Member

No? The exact same code does work if you use image instead of contourf. There's just something not updating correctly

@SimonDanisch
Copy link
Member Author

That's because Image doesn't care if dimensions don't match:

image(1:4, 1:20, rand(5, 7))

The image is interpolated to whatever rect x/y span...

@jkrumbiegel
Copy link
Member

jkrumbiegel commented Sep 15, 2022

And heatmap?

That's pretty bad for image, by the way :D

@github-actions
Copy link
Contributor

Missing reference images

Found 12 new images without existing references.
Upload new reference images before merging this PR.

@github-actions
Copy link
Contributor

Missing reference images

Found 12 new images without existing references.
Upload new reference images before merging this PR.

@SimonDanisch SimonDanisch reopened this Sep 16, 2022
@SimonDanisch SimonDanisch merged commit 1e50cba into master Sep 16, 2022
@SimonDanisch SimonDanisch deleted the sd/fix-contourf branch September 16, 2022 12:49
@Boxylmer
Copy link

You guys are awesome! Thanks for taking the time to look around at it!

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.

Metadata length mismatch when using contourf! on an observable.
4 participants