Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 20 additions & 10 deletions geometrycrafter/diff_ppl.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,13 @@ def encode_point_map(self, point_map_vae, disparity, valid_mask, point_map, intr
intrinsic_map = torch.norm(intrinsic_map[:, 2:4], p=2, dim=1, keepdim=False)

for i in range(0, T, chunk_size):
latent_dist = self.vae.encode(psedo_image[i : i + chunk_size].to(self.vae.dtype)).latent_dist
latent_dist = self.vae.encode(psedo_image[i : i + chunk_size].to("cuda", self.vae.dtype)).latent_dist
latent_dist = point_map_vae.encode(
torch.cat([
intrinsic_map[i:i+chunk_size, None],
point_map[i:i+chunk_size, 2:3],
disparity[i:i+chunk_size, None],
valid_mask[i:i+chunk_size, None]], dim=1),
valid_mask[i:i+chunk_size, None]], dim=1).to("cuda"),
latent_dist
)
if isinstance(latent_dist, DiagonalGaussianDistribution):
Expand All @@ -179,9 +179,9 @@ def decode_point_map(self, point_map_vae, latents, chunk_size=8, force_projectio
lat,
num_frames=lat.shape[0],
)
rec_intrinsic_maps.append(rec_imap)
rec_depth_maps.append(rec_dmap)
rec_valid_masks.append(rec_vmask)
rec_intrinsic_maps.append(rec_imap.cpu())
rec_depth_maps.append(rec_dmap.cpu())
rec_valid_masks.append(rec_vmask.cpu())

rec_intrinsic_maps = torch.cat(rec_intrinsic_maps, dim=0)
rec_depth_maps = torch.cat(rec_depth_maps, dim=0)
Expand Down Expand Up @@ -318,6 +318,13 @@ def __call__(
video = video * 2.0 - 1.0 # [0,1] -> [-1,1], in [t, c, h, w]

video_embeddings = self.encode_video(video, chunk_size=decode_chunk_size).unsqueeze(0)

video_latents = self.encode_vae_video(
video.to(self.vae.dtype),
chunk_size=decode_chunk_size,
).unsqueeze(0).to(video_embeddings.dtype) # [1, t, c, h, w]

del video
prior_latents = self.encode_point_map(
point_map_vae,
pred_disparity,
Expand All @@ -336,10 +343,7 @@ def __call__(
if needs_upcasting:
self.vae.to(dtype=torch.float32)

video_latents = self.encode_vae_video(
video.to(self.vae.dtype),
chunk_size=decode_chunk_size,
).unsqueeze(0).to(video_embeddings.dtype) # [1, t, c, h, w]


torch.cuda.empty_cache()

Expand Down Expand Up @@ -488,7 +492,13 @@ def __call__(
latents_all = torch.cat([latents_all, latents[:, overlap:]], dim=1)

idx_start += stride


del latents
del prior_latents
del latent_model_input
del latents_init
del noise_pred
torch.cuda.empty_cache()
latents_all = 1 / self.vae.config.scaling_factor * latents_all.squeeze(0).to(torch.float32)

if track_time:
Expand Down
6 changes: 3 additions & 3 deletions third_party/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ def __init__(self, cache_dir):
def forward_image(self, image: torch.Tensor, **kwargs):
# image: b, 3, h, w 0,1
output = self.model.infer(image, resolution_level=9, apply_mask=False, **kwargs)
points = output['points'] # b,h,w,3
masks = output['mask'] # b,h,w
return points, masks
points = output['points'].cpu() # b,h,w,3
masks = output['mask'].cpu() # b,h,w
return points, masks