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 highclip/lowclip in meshscatter, poly, contourf, barplot #2183

Merged
merged 22 commits into from Aug 3, 2022

Conversation

SimonDanisch
Copy link
Member

@SimonDanisch SimonDanisch commented Jul 26, 2022

Continuation of #2175
with:

  1. improvements from use lightweight GeometryBasics #2056, so that high/low clip doesn't need to be handled in recipe
  2. overload convert_arguments for single geometries, to not dispatch them to the multi mesh recipes (it seems like that was the case for all these years, which should have made poly(Rect(...)) unnecessarily slow)
  3. added a test for low/high clip
  4. fix low/highclip tri visibity for Colorbar

@jkrumbiegel
Copy link
Collaborator

Can you check if this also fixes contourf high/low clip? That was broken by some refactor using integers for colors a while ago

@jkrumbiegel
Copy link
Collaborator

And if so, a test for that would ideally be added as well. There's an example in the docs for contourf which you can use, it's currently broken

@github-actions
Copy link
Contributor

Missing reference images

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

@MakieBot
Copy link
Collaborator

MakieBot commented Jul 26, 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.33s (15.18, 15.49) 0.12+- 20.62s (20.26, 20.91) 0.22+- 16.91s (16.58, 17.17) 0.21+- 17.03ms (16.61, 17.39) 0.27+- 84.87ms (83.94, 86.09) 0.85+-
master 15.21s (15.09, 15.32) 0.08+- 20.72s (20.55, 20.90) 0.13+- 17.77s (17.56, 17.97) 0.15+- 16.84ms (16.70, 16.95) 0.10+- 85.67ms (84.12, 87.56) 1.15+-
evaluation +0.77%, 0.12s invariant (1.14d, 0.06p, 0.10std) -0.47%, -0.1s invariant (-0.54d, 0.34p, 0.18std) -5.10%, -0.86s faster✅ (-4.71d, 0.00p, 0.18std) +1.11%, 0.19ms invariant (0.93d, 0.12p, 0.19std) -0.94%, -0.8ms invariant (-0.79d, 0.17p, 1.00std)
CairoMakie 12.01s (11.87, 12.11) 0.08+- 20.09s (19.95, 20.19) 0.09+- 2.49s (2.47, 2.52) 0.02+- 16.78ms (16.54, 17.09) 0.17+- 25.23ms (25.09, 25.51) 0.15+-
master 11.98s (11.89, 12.07) 0.07+- 20.38s (20.25, 20.59) 0.11+- 2.51s (2.49, 2.52) 0.01+- 16.80ms (16.40, 16.97) 0.19+- 25.23ms (25.12, 25.45) 0.11+-
evaluation +0.24%, 0.03s invariant (0.40d, 0.47p, 0.07std) -1.46%, -0.29s faster ✓ (-2.98d, 0.00p, 0.10std) -0.78%, -0.02s faster ✓ (-1.31d, 0.03p, 0.01std) -0.14%, -0.02ms invariant (-0.13d, 0.82p, 0.18std) +0.01%, 0.0ms invariant (0.02d, 0.97p, 0.13std)
WGLMakie 21.55s (21.04, 21.90) 0.30+- 42.54s (40.94, 43.47) 1.01+- 59.18s (56.66, 60.90) 1.62+- 31.06ms (30.02, 31.84) 0.67+- 2.00s (1.94, 2.06) 0.04+-
master 21.88s (21.13, 22.79) 0.58+- 43.95s (42.37, 45.67) 1.30+- 59.47s (56.84, 61.15) 1.36+- 30.15ms (29.33, 31.04) 0.57+- 2.01s (1.95, 2.07) 0.04+-
evaluation -1.53%, -0.33s invariant (-0.71d, 0.21p, 0.44std) -3.30%, -1.4s faster ✓ (-1.21d, 0.04p, 1.15std) -0.49%, -0.29s invariant (-0.19d, 0.72p, 1.49std) +2.93%, 0.91ms slower X (1.47d, 0.02p, 0.62std) -0.70%, -0.01s invariant (-0.34d, 0.54p, 0.04std)

@github-actions
Copy link
Contributor

Missing reference images

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

@github-actions
Copy link
Contributor

Missing reference images

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

@github-actions
Copy link
Contributor

Missing reference images

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

@SimonDanisch SimonDanisch changed the title Cristobaltapia feat 2156 additional kws to poly Fix highclip/lowclip in meshscatter, poly, contourf, barplot Jul 27, 2022
@github-actions
Copy link
Contributor

Missing reference images

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

@github-actions
Copy link
Contributor

Missing reference images

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

@github-actions
Copy link
Contributor

Missing reference images

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

@github-actions
Copy link
Contributor

Missing reference images

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

@github-actions
Copy link
Contributor

Missing reference images

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

@github-actions
Copy link
Contributor

Missing reference images

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

@github-actions
Copy link
Contributor

Missing reference images

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

@github-actions
Copy link
Contributor

Missing reference images

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

@SimonDanisch SimonDanisch merged commit 1631127 into master Aug 3, 2022
@SimonDanisch SimonDanisch deleted the cristobaltapia-feat_2156_additional_kws_to_poly branch August 3, 2022 14:28
@jkrumbiegel jkrumbiegel linked an issue Aug 4, 2022 that may be closed by this pull request
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.

Contourf extendhigh/low is broken
4 participants