From 152586bd43a92c34309daf42b83be8560ff4f8cb Mon Sep 17 00:00:00 2001 From: Adam Paszke Date: Thu, 5 Mar 2020 13:37:36 +0100 Subject: [PATCH] Optimize Poly3DCollection.get_vector for ndarray arguments This adds some extra code-paths, which take advantage of the fact that the input polygons have the same number of vertices and are already in a NumPy array. --- lib/mpl_toolkits/mplot3d/art3d.py | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py index 76bdf35b0657..8b88134e220b 100644 --- a/lib/mpl_toolkits/mplot3d/art3d.py +++ b/lib/mpl_toolkits/mplot3d/art3d.py @@ -578,13 +578,28 @@ def set_zsort(self, zsort): def get_vector(self, segments3d): """Optimize points for projection.""" if len(segments3d): - xs, ys, zs = np.row_stack(segments3d).T + # row_stack would split and re-concatenate all rows, and so it's + # much faster to reshape if the data is already in the right format + if isinstance(segments3d, np.ndarray): + segments3d_t = segments3d.reshape(-1, segments3d.shape[-1]).T + else: + segments3d_t = np.row_stack(segments3d).T + ones = np.broadcast_to(np.ones((1,), dtype=segments3d_t.dtype), + shape=(1, segments3d_t.shape[-1],)) + self._vec = np.concatenate((segments3d_t, ones), axis=0) else: # row_stack can't stack zero arrays. - xs, ys, zs = [], [], [] - ones = np.ones(len(xs)) - self._vec = np.array([xs, ys, zs, ones]) - - indices = [0, *np.cumsum([len(segment) for segment in segments3d])] + self._vec = np.ndarray(shape=(0, 4)) + + # range is much faster than np.cumsum with a list argument, so we + # use it whenever the faces have a constant number of vertices. + if isinstance(segments3d, np.ndarray): + face_vertices = segments3d.shape[1] + segment_ends = range(face_vertices, + face_vertices * len(segments3d) + 1, + face_vertices) + else: + segment_ends = np.cumsum([len(segment) for segment in segments3d]) + indices = [0, *segment_ends] self._segslices = [*map(slice, indices[:-1], indices[1:])] def set_verts(self, verts, closed=True): pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy