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 ticks for categorical colorbar #3762

Merged
merged 1 commit into from
Apr 29, 2024
Merged

Conversation

SimonDanisch
Copy link
Member

No description provided.

@MakieBot
Copy link
Collaborator

MakieBot commented Apr 3, 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 3.36s (3.28, 3.45) 0.05+- 167.64ms (160.48, 180.26) 7.49+- 465.28ms (456.38, 473.69) 7.28+- 7.41ms (7.20, 7.61) 0.14+- 26.02ms (25.75, 26.45) 0.23+-
master 3.35s (3.25, 3.53) 0.10+- 165.54ms (160.90, 171.80) 4.49+- 468.61ms (458.10, 486.60) 11.08+- 7.20ms (6.90, 7.41) 0.18+- 25.48ms (25.26, 25.87) 0.27+-
evaluation 0.99x invariant, 0.02s (0.21d, 0.70p, 0.08std) 0.99x invariant, 2.1ms (0.34d, 0.54p, 5.99std) 1.01x invariant, -3.32ms (-0.35d, 0.52p, 9.18std) 0.97x slower X, 0.22ms (1.36d, 0.03p, 0.16std) 0.98x slower X, 0.54ms (2.13d, 0.00p, 0.25std)
CairoMakie 3.02s (2.99, 3.08) 0.03+- 168.73ms (164.71, 173.49) 3.39+- 103.32ms (101.19, 108.16) 2.34+- 7.49ms (7.38, 7.54) 0.05+- 893.68μs (887.56, 899.99) 4.43+-
master 3.04s (2.98, 3.11) 0.05+- 172.61ms (166.19, 179.78) 4.87+- 103.30ms (102.11, 106.18) 1.43+- 7.59ms (7.49, 7.70) 0.08+- 891.16μs (885.53, 896.23) 4.07+-
evaluation 1.01x invariant, -0.02s (-0.58d, 0.30p, 0.04std) 1.02x invariant, -3.88ms (-0.92d, 0.11p, 4.13std) 1.00x invariant, 0.02ms (0.01d, 0.98p, 1.88std) 1.01x faster ✓, -0.1ms (-1.49d, 0.02p, 0.07std) 1.00x invariant, 2.52μs (0.59d, 0.29p, 4.25std)
WGLMakie 3.69s (3.64, 3.75) 0.04+- 292.40ms (166.80, 389.88) 114.90+- 8.95s (8.75, 9.12) 0.11+- 9.43ms (9.31, 9.76) 0.15+- 69.13ms (68.70, 69.45) 0.26+-
master 3.69s (3.66, 3.70) 0.01+- 174.89ms (167.95, 190.81) 7.77+- 9.11s (9.01, 9.30) 0.10+- 9.63ms (9.21, 10.71) 0.50+- 68.94ms (68.19, 69.59) 0.54+-
evaluation 1.00x invariant, 0.0s (0.00d, 1.00p, 0.03std) 0.60x slower❌, 117.5ms (1.44d, 0.04p, 61.34std) 1.02x faster ✓, -0.16s (-1.50d, 0.02p, 0.11std) 1.02x invariant, -0.2ms (-0.54d, 0.35p, 0.33std) 1.00x invariant, 0.19ms (0.45d, 0.42p, 0.40std)

@asinghvi17 asinghvi17 changed the base branch from master to v0.20.10 April 29, 2024 14:20
@asinghvi17 asinghvi17 merged commit 3a356ed into v0.20.10 Apr 29, 2024
17 of 18 checks passed
@asinghvi17 asinghvi17 deleted the sd/fix-cat-colorbar branch April 29, 2024 14:21
asinghvi17 added a commit to asinghvi17/Makie.jl that referenced this pull request Apr 29, 2024
SimonDanisch added a commit that referenced this pull request May 6, 2024
* Upgrade to DelaunayTriangulation v1.0 (#3787)

* Upgrade to DelaunayTriangulation v1.0

* Updates for DelaunayTriangulation v1.0

* changelog

* Allow Cairo scatter marker conversion to be overridden (#3811)

* Define cairo_scatter_marker api

* Bump CairoMakie version

* Implement cairo_scatter_marker API for scatter and meshscatter

* Add to changelog

* MeshScatter conversion is different, don't implement

* fix ticks for categorical colorbar (#3762)

* Update tricontourf.md in 0.20.10 branch (#3828)

Update tricontourf.md

* fix docs

---------

Co-authored-by: Daniel VandenHeuvel <95613936+DanielVandH@users.noreply.github.com>
Co-authored-by: Simon <sdanisch@protonmail.com>
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.

None yet

3 participants