Skip to content

Check inside_interval_mask before computing splines #2

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
jrmcornish wants to merge 1 commit into
base: master
Choose a base branch
from
+43 −39
Open

Check inside_interval_mask before computing splines #2

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
27 changes: 14 additions & 13 deletions nde/transforms/splines/cubic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,20 @@ def unconstrained_cubic_spline(inputs,
else:
raise RuntimeError('{} tails are not implemented.'.format(tails))

outputs[inside_interval_mask], logabsdet[inside_interval_mask] = cubic_spline(
inputs=inputs[inside_interval_mask],
unnormalized_widths=unnormalized_widths[inside_interval_mask, :],
unnormalized_heights=unnormalized_heights[inside_interval_mask, :],
unnorm_derivatives_left=unnorm_derivatives_left[inside_interval_mask, :],
unnorm_derivatives_right=unnorm_derivatives_right[inside_interval_mask, :],
inverse=inverse,
left=-tail_bound, right=tail_bound, bottom=-tail_bound, top=tail_bound,
min_bin_width=min_bin_width,
min_bin_height=min_bin_height,
eps=eps,
quadratic_threshold=quadratic_threshold
)
if torch.any(inside_interval_mask):
outputs[inside_interval_mask], logabsdet[inside_interval_mask] = cubic_spline(
inputs=inputs[inside_interval_mask],
unnormalized_widths=unnormalized_widths[inside_interval_mask, :],
unnormalized_heights=unnormalized_heights[inside_interval_mask, :],
unnorm_derivatives_left=unnorm_derivatives_left[inside_interval_mask, :],
unnorm_derivatives_right=unnorm_derivatives_right[inside_interval_mask, :],
inverse=inverse,
left=-tail_bound, right=tail_bound, bottom=-tail_bound, top=tail_bound,
min_bin_width=min_bin_width,
min_bin_height=min_bin_height,
eps=eps,
quadratic_threshold=quadratic_threshold
)

return outputs, logabsdet

Expand Down
13 changes: 7 additions & 6 deletions nde/transforms/splines/linear.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ def unconstrained_linear_spline(inputs, unnormalized_pdf,
else:
raise RuntimeError('{} tails are not implemented.'.format(tails))

outputs[inside_interval_mask], logabsdet[inside_interval_mask] = linear_spline(
inputs=inputs[inside_interval_mask],
unnormalized_pdf=unnormalized_pdf[inside_interval_mask, :],
inverse=inverse,
left=-tail_bound, right=tail_bound, bottom=-tail_bound, top=tail_bound
)
if torch.any(inside_interval_mask):
outputs[inside_interval_mask], logabsdet[inside_interval_mask] = linear_spline(
inputs=inputs[inside_interval_mask],
unnormalized_pdf=unnormalized_pdf[inside_interval_mask, :],
inverse=inverse,
left=-tail_bound, right=tail_bound, bottom=-tail_bound, top=tail_bound
)

return outputs, logabsdet

Expand Down
19 changes: 10 additions & 9 deletions nde/transforms/splines/quadratic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,16 @@ def unconstrained_quadratic_spline(inputs,
else:
raise RuntimeError('{} tails are not implemented.'.format(tails))

outputs[inside_interval_mask], logabsdet[inside_interval_mask] = quadratic_spline(
inputs=inputs[inside_interval_mask],
unnormalized_widths=unnormalized_widths[inside_interval_mask, :],
unnormalized_heights=unnormalized_heights[inside_interval_mask, :],
inverse=inverse,
left=-tail_bound, right=tail_bound, bottom=-tail_bound, top=tail_bound,
min_bin_width=min_bin_width,
min_bin_height=min_bin_height
)
if torch.any(inside_interval_mask):
outputs[inside_interval_mask], logabsdet[inside_interval_mask] = quadratic_spline(
inputs=inputs[inside_interval_mask],
unnormalized_widths=unnormalized_widths[inside_interval_mask, :],
unnormalized_heights=unnormalized_heights[inside_interval_mask, :],
inverse=inverse,
left=-tail_bound, right=tail_bound, bottom=-tail_bound, top=tail_bound,
min_bin_width=min_bin_width,
min_bin_height=min_bin_height
)

return outputs, logabsdet

Expand Down
23 changes: 12 additions & 11 deletions nde/transforms/splines/rational_quadratic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,18 @@ def unconstrained_rational_quadratic_spline(inputs,
else:
raise RuntimeError('{} tails are not implemented.'.format(tails))

outputs[inside_interval_mask], logabsdet[inside_interval_mask] = rational_quadratic_spline(
inputs=inputs[inside_interval_mask],
unnormalized_widths=unnormalized_widths[inside_interval_mask, :],
unnormalized_heights=unnormalized_heights[inside_interval_mask, :],
unnormalized_derivatives=unnormalized_derivatives[inside_interval_mask, :],
inverse=inverse,
left=-tail_bound, right=tail_bound, bottom=-tail_bound, top=tail_bound,
min_bin_width=min_bin_width,
min_bin_height=min_bin_height,
min_derivative=min_derivative
)
if torch.any(inside_interval_mask):
outputs[inside_interval_mask], logabsdet[inside_interval_mask] = rational_quadratic_spline(
inputs=inputs[inside_interval_mask],
unnormalized_widths=unnormalized_widths[inside_interval_mask, :],
unnormalized_heights=unnormalized_heights[inside_interval_mask, :],
unnormalized_derivatives=unnormalized_derivatives[inside_interval_mask, :],
inverse=inverse,
left=-tail_bound, right=tail_bound, bottom=-tail_bound, top=tail_bound,
min_bin_width=min_bin_width,
min_bin_height=min_bin_height,
min_derivative=min_derivative
)

return outputs, logabsdet

Expand Down