Skip to content

BUG: avoid soon-to-be-deprecated direct mutations of ndarray.shape attributes (2/2) #5309

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+67 −104
Open

BUG: avoid soon-to-be-deprecated direct mutations of ndarray.shape attributes (2/2) #5309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 27 additions & 38 deletions yt/visualization/volume_rendering/lens.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,13 +341,13 @@ def _get_sampler_params(self, camera, render_source):

uv = np.ones(3, dtype="float64")

image = self.new_image(camera)
vectors_comb = uvstack([vectors_left, vectors_right])
positions_comb = uvstack([positions_left, positions_right])

image.shape = (camera.resolution[0], camera.resolution[1], 4)
vectors_comb.shape = (camera.resolution[0], camera.resolution[1], 3)
positions_comb.shape = (camera.resolution[0], camera.resolution[1], 3)
image = self.new_image(camera).reshape(*camera.resolution, 4)
vectors_comb = uvstack([vectors_left, vectors_right]).reshape(
*camera.resolution, 3
)
positions_comb = uvstack([positions_left, positions_right]).reshape(
*camera.resolution, 3
)

sampler_params = {
"vp_pos": positions_comb,
Expand Down Expand Up @@ -549,15 +549,12 @@ def new_image(self, camera):
return self.current_image

def _get_sampler_params(self, camera, render_source):
vp = -arr_fisheye_vectors(camera.resolution[0], self.fov)
vp.shape = (camera.resolution[0], camera.resolution[0], 3)
shape = (camera.resolution[0], camera.resolution[0], 3)
vp = -arr_fisheye_vectors(camera.resolution[0], self.fov).reshape(shape)
vp = vp.dot(np.linalg.inv(self.rotation_matrix))
vp *= self.radius
uv = np.ones(3, dtype="float64")
positions = (
np.ones((camera.resolution[0], camera.resolution[0], 3), dtype="float64")
* camera.position
)
positions = np.full(shape, camera.position, dtype="float64")

if render_source.zbuffer is not None:
image = render_source.zbuffer.rgba
Expand Down Expand Up @@ -652,9 +649,16 @@ def _get_sampler_params(self, camera, render_source):
-np.pi / 2.0, np.pi / 2.0, camera.resolution[1], endpoint=True
)[None, :]

