Skip to content

Remove --align-crop stereo auto-alignment feature #36

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
disk02 wants to merge 1 commit into
base: Feature-Mixed-Precision
Choose a base branch
from
Open

Remove --align-crop stereo auto-alignment feature #36

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
10 changes: 0 additions & 10 deletions src/sharp/cli/predict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,12 +351,6 @@ def resolve_focal_length_mm(
show_default=True,
help="Score used to pick top-K SBS splats (opacity or opacity_scale). Only used with --sbs-image.",
)
@click.option(
"--align-crop",
is_flag=True,
default=False,
help="If set, auto-align and auto-crop the SBS stereo pair before saving the SBS image.",
)
@click.option(
"--fast-preview-compare",
is_flag=True,
Expand Down Expand Up @@ -439,7 +433,6 @@ def predict_cli(
sbs_min_scale: float,
sbs_max_splats: int | None,
sbs_prune_score: str,
align_crop: bool,
fast_preview_compare: bool,
save_ply: bool | None,
skip_world_conversion: bool,
Expand Down Expand Up @@ -715,7 +708,6 @@ def _finalize_prediction(
sbs_image_format=effective_sbs_format,
sbs_jpeg_quality=sbs_jpeg_quality,
sbs_image_frame=sbs_image_frame,
align_crop=align_crop,
metrics=metrics,
sbs_async_writer=None,
stereo_baseline=stereo_strength,
Expand All @@ -736,7 +728,6 @@ def _finalize_prediction(
sbs_image_format=effective_sbs_format,
sbs_jpeg_quality=sbs_jpeg_quality,
sbs_image_frame=sbs_image_frame,
align_crop=align_crop,
metrics=metrics,
sbs_async_writer=None if fast_preview_compare else sbs_async_writer,
stereo_baseline=stereo_strength,
Expand Down Expand Up @@ -778,7 +769,6 @@ def _finalize_prediction(
sbs_image_format=effective_sbs_format,
sbs_jpeg_quality=sbs_jpeg_quality,
sbs_image_frame=sbs_image_frame,
align_crop=align_crop,
metrics=metrics,
sbs_async_writer=sbs_async_writer,
stereo_baseline=stereo_strength,
Expand Down
33 changes: 2 additions & 31 deletions src/sharp/rendering/gaussian_renderer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,9 @@ def _save_sbs_image(
def _finalize_sbs_frame(
color_l: torch.Tensor,
color_r: torch.Tensor,
align_crop: bool,
render_timing: RenderTiming | None,
) -> np.ndarray:
"""Pack rendered left/right frames into an SBS array, optionally aligning first."""
"""Pack rendered left/right frames into an SBS array."""
with _timed_cpu(render_timing, "render_d2h_transfer"):
height, width, _channels = color_l.shape
color_sbs_u8 = torch.empty(
Expand All @@ -109,29 +108,6 @@ def _finalize_sbs_frame(
color_sbs_u8[:, :width, :] = color_l
color_sbs_u8[:, width:, :] = color_r
color_sbs_np = color_sbs_u8.cpu().numpy()

with _timed_cpu(render_timing, "render_encode_prepare"):
if align_crop:
# Import lazily so OpenCV isn't required unless --align-crop is used.
try:
from sharp.utils.stereo_align import AlignParams, auto_align_and_crop
except ImportError as e: # pragma: no cover
raise RuntimeError(
"Stereo auto-alignment requires OpenCV. Install opencv-python "
"(or opencv-python-headless), or omit --align-crop."
) from e

# Auto-align + auto-crop the stereo pair, then re-pack SBS for output.
align_params = AlignParams()
color_l_np, color_r_np, _meta = auto_align_and_crop(
color_sbs_np[:, :width, :],
color_sbs_np[:, width:, :],
params=align_params,
)
height, width, _channels = color_l_np.shape
color_sbs_np = np.empty((height, width * 2, 3), dtype=np.uint8)
color_sbs_np[:, :width, :] = color_l_np
color_sbs_np[:, width:, :] = color_r_np
return color_sbs_np


Expand All @@ -147,7 +123,6 @@ def _render_stereo_outputs(
sbs_image_format: str | None,
sbs_jpeg_quality: int,
sbs_image_frame: int,
align_crop: bool,
stereo_baseline: float,
stereo_mode: camera.StereoMode,
stereo_convergence_depth: float | None,
Expand Down Expand Up @@ -240,7 +215,7 @@ def _render_stereo_outputs(

# Write SBS frame image if requested
if sbs_image_path is not None and frame_idx == sbs_image_frame:
color_sbs_np = _finalize_sbs_frame(color_l, color_r, align_crop, render_timing)
color_sbs_np = _finalize_sbs_frame(color_l, color_r, render_timing)
img = (
color_sbs_np
if sbs_async_writer is not None
Expand Down Expand Up @@ -279,7 +254,6 @@ def render_gaussians(
sbs_image_format: str | None = None,
sbs_jpeg_quality: int = 90,
sbs_image_frame: int = 0,
align_crop: bool = False,
metrics: Metrics | None = None,
sbs_async_writer: Any | None = None,
stereo_baseline: float = camera.DEFAULT_STEREO_BASELINE,
Expand Down Expand Up @@ -343,7 +317,6 @@ def render_gaussians(
sbs_image_format=sbs_image_format,
sbs_jpeg_quality=sbs_jpeg_quality,
sbs_image_frame=sbs_image_frame,
align_crop=align_crop,
stereo_baseline=stereo_baseline,
stereo_mode=stereo_mode,
stereo_convergence_depth=stereo_convergence_depth,
Expand All @@ -363,7 +336,6 @@ def render_gaussians_pred_space(
sbs_image_format: str | None = None,
sbs_jpeg_quality: int = 90,
sbs_image_frame: int = 0,
align_crop: bool = False,
metrics: Metrics | None = None,
sbs_async_writer: Any | None = None,
stereo_baseline: float = camera.DEFAULT_STEREO_BASELINE,
Expand Down Expand Up @@ -433,7 +405,6 @@ def render_gaussians_pred_space(
sbs_image_format=sbs_image_format,
sbs_jpeg_quality=sbs_jpeg_quality,
sbs_image_frame=sbs_image_frame,
align_crop=align_crop,
stereo_baseline=stereo_baseline,
stereo_mode=stereo_mode,
stereo_convergence_depth=stereo_convergence_depth,
Expand Down
Loading