update(cirq-rigetti): use pyquil v4 #6281

jselig-rigetti · 2023-09-06T20:52:31Z

Refactors as necessary to anticipate the release of PyQuil v4. Changes between the RC used here and the eventual full release should be compatible, but leave this MR as a draft until the dependency can be pinned to a full >=4.0.0 release.

google-cla · 2023-09-06T20:52:35Z

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

MarquessV · 2023-09-07T17:47:00Z

cirq-rigetti/cirq_rigetti/circuit_sweep_executors.py

            raise ValueError(f'Symbols not valid for region name {region_name}')
-    qam_execution_result = quantum_computer.qam.run(executable)
+    qam_execution_result = quantum_computer.qam.run(executable, memory_map)


We need to check for atomic values and wrap them in a list to prevent a breaking change here.

In v3, Program.write_memory accepted atomic values for memory regions of length 1. For example, Program.write_memory("ro", 1) was valid if ro was defined as DECLARE ro BIT[1]. In v4, the new MemoryMap only accepts sequences of values for a memory region, even if that memory region happens to be length 1.

fixed this in the lines above 👍

vtomole · 2023-09-18T20:11:58Z

Hey @jselig-rigetti @MarquessV

Can either of you please review rigetti/qcs-api-client-python#12? It's been causing incompatibility issues with Cirq.

vtomole · 2023-11-16T23:52:43Z

@jselig-rigetti @MarquessV Hey, how's this PR going?

MarquessV · 2023-11-30T17:25:04Z

Hey @vtomole! This PR is ready to review from our perspective. Anything else you need us to do?

cirq-rigetti/cirq_rigetti/service_test.py

jselig-rigetti · 2024-06-03T17:42:14Z

cirq-rigetti/cirq_rigetti/service.py

-    def get_quilt_calibrations(quantum_processor_id: str, client: Optional[QCSClient]) -> str: # pragma: no cover
+    def get_quilt_calibrations(
+        quantum_processor_id: str, client: Optional[QCSClient]
+    ) -> str:  # pragma: no cover


This likely doesn't need to be tested as it's just a convenience method for an API call, and there's no mock for QCSClient.

jselig-rigetti · 2024-06-03T17:43:11Z

I added pragma: no cover to all lines that failed the coverage test as part of 8412760 mostly as a way to show where coverage needed to be added, although not everything looks like it does need a test

pavoljuhas · 2024-06-03T19:59:25Z

The failure of pytest ubuntu (3.12) appears to be caused by rigetti/pyquil#1736. The latest "pyquil==4.10.1" can be installed to Python 3.12.0, but not to 3.12.1 or later.

Would it be possible to do a patch release of pyquil with a fixed Python version requirement?

codecov · 2024-06-03T20:03:47Z

Codecov Report

Attention: Patch coverage is 98.86364% with 3 lines in your changes missing coverage. Please review.

Project coverage is 97.81%. Comparing base (03aa511) to head (41c49f5).

Files	Patch %	Lines
cirq-rigetti/cirq_rigetti/conftest.py	87.50%	2 Missing ⚠️
cirq-rigetti/cirq_rigetti/quil_input.py	99.25%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #6281      +/-   ##
==========================================
- Coverage   97.81%   97.81%   -0.01%     
==========================================
  Files        1067     1066       -1     
  Lines       91551    91696     +145     
==========================================
+ Hits        89550    89690     +140     
- Misses       2001     2006       +5

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

cirq-rigetti/requirements.txt

jselig-rigetti · 2024-06-04T18:41:51Z

The failure of pytest ubuntu (3.12) appears to be caused by rigetti/pyquil#1736. The latest "pyquil==4.10.1" can be installed to Python 3.12.0, but not to 3.12.1 or later.

Would it be possible to do a patch release of pyquil with a fixed Python version requirement?

Ah thank you, rigetti/pyquil#1782 will merge soon which should clear that up

pavoljuhas · 2024-06-05T01:24:05Z

The failure of pytest ubuntu (3.12) appears to be caused by rigetti/pyquil#1736. The latest "pyquil==4.10.1" can be installed to Python 3.12.0, but not to 3.12.1 or later.
Would it be possible to do a patch release of pyquil with a fixed Python version requirement?

Ah thank you, rigetti/pyquil#1782 will merge soon which should clear that up

Sounds great. Please consider applying the patch at the comment #6281 (comment) here.
It should make the CI tests pass here with Python 3.12, without a need to wait for the next pyquil release on PyPI.

pavoljuhas