vectors = np.zeros(
(camera.resolution[0], camera.resolution[1], 3), dtype="float64", order="C"
positions = np.tile(camera.position, np.prod(camera.resolution)).reshape(
*camera.resolution, 3
)

R1 = get_rotation_matrix(0.5 * np.pi, [1, 0, 0])
R2 = get_rotation_matrix(0.5 * np.pi, [0, 0, 1])
uv = np.dot(R1, camera.unit_vectors)
uv = np.dot(R2, uv)

vectors = np.empty((*camera.resolution, 3), dtype="float64", order="C")
vectors[:, :, 0] = np.cos(px) * np.cos(py)
vectors[:, :, 1] = np.sin(px) * np.cos(py)
vectors[:, :, 2] = np.sin(py)
Expand All @@ -663,30 +667,15 @@ def _get_sampler_params(self, camera, render_source):
max_length = unorm(camera.position - camera._domain_center) + 0.5 * unorm(
camera._domain_width
)
# Rescale the ray to be long enough to cover the entire domain
vectors = vectors * max_length

positions = np.tile(
camera.position, camera.resolution[0] * camera.resolution[1]
).reshape(camera.resolution[0], camera.resolution[1], 3)

R1 = get_rotation_matrix(0.5 * np.pi, [1, 0, 0])
R2 = get_rotation_matrix(0.5 * np.pi, [0, 0, 1])
uv = np.dot(R1, camera.unit_vectors)
uv = np.dot(R2, uv)
vectors.reshape((camera.resolution[0] * camera.resolution[1], 3))
vectors = np.dot(vectors, uv)
vectors.reshape((camera.resolution[0], camera.resolution[1], 3))
vectors = np.dot((vectors * max_length), uv).reshape(*camera.resolution, 3)

if render_source.zbuffer is not None:
image = render_source.zbuffer.rgba
else:
image = self.new_image(camera)

image = image.reshape(*camera.resolution, 4)
dummy = np.ones(3, dtype="float64")
image.shape = (camera.resolution[0], camera.resolution[1], 4)
vectors.shape = (camera.resolution[0], camera.resolution[1], 3)
positions.shape = (camera.resolution[0], camera.resolution[1], 3)

sampler_params = {
"vp_pos": positions,
Expand Down Expand Up @@ -816,14 +805,14 @@ def _get_sampler_params(self, camera, render_source):
else:
image = self.new_image(camera)

dummy = np.ones(3, dtype="float64")
image = image.reshape(*camera.resolution, 4)

vectors_comb = uhstack([vectors, vectors])
positions_comb = uhstack([positions_left, positions_right])
dummy = np.ones(3, dtype="float64")

image.shape = (camera.resolution[0], camera.resolution[1], 4)
vectors_comb.shape = (camera.resolution[0], camera.resolution[1], 3)
positions_comb.shape = (camera.resolution[0], camera.resolution[1], 3)
vectors_comb = uhstack([vectors, vectors]).reshape(*camera.resolution, 3)
positions_comb = uhstack([positions_left, positions_right]).reshape(
*camera.resolution, 3
)

sampler_params = {
"vp_pos": positions_comb,
Expand Down
97 changes: 35 additions & 62 deletions yt/visualization/volume_rendering/old_camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,9 +720,7 @@ def _render(self, double_check, num_threads, image, sampler):
pbar.update(total_cells)

pbar.finish()
image = sampler.aimage
image = self.finalize_image(image)
return image
return self.finalize_image(sampler.aimage)

def _pyplot(self):
from matplotlib import pyplot
Expand Down Expand Up @@ -1318,26 +1316,22 @@ def get_sampler_args(self, image):
sample_y.reshape(1, self.resolution[1], 3), self.resolution[0], axis=0
)

normal_vec = np.zeros(
(self.resolution[0], self.resolution[1], 3), dtype="float64", order="C"
)
normal_vec = np.empty((*self.resolution, 3), dtype="float64", order="C")
normal_vec[:, :, 0] = self.orienter.unit_vectors[2, 0]
normal_vec[:, :, 1] = self.orienter.unit_vectors[2, 1]
normal_vec[:, :, 2] = self.orienter.unit_vectors[2, 2]

vectors = sample_x + sample_y + normal_vec * self.width[2]

positions = np.zeros(
(self.resolution[0], self.resolution[1], 3), dtype="float64", order="C"
)
positions = np.empty((*self.resolution, 3), dtype="float64", order="C")
positions[:, :, 0] = self.center[0]
positions[:, :, 1] = self.center[1]
positions[:, :, 2] = self.center[2]

positions = self.ds.arr(positions, units="code_length")

dummy = np.ones(3, dtype="float64")
image.shape = (self.resolution[0], self.resolution[1], 4)
image = image.reshape(*self.resolution, 4)

args = (
positions,
Expand Down Expand Up @@ -1373,13 +1367,13 @@ def _render(self, double_check, num_threads, image, sampler):
pbar.update(total_cells)

pbar.finish()
image = self.finalize_image(sampler.aimage)
return image
return self.finalize_image(sampler.aimage)

def finalize_image(self, image):
view_pos = self.front_center
image.shape = self.resolution[0], self.resolution[1], 4
image = self.volume.reduce_tree_images(image, view_pos)
image = self.volume.reduce_tree_images(
image.reshape(*self.resolution, 4), view_pos
)
if not self.transfer_function.grey_opacity:
image[:, :, 3] = 1.0
return image
Expand Down Expand Up @@ -1498,8 +1492,7 @@ def new_image(self):

def get_sampler_args(self, image):
nv = 12 * self.nside**2
vs = arr_pix2vec_nest(self.nside, np.arange(nv))
vs.shape = (nv, 1, 3)
vs = arr_pix2vec_nest(self.nside, np.arange(nv)).reshape(nv, 1, 3)
vs += 1e-8
uv = np.ones(3, dtype="float64")
positions = np.ones((nv, 1, 3), dtype="float64") * self.center
Expand Down Expand Up @@ -1541,16 +1534,10 @@ def _render(self, double_check, num_threads, image, sampler):
pbar.update(total_cells)

pbar.finish()
image = sampler.aimage

self.finalize_image(image)

return image
return self.finalize_image(sampler.aimage)

def finalize_image(self, image):
view_pos = self.center
image = self.volume.reduce_tree_images(image, view_pos)
return image
return self.volume.reduce_tree_images(image, self.center)

def get_information(self):
info_dict = {
Expand Down Expand Up @@ -1718,8 +1705,9 @@ def new_image(self):
return image

def get_sampler_args(self, image):
vp = arr_fisheye_vectors(self.resolution, self.fov)
vp.shape = (self.resolution**2, 1, 3)
vp = arr_fisheye_vectors(self.resolution, self.fov).reshape(
self.resolution**2, 1, 3
)
vp2 = vp.copy()
for i in range(3):
vp[:, :, i] = (vp2 * self.rotation_matrix[:, i]).sum(axis=2)
Expand All @@ -1744,7 +1732,7 @@ def get_sampler_args(self, image):
return args, {}

def finalize_image(self, image):
image.shape = self.resolution, self.resolution, 4
return image.reshape(self.resolution, self.resolution, 4)

def _render(self, double_check, num_threads, image, sampler):
pbar = get_pbar(
Expand All @@ -1764,11 +1752,7 @@ def _render(self, double_check, num_threads, image, sampler):
pbar.update(total_cells)

pbar.finish()
image = sampler.aimage

self.finalize_image(image)

return image
return self.finalize_image(sampler.aimage)


class MosaicCamera(Camera):
Expand Down Expand Up @@ -2191,8 +2175,7 @@ def _render(self, double_check, num_threads, image, sampler):
grid.clear_data()
sampler(pg, num_threads=num_threads)

image = self.finalize_image(sampler.aimage)
return image
return self.finalize_image(sampler.aimage)

def save_image(self, image, fn=None, clip_ratio=None):
dd = self.ds.all_data()
Expand Down Expand Up @@ -2248,9 +2231,7 @@ def get_sampler_args(self, image):
None, :
]

vectors = np.zeros(
(self.resolution[0], self.resolution[1], 3), dtype="float64", order="C"
)
vectors = np.empty((*self.resolution, 3), dtype="float64", order="C")
vectors[:, :, 0] = np.cos(px) * np.cos(py)
vectors[:, :, 1] = np.sin(px) * np.cos(py)
vectors[:, :, 2] = np.sin(py)
Expand All @@ -2261,14 +2242,13 @@ def get_sampler_args(self, image):
R2 = get_rotation_matrix(0.5 * np.pi, [0, 0, 1])
uv = np.dot(R1, self.orienter.unit_vectors)
uv = np.dot(R2, uv)
vectors.reshape((self.resolution[0] * self.resolution[1], 3))
vectors = np.dot(vectors, uv)
vectors.reshape((self.resolution[0], self.resolution[1], 3))

dummy = np.ones(3, dtype="float64")
image.shape = (self.resolution[0] * self.resolution[1], 1, 4)
vectors.shape = (self.resolution[0] * self.resolution[1], 1, 3)
positions.shape = (self.resolution[0] * self.resolution[1], 1, 3)
size = np.prod(self.resolution)
image = image.reshape(*size, 1, 4)
vectors = vectors.reshape(size, 1, 3)
positions = positions.reshape(size, 1, 3)
args = (
positions,
vectors,
Expand Down Expand Up @@ -2299,17 +2279,16 @@ def _render(self, double_check, num_threads, image, sampler):
pbar.update(total_cells)

pbar.finish()
image = self.finalize_image(sampler.aimage)
return image
return self.finalize_image(sampler.aimage)

def finalize_image(self, image):
view_pos = self.front_center
image.shape = self.resolution[0], self.resolution[1], 4
image = self.volume.reduce_tree_images(image, view_pos)
image = self.volume.reduce_tree_images(
image.reshape(*self.resolution, 4), view_pos
)
if not self.transfer_function.grey_opacity:
image[:, :, 3] = 1.0
image = image[1:-1, 1:-1, :]
return image
return image[1:-1, 1:-1, :]


data_object_registry["spherical_camera"] = SphericalCamera
Expand Down Expand Up @@ -2337,33 +2316,28 @@ def get_sampler_args(self, image):
None, :
]

vectors = np.zeros(
(self.resolution[0], self.resolution[1], 3), dtype="float64", order="C"
)
vectors = np.empty((*self.resolution, 3), dtype="float64", order="C")
vectors[:, :, 0] = np.cos(px) * np.cos(py)
vectors[:, :, 1] = np.sin(px) * np.cos(py)
vectors[:, :, 2] = np.sin(py)
vectors2 = np.zeros(
(self.resolution[0], self.resolution[1], 3), dtype="float64", order="C"
)
vectors2 = np.empty((*self.resolution, 3), dtype="float64", order="C")
vectors2[:, :, 0] = -np.sin(px) * np.ones((1, self.resolution[1]))
vectors2[:, :, 1] = np.cos(px) * np.ones((1, self.resolution[1]))
vectors2[:, :, 2] = 0

positions = self.center + vectors2 * self.disparity_s
vectors = vectors * self.width[0]
vectors *= self.width[0]
R1 = get_rotation_matrix(0.5 * np.pi, [1, 0, 0])
R2 = get_rotation_matrix(0.5 * np.pi, [0, 0, 1])
uv = np.dot(R1, self.orienter.unit_vectors)
uv = np.dot(R2, uv)
vectors.reshape((self.resolution[0] * self.resolution[1], 3))
vectors = np.dot(vectors, uv)
vectors.reshape((self.resolution[0], self.resolution[1], 3))

dummy = np.ones(3, dtype="float64")
image.shape = (self.resolution[0] * self.resolution[1], 1, 4)
vectors.shape = (self.resolution[0] * self.resolution[1], 1, 3)
positions.shape = (self.resolution[0] * self.resolution[1], 1, 3)
size = np.prod(self.resolution)
image = image.reshape(size, 1, 4)
vectors = vectors.reshape(size, 1, 3)
positions = positions.reshape(size, 1, 3)
args = (
positions,
vectors,
Expand Down Expand Up @@ -2428,8 +2402,7 @@ def _render(self, double_check, num_threads, image, sampler, msg):

pbar.finish()

image = sampler.aimage.copy()
image.shape = self.resolution[0], self.resolution[1], 4
image = sampler.aimage.copy().reshape(*self.resolution, 4)
if not self.transfer_function.grey_opacity:
image[:, :, 3] = 1.0
image = image[1:-1, 1:-1, :]
Expand Down
9 changes: 5 additions & 4 deletions yt/visualization/volume_rendering/render_source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ def finalize_image(self, camera, image):
image: :class:`yt.data_objects.image_array.ImageArray` instance
A reference to an image to fill
"""
image.shape = camera.resolution[0], camera.resolution[1], 4
image = image.reshape(*camera.resolution, 4)
# If the call is from VR, the image is rotated by 180 to get correct
# up direction
if not self.transfer_function.grey_opacity:
Expand Down Expand Up @@ -1295,10 +1295,11 @@ def __init__(self, left_edge, right_edge, color=None):
assert right_edge.shape == (3,)

if color is None:
color = np.array([1.0, 1.0, 1.0, 1.0])
color = np.array([[1.0, 1.0, 1.0, 1.0]])
else:
color = np.atleast_2d(ensure_numpy_array(color))
assert color.shape == (1, 4)

color = ensure_numpy_array(color)
color.shape = (1, 4)
corners = get_corners(left_edge.copy(), right_edge.copy())
order = [0, 1, 1, 2, 2, 3, 3, 0]
order += [4, 5, 5, 6, 6, 7, 7, 4]
Expand Down
Loading