Skip to content

Relax restriction on classical inputs for modular addition to fix nightly CI #1537

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
merged 4 commits into from
Feb 5, 2025
Merged

Relax restriction on classical inputs for modular addition to fix nightly CI #1537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7847c0
Fix Nightly CI
NoureldinYosri Feb 3, 2025
a901d54
Merge branch 'main' into main
NoureldinYosri Feb 3, 2025
7b3aef9
Merge branch 'quantumlib:main' into main
NoureldinYosri Feb 4, 2025
e684dd5
Merge branch 'main' into main
NoureldinYosri Feb 5, 2025
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
22 changes: 13 additions & 9 deletions qualtran/bloqs/mod_arithmetic/mod_addition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,15 @@ def signature(self) -> 'Signature':
def on_classical_vals(
self, x: 'ClassicalValT', y: 'ClassicalValT'
) -> Dict[str, 'ClassicalValT']:
if not (0 <= x < self.mod):
# The construction still works when at most one of inputs equals `mod`.
special_case = (x == self.mod) ^ (y == self.mod)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we use or instead of ^

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is at most not at least ... although I can simply say not (x == y == self.mod) and update the inequalities below from x < mod to x <= mod, what do you prefer?

if not (0 <= x < self.mod or special_case):
raise ValueError(
f'{x=} is outside the valid interval for modular addition [0, {self.mod})'
f'{x=} is outside the valid interval for modular addition [0, {self.mod}]'
)
if not (0 <= y < self.mod):
if not (0 <= y < self.mod or special_case):
raise ValueError(
f'{y=} is outside the valid interval for modular addition [0, {self.mod})'
f'{y=} is outside the valid interval for modular addition [0, {self.mod}]'
)

y = (x + y) % self.mod
Expand Down Expand Up @@ -320,7 +322,7 @@ def on_classical_vals(

if not (0 <= x < self.mod):
raise ValueError(
f'{x=} is outside the valid interval for modular addition [0, {self.mod})'
f'{x=} is outside the valid interval for modular addition [0, {self.mod}]'
)

x = (x + self.k) % self.mod
Expand Down Expand Up @@ -508,13 +510,15 @@ def on_classical_vals(
if ctrl != self.cv:
return {'ctrl': ctrl, 'x': x, 'y': y}

if not (0 <= x < self.mod):
# The construction still works when at most one of inputs equals `mod`.
special_case = (x == self.mod) ^ (y == self.mod)
if not (0 <= x < self.mod or special_case):
raise ValueError(
f'{x=} is outside the valid interval for modular addition [0, {self.mod})'
f'{x=} is outside the valid interval for modular addition [0, {self.mod}]'
)
if not (0 <= y < self.mod):
if not (0 <= y < self.mod or special_case):
raise ValueError(
f'{y=} is outside the valid interval for modular addition [0, {self.mod})'
f'{y=} is outside the valid interval for modular addition [0, {self.mod}]'
)

y = (x + y) % self.mod
Expand Down
5 changes: 2 additions & 3 deletions qualtran/bloqs/mod_arithmetic/mod_addition_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,8 @@ def test_classical_action_mod_add(prime, bitsize):
def test_classical_action_cmodadd(control, prime, dtype, bitsize):
b = CModAdd(dtype(bitsize), mod=prime, cv=control)
cb = b.decompose_bloq()
valid_range = range(prime)
for c in range(2):
for x, y in itertools.product(valid_range, repeat=2):
for x, y in itertools.product(range(prime + 1), range(prime)):
assert b.call_classically(ctrl=c, x=x, y=y) == cb.call_classically(ctrl=c, x=x, y=y)


Expand Down Expand Up @@ -207,7 +206,7 @@ def test_cmod_add_complexity_vs_ref():
@pytest.mark.parametrize(['prime', 'bitsize'], [(p, bitsize) for p in [5, 7] for bitsize in (5, 6)])
def test_mod_add_classical_action(bitsize, prime):
b = ModAdd(bitsize, prime)
assert_consistent_classical_action(b, x=range(prime), y=range(prime))
assert_consistent_classical_action(b, x=range(prime + 1), y=range(prime))


def test_cmodadd_tensor():
Expand Down