A couple of small issues, please see inline comments.
Otherwise it seems to be close, thank you!

cirq-rigetti/cirq_rigetti/aspen_device_test.py

cirq-rigetti/cirq_rigetti/quil_input_test.py

cirq-rigetti/cirq_rigetti/service.py

cirq-rigetti/cirq_rigetti/service_test.py

…hod on mock

cirq-rigetti/cirq_rigetti/service_test.py

pavoljuhas · 2024-06-10T19:04:53Z

cirq-rigetti/cirq_rigetti/aspen_device.py



-@_provide_default_client  # pragma: no cover
+# pragma: no cover


The # pragma: no cover comment is ineffective here.
Please move to the end of the line 238, ie, the end of the def statement to
ignore coverage for the entire get_rigetti_qcs_aspen_device function.

Better yet, adding a unit test would be nicer, even with a mock of the get_instruction_set_architecture function.

PS: to test the coverage and if # pragma: no cover comments apply you can use

$ check/pytest --rigetti-integration cirq-rigetti/ --cov=cirq_rigetti --cov-report=html

and then inspect the htmlcov/index.html file.

cirq-rigetti/cirq_rigetti/aspen_device.py

pavoljuhas

Few small updates needed to pass unit tests and fix optional arguments declaration.
Please see inline comments.

cirq-rigetti/cirq_rigetti/service.py

…e as_qvm when constructing service class Co-authored-by: Pavol Juhas <pavol.juhas@gmail.com>

pavoljuhas · 2024-06-10T21:32:53Z

cirq-rigetti/cirq_rigetti/service_test.py

-    class Transport(httpx.BaseTransport):
-        def handle_request(self, request: httpx.Request) -> httpx.Response:
-            return Response(200)
+@patch('cirq_rigetti.service.QCSClient')


This should exclude test_list_quantum_processors from testing on Mac and Windows platforms which do not start cirq-rigetti/docker-compose.test.yaml

Suggested change

@patch('cirq_rigetti.service.QCSClient')

@pytest.mark.rigetti_integration

@patch('cirq_rigetti.service.QCSClient')

CirqBot added the size: M 50< lines changed <250 label Sep 6, 2023

jselig-rigetti force-pushed the rigetti-use-pyquil-v4 branch 2 times, most recently from d8c1e61 to 1787c12 Compare September 6, 2023 22:12

MarquessV reviewed Sep 7, 2023

View reviewed changes

jselig-rigetti marked this pull request as ready for review September 20, 2023 15:14

jselig-rigetti requested review from vtomole, cduck and a team as code owners September 20, 2023 15:14

jselig-rigetti requested a review from fdmalone September 20, 2023 15:14

jselig-rigetti force-pushed the rigetti-use-pyquil-v4 branch from 6ed2e90 to 34dd7f1 Compare September 29, 2023 17:43

jselig-rigetti force-pushed the rigetti-use-pyquil-v4 branch 2 times, most recently from 86fa3dc to c5f7f3a Compare October 19, 2023 15:07

jselig-rigetti and others added 10 commits October 30, 2023 11:32

chore: use pyquil v4

250cba3

chore: change mock expectations

23b6294

chore: keep key check

f1688ff

chore: refactor away deprecation warning

0daae21

chore: ensure atomic memory values are sequences

cc71d1f

chore: use stable pyquil v4 version

2a813ca

Add support for Kraus operators, POVMs and parametric defgates

027ba98

clean up tests

83e510e

Cleaned up formatting for quil_input

474265b

Cleaned up formatting for quil_input_test

48027f6

jselig-rigetti force-pushed the rigetti-use-pyquil-v4 branch from c5f7f3a to 48027f6 Compare October 30, 2023 17:32

natestemen mentioned this pull request Nov 8, 2023

Update pyquil requirement from ~=3.5.4 to ~=4.0.3 unitaryfund/mitiq#2063

Open

Merge branch 'master' into rigetti-use-pyquil-v4

21c3fcd

Merge branch 'main' into rigetti-use-pyquil-v4

9ba2ac0

test: add pragma no cover to all lines failing coverage test

8412760

jselig-rigetti commented Jun 3, 2024

View reviewed changes

cirq-rigetti/cirq_rigetti/service_test.py Outdated Show resolved Hide resolved

jselig-rigetti commented Jun 3, 2024

View reviewed changes

pavoljuhas reviewed Jun 3, 2024

View reviewed changes

cirq-rigetti/requirements.txt Outdated Show resolved Hide resolved

pavoljuhas mentioned this pull request Jun 4, 2024

