') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); WIP: Typed array encoding in supplyDefaults with Caching by jonmmease · Pull Request #5308 · plotly/plotly.js · GitHub
Skip to content

WIP: Typed array encoding in supplyDefaults with Caching - #5308

Merged
archmoj merged 9 commits into
handle-coded-typed-arraysfrom
jonmmease_typed_array_encoding
Nov 29, 2020
Merged

WIP: Typed array encoding in supplyDefaults with Caching#5308
archmoj merged 9 commits into
handle-coded-typed-arraysfrom
jonmmease_typed_array_encoding

Conversation

@jonmmease

@jonmmeasejonmmease commented Nov 28, 2020

Copy link
Copy Markdown
Contributor

Overview

This PR builds off of #5230, with a candidate solution to the problem outlined in #5230 (comment).

Architecture Details

The approach is to perform the typed array decoding in coerce (before the supplyDefaults logic in the layout and traces). This has the advantage that none of the supply defaults or calc logic needs to be aware of the typed array specification objects.

For performance, the ArrayBuffer instances resulting from the decoding process are cached by trace uid and property name. To keep cache bounded, only one ArrayBuffer is cached per trace per property. Playing with the isosurface example in #5230, building the typed array with this caching approach is about 10x faster than when performing the base64 decoding.

Implementation Details

This PR handles decoding N-dimensional arrays into a nested collection of Arrays. The inner most layer contains TypedArrays that are backed by the original decoded ArrayBuffer, so no copying is performed. So far, all the 2D traces I've played with have worked fine with this nesting arrangement.

More testing is needed, but hopefully nothing in supplyDefaults or calc or rendering will need to change in any of the traces (apart from potential bug fixes for TypedArray handling).

@jonmmease
jonmmease marked this pull request as draft November 28, 2020 19:46
archmoj
archmoj reviewed Nov 28, 2020
View reviewed changes
Comment threadsrc/lib/array.js

// Normalize shape to a list
if(Number.isInteger(v.shape)) {
coerced.shape = [v.shape];

@archmojarchmojNov 28, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we possibly support numeric strings here as well?

archmoj
archmoj reviewed Nov 28, 2020
View reviewed changes
Comment threadsrc/lib/array.js
if(Number.isInteger(v.shape)) {
coerced.shape = [v.shape];
} else {
coerced.shape = v.shape;

@archmojarchmojNov 28, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be a good idea to drop this array support for shape attribute; while it cannot be a typedArray itself.
In that case for n dimensional arrays one could pass an string containing comma (or X) separated integers.

@jonmmeasejonmmeaseNov 28, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the moment, I am using the shape to build a multi-dimensional array when the length is more than 1. Only the inner most layer of the multi-dimensional array is made up of typed arrays, but I pretty sure it'll be a lot better than nothing.

@jonmmease
Revert "bvals -> buffer"
1043827
This reverts commit 5079fc7
@jonmmease
Run isArray1D on decoded array not spec
8d84f3e
@jonmmease
Plotly.js doesn't currently handle BigInt64/BigUint64 arrays.
2381deb
The fact that elements aren't regular numbers, and aren't compatible with
the Math module functions would make this challenging.
@archmoj

archmoj commented Nov 29, 2020

Copy link
Copy Markdown
Contributor

Instead of targeting master, could you possibly open a PR to merge your work into #5230 branch. That would help us test and dev this.
Thank you!

@jonmmease
jonmmease changed the base branch from master to handle-coded-typed-arraysNovember 29, 2020 20:01
@jonmmease

jonmmease commented Nov 29, 2020

Copy link
Copy Markdown
ContributorAuthor

Base should be updated now. Thanks!

@archmoj

archmoj commented Nov 29, 2020

Copy link
Copy Markdown
Contributor

💃

@archmoj
archmoj marked this pull request as ready for review November 29, 2020 20:10
@archmoj
archmoj merged commit a0d980e into handle-coded-typed-arraysNov 29, 2020
@archmoj
archmoj deleted the jonmmease_typed_array_encoding branch November 29, 2020 20:11
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@archmojarchmojarchmoj left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

featuresomething new

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jonmmease@archmoj