Skip to content

Fix pass through of arguments to generate_precomputes in NumPy forward spherical transform #256

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

Merged
matt-graham merged 2 commits into from
Dec 18, 2024
Merged

Fix pass through of arguments to generate_precomputes in NumPy forward spherical transform #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b1c798
Fix incorrect passing through of L_lower to generate_precomputes
matt-graham Dec 13, 2024
be0cf52
Cover precomps = None case in tests
matt-graham Dec 13, 2024
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
9 changes: 8 additions & 1 deletion s2fft/transforms/otf_recursions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,14 @@ def inverse_latitudinal_step(
half_slices = [el + mm + 1, el - mm + 1]

if precomps is None:
precomps = generate_precomputes(L, -mm, sampling, nside, L_lower)
precomps = generate_precomputes(
L=L,
spin=-mm,
sampling=sampling,
nside=nside,
forward=False,
L_lower=L_lower,
)
lrenorm, vsign, cpi, cp2, indices = precomps

for i in range(2):
Expand Down
15 changes: 12 additions & 3 deletions tests/test_spherical_transform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
@pytest.mark.parametrize("method", method_to_test)
@pytest.mark.parametrize("reality", reality_to_test)
@pytest.mark.parametrize("spmd", multiple_gpus)
@pytest.mark.parametrize("use_generate_precomputes", [True, False])
@pytest.mark.filterwarnings("ignore::RuntimeWarning")
def test_transform_inverse(
flm_generator,
Expand All @@ -37,6 +38,7 @@ def test_transform_inverse(
method: str,
reality: bool,
spmd: bool,
use_generate_precomputes: bool,
):
if reality and spin != 0:
pytest.skip("Reality only valid for scalar fields (spin=0).")
Expand All @@ -52,7 +54,10 @@ def test_transform_inverse(
Reality=reality,
)

precomps = generate_precomputes(L, spin, sampling, L_lower=L_lower)
if use_generate_precomputes:
precomps = generate_precomputes(L, spin, sampling, L_lower=L_lower)
else:
precomps = None
f = spherical.inverse(
flm,
L,
Expand Down Expand Up @@ -106,6 +111,7 @@ def test_transform_inverse_healpix(
@pytest.mark.parametrize("method", method_to_test)
@pytest.mark.parametrize("reality", reality_to_test)
@pytest.mark.parametrize("spmd", multiple_gpus)
@pytest.mark.parametrize("use_generate_precomputes", [True, False])
@pytest.mark.filterwarnings("ignore::RuntimeWarning")
def test_transform_forward(
flm_generator,
Expand All @@ -116,6 +122,7 @@ def test_transform_forward(
method: str,
reality: bool,
spmd: bool,
use_generate_precomputes: bool,
):
if reality and spin != 0:
pytest.skip("Reality only valid for scalar fields (spin=0).")
Expand All @@ -131,8 +138,10 @@ def test_transform_forward(
Spin=spin,
Reality=reality,
)

precomps = generate_precomputes(L, spin, sampling, None, True, L_lower)
if use_generate_precomputes:
precomps = generate_precomputes(L, spin, sampling, None, True, L_lower)
else:
precomps = None
flm_check = spherical.forward(
f,
L,
Expand Down
Loading