Add attrs lower bound in requirements.txt #6633

Open

Merge branch 'main' into rigetti-use-pyquil-v4

ef4c1f3

jselig-rigetti mentioned this pull request Jun 4, 2024

feat: Drop support for Python 3.8, update dependencies rigetti/pyquil#1782

Merged

7 tasks

pavoljuhas requested changes Jun 5, 2024

View reviewed changes

jselig-rigetti and others added 8 commits June 5, 2024 10:13

chore: remove print calls in tests

770a75c

chore: mock and test RigettiQCSService.list_quantum_processors

5bd7252

chore: remove unused test

f667099

chore: increate pyquil version requirement

756afac

chore: fix import ordering lint complaint, unimplemented abstract met…

e1e200e

…hod on mock

Merge branch 'main' into rigetti-use-pyquil-v4

5245a7d

Merge branch 'main' into rigetti-use-pyquil-v4

23f086d

chore: use qvm to create qcs service in tests

e36bb35

pavoljuhas reviewed Jun 10, 2024

View reviewed changes

cirq-rigetti/cirq_rigetti/service_test.py Outdated Show resolved Hide resolved

pavoljuhas reviewed Jun 10, 2024

View reviewed changes

cirq-rigetti/cirq_rigetti/aspen_device.py Outdated Show resolved Hide resolved

pavoljuhas requested changes Jun 10, 2024

View reviewed changes

jselig-rigetti commented Jun 10, 2024

View reviewed changes

cirq-rigetti/cirq_rigetti/service.py Outdated Show resolved Hide resolved

jselig-rigetti commented Jun 10, 2024

View reviewed changes

cirq-rigetti/cirq_rigetti/service.py Outdated Show resolved Hide resolved

jselig-rigetti and others added 2 commits June 10, 2024 13:31

fix: code review suggestions: default None for optional arguments, us…

e2deb8f

…e as_qvm when constructing service class Co-authored-by: Pavol Juhas <pavol.juhas@gmail.com>

test: add test for get_rigetti_qcs_aspen_device

41c49f5

pavoljuhas reviewed Jun 10, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update(cirq-rigetti): use pyquil v4 #6281

update(cirq-rigetti): use pyquil v4 #6281

jselig-rigetti commented Sep 6, 2023

google-cla bot commented Sep 6, 2023

MarquessV Sep 7, 2023

jselig-rigetti Sep 7, 2023

vtomole commented Sep 18, 2023

vtomole commented Nov 16, 2023

MarquessV commented Nov 30, 2023

jselig-rigetti Jun 3, 2024

jselig-rigetti commented Jun 3, 2024

pavoljuhas commented Jun 3, 2024

codecov bot commented Jun 3, 2024 •

edited

jselig-rigetti commented Jun 4, 2024

pavoljuhas commented Jun 5, 2024

pavoljuhas left a comment

pavoljuhas Jun 10, 2024 •

edited

pavoljuhas left a comment •

edited

pavoljuhas Jun 10, 2024



		@_provide_default_client # pragma: no cover
		# pragma: no cover

	@patch('cirq_rigetti.service.QCSClient')
	@pytest.mark.rigetti_integration
	@patch('cirq_rigetti.service.QCSClient')

update(cirq-rigetti): use pyquil v4 #6281

Are you sure you want to change the base?

update(cirq-rigetti): use pyquil v4 #6281

Conversation

jselig-rigetti commented Sep 6, 2023

google-cla bot commented Sep 6, 2023

MarquessV Sep 7, 2023

Choose a reason for hiding this comment

jselig-rigetti Sep 7, 2023

Choose a reason for hiding this comment

vtomole commented Sep 18, 2023

vtomole commented Nov 16, 2023

MarquessV commented Nov 30, 2023

jselig-rigetti Jun 3, 2024

Choose a reason for hiding this comment

jselig-rigetti commented Jun 3, 2024

pavoljuhas commented Jun 3, 2024

codecov bot commented Jun 3, 2024 • edited

Codecov Report

jselig-rigetti commented Jun 4, 2024

pavoljuhas commented Jun 5, 2024

pavoljuhas left a comment

Choose a reason for hiding this comment

pavoljuhas Jun 10, 2024 • edited

Choose a reason for hiding this comment

pavoljuhas left a comment • edited

Choose a reason for hiding this comment

pavoljuhas Jun 10, 2024

Choose a reason for hiding this comment

codecov bot commented Jun 3, 2024 •

edited

pavoljuhas Jun 10, 2024 •

edited

pavoljuhas left a comment •

edited