Skip to content

Commit

Permalink
Use qiskit 1.0 with other upgraded dependency libraries. (#581)
Browse files Browse the repository at this point in the history
* Update qiskit-qir to 0.5.0

* Update qiskit-ionq to 0.5.0

* Remove remaining `job_monitor` function invocations

* Bumping up Python version to 3.8 as Qiskit v1 only supports >=3.8

* Change "estimation-chemistry" sample VQE section verbiage
  • Loading branch information
ArthurKamalov committed Mar 21, 2024
1 parent fd5f090 commit 4fda476
Show file tree
Hide file tree
Showing 68 changed files with 34,071 additions and 29,683 deletions.
6 changes: 3 additions & 3 deletions azure-quantum/requirements-qiskit.txt
@@ -1,5 +1,5 @@
qiskit-ionq>=0.3.3,<1.0
qiskit-qir>=0.4,<0.5
qiskit-terra>=0.46,<0.47
qiskit-ionq>=0.5,<0.6
qiskit-qir>=0.5,<0.6
qiskit>=1.0,<2.0
Markdown>=3.4.1,<4.0
python-markdown-math>=0.8.0,<1.0
2 changes: 1 addition & 1 deletion azure-quantum/setup.py
Expand Up @@ -106,7 +106,7 @@ def read_requirements(requirement_file: str) -> list[str]:
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
],
python_requires=">=3.7",
python_requires=">=3.8",
install_requires=requirements,
extras_require=extras_require
)

Large diffs are not rendered by default.

337 changes: 103 additions & 234 deletions azure-quantum/tests/unit/recordings/test_dft_failure_invalid_input.yaml

Large diffs are not rendered by default.

84 changes: 39 additions & 45 deletions azure-quantum/tests/unit/recordings/test_estimator_failing_job.yaml
Expand Up @@ -21,16 +21,16 @@ interactions:
x-client-sku:
- MSAL.Python
x-client-ver:
- 1.26.0
- 1.27.0
method: POST
uri: https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/oauth2/v2.0/token
response:
body:
string: '{"token_type": "Bearer", "expires_in": 86399, "ext_expires_in": 86399,
"refresh_in": 43199, "access_token": "fake_token"}'
string: '{"token_type": "Bearer", "expires_in": 1741717218, "ext_expires_in":
1741717218, "refresh_in": 31536000, "access_token": "PLACEHOLDER"}'
headers:
content-length:
- '121'
- '5'
content-type:
- application/json; charset=utf-8
status:
Expand All @@ -55,13 +55,12 @@ interactions:
uri: https://eastus.quantum.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myresourcegroup/providers/Microsoft.Quantum/workspaces/myworkspace/storage/sasUri?api-version=2022-09-12-preview&test-sequence-id=1
response:
body:
string: '{"sasUri": "https://mystorage.blob.core.windows.net/job-00000000-0000-0000-0000-000000000001?sv=PLACEHOLDER&sig=PLACEHOLDER&se=PLACEHOLDER&srt=co&ss=b&sp=racwl",
"access_token": "fake_token"}'
string: '{"sasUri": "https://mystorage.blob.core.windows.net/job-00000000-0000-0000-0000-000000000001?sv=PLACEHOLDER&sig=PLACEHOLDER&se=PLACEHOLDER&srt=co&ss=b&sp=racwl"}'
headers:
connection:
- keep-alive
content-length:
- '191'
- '1'
content-type:
- application/json; charset=utf-8
transfer-encoding:
Expand All @@ -79,17 +78,17 @@ interactions:
Connection:
- keep-alive
User-Agent:
- azsdk-python-storage-blob/12.19.0 Python/3.9.18 (Windows-10-10.0.22631-SP0)
- azsdk-python-storage-blob/12.19.1 Python/3.9.18 (Windows-10-10.0.22631-SP0)
x-ms-date:
- Fri, 23 Feb 2024 17:45:23 GMT
- Mon, 11 Mar 2024 18:20:19 GMT
x-ms-version:
- '2023-11-03'
method: GET
uri: https://mystorage.blob.core.windows.net/job-00000000-0000-0000-0000-000000000001?restype=container&sv=PLACEHOLDER&sig=PLACEHOLDER&se=PLACEHOLDER&srt=co&ss=b&sp=racwl
response:
body:
string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>ContainerNotFound</Code><Message>The
specified container does not exist.\nRequestId:b73b4d1c-601e-0078-7280-668f38000000\nTime:2024-02-23T17:45:24.7547025Z</Message></Error>"
specified container does not exist.\nRequestId:b77ed1cf-a01e-003a-11e0-7336b8000000\nTime:2024-03-11T18:20:22.1330153Z</Message></Error>"
headers:
content-length:
- '223'
Expand All @@ -112,9 +111,9 @@ interactions:
Content-Length:
- '0'
User-Agent:
- azsdk-python-storage-blob/12.19.0 Python/3.9.18 (Windows-10-10.0.22631-SP0)
- azsdk-python-storage-blob/12.19.1 Python/3.9.18 (Windows-10-10.0.22631-SP0)
x-ms-date:
- Fri, 23 Feb 2024 17:45:24 GMT
- Mon, 11 Mar 2024 18:20:20 GMT
x-ms-version:
- '2023-11-03'
method: PUT
Expand All @@ -140,9 +139,9 @@ interactions:
Connection:
- keep-alive
User-Agent:
- azsdk-python-storage-blob/12.19.0 Python/3.9.18 (Windows-10-10.0.22631-SP0)
- azsdk-python-storage-blob/12.19.1 Python/3.9.18 (Windows-10-10.0.22631-SP0)
x-ms-date:
- Fri, 23 Feb 2024 17:45:24 GMT
- Mon, 11 Mar 2024 18:20:20 GMT
x-ms-version:
- '2023-11-03'
method: GET
Expand Down Expand Up @@ -231,11 +230,11 @@ interactions:
Content-Type:
- application/octet-stream
User-Agent:
- azsdk-python-storage-blob/12.19.0 Python/3.9.18 (Windows-10-10.0.22631-SP0)
- azsdk-python-storage-blob/12.19.1 Python/3.9.18 (Windows-10-10.0.22631-SP0)
x-ms-blob-type:
- BlockBlob
x-ms-date:
- Fri, 23 Feb 2024 17:45:25 GMT
- Mon, 11 Mar 2024 18:20:21 GMT
x-ms-version:
- '2023-11-03'
method: PUT
Expand Down Expand Up @@ -283,14 +282,13 @@ interactions:
"beginExecutionTime": null, "cancellationTime": null, "quantumComputingData":
null, "errorData": null, "isCancelling": false, "tags": [], "name": "azure-quantum-job",
"id": "00000000-0000-0000-0000-000000000001", "providerId": "microsoft-qc",
"target": "microsoft.estimator", "creationTime": "2024-02-23T17:45:26.3419879+00:00",
"endExecutionTime": null, "costEstimate": null, "itemType": "Job", "access_token":
"fake_token"}'
"target": "microsoft.estimator", "creationTime": "2024-03-11T18:20:23.6424375+00:00",
"endExecutionTime": null, "costEstimate": null, "itemType": "Job"}'
headers:
connection:
- keep-alive
content-length:
- '1152'
- '24'
content-type:
- application/json; charset=utf-8
transfer-encoding:
Expand Down Expand Up @@ -321,14 +319,13 @@ interactions:
"beginExecutionTime": null, "cancellationTime": null, "quantumComputingData":
{"count": 1}, "errorData": null, "isCancelling": false, "tags": [], "name":
"azure-quantum-job", "id": "00000000-0000-0000-0000-000000000001", "providerId":
"microsoft-qc", "target": "microsoft.estimator", "creationTime": "2024-02-23T17:45:26.3419879+00:00",
"endExecutionTime": null, "costEstimate": null, "itemType": "Job", "access_token":
"fake_token"}'
"microsoft-qc", "target": "microsoft.estimator", "creationTime": "2024-03-11T18:20:23.6424375+00:00",
"endExecutionTime": null, "costEstimate": null, "itemType": "Job"}'
headers:
connection:
- keep-alive
content-length:
- '1340'
- '24'
content-type:
- application/json; charset=utf-8
transfer-encoding:
Expand Down Expand Up @@ -359,14 +356,13 @@ interactions:
"beginExecutionTime": null, "cancellationTime": null, "quantumComputingData":
{"count": 1}, "errorData": null, "isCancelling": false, "tags": [], "name":
"azure-quantum-job", "id": "00000000-0000-0000-0000-000000000001", "providerId":
"microsoft-qc", "target": "microsoft.estimator", "creationTime": "2024-02-23T17:45:26.3419879+00:00",
"endExecutionTime": null, "costEstimate": null, "itemType": "Job", "access_token":
"fake_token"}'
"microsoft-qc", "target": "microsoft.estimator", "creationTime": "2024-03-11T18:20:23.6424375+00:00",
"endExecutionTime": null, "costEstimate": null, "itemType": "Job"}'
headers:
connection:
- keep-alive
content-length:
- '1340'
- '24'
content-type:
- application/json; charset=utf-8
transfer-encoding:
Expand Down Expand Up @@ -397,14 +393,13 @@ interactions:
"beginExecutionTime": null, "cancellationTime": null, "quantumComputingData":
{"count": 1}, "errorData": null, "isCancelling": false, "tags": [], "name":
"azure-quantum-job", "id": "00000000-0000-0000-0000-000000000001", "providerId":
"microsoft-qc", "target": "microsoft.estimator", "creationTime": "2024-02-23T17:45:26.3419879+00:00",
"endExecutionTime": null, "costEstimate": null, "itemType": "Job", "access_token":
"fake_token"}'
"microsoft-qc", "target": "microsoft.estimator", "creationTime": "2024-03-11T18:20:23.6424375+00:00",
"endExecutionTime": null, "costEstimate": null, "itemType": "Job"}'
headers:
connection:
- keep-alive
content-length:
- '1340'
- '24'
content-type:
- application/json; charset=utf-8
transfer-encoding:
Expand Down Expand Up @@ -435,14 +430,13 @@ interactions:
"beginExecutionTime": null, "cancellationTime": null, "quantumComputingData":
{"count": 1}, "errorData": null, "isCancelling": false, "tags": [], "name":
"azure-quantum-job", "id": "00000000-0000-0000-0000-000000000001", "providerId":
"microsoft-qc", "target": "microsoft.estimator", "creationTime": "2024-02-23T17:45:26.3419879+00:00",
"endExecutionTime": null, "costEstimate": null, "itemType": "Job", "access_token":
"fake_token"}'
"microsoft-qc", "target": "microsoft.estimator", "creationTime": "2024-03-11T18:20:23.6424375+00:00",
"endExecutionTime": null, "costEstimate": null, "itemType": "Job"}'
headers:
connection:
- keep-alive
content-length:
- '1340'
- '24'
content-type:
- application/json; charset=utf-8
transfer-encoding:
Expand Down Expand Up @@ -470,17 +464,17 @@ interactions:
"inputDataFormat": "qir.v1", "inputParams": {"errorBudget": 2}, "metadata":
null, "sessionId": null, "status": "Executing", "jobType": "QuantumComputing",
"outputDataFormat": "microsoft.resource-estimates.v1", "outputDataUri": "https://mystorage.blob.core.windows.net/job-00000000-0000-0000-0000-000000000001/outputData?sv=PLACEHOLDER&sr=b&sig=PLACEHOLDER&se=PLACEHOLDER&sp=r&rscd=attachment%3B%20filename%3Dazure-quantum-job-00000000-0000-0000-0000-000000000001.output.json",
"beginExecutionTime": "2024-02-23T17:45:26.7370947Z", "cancellationTime":
"beginExecutionTime": "2024-03-11T18:20:24.0521966Z", "cancellationTime":
null, "quantumComputingData": {"count": 1}, "errorData": null, "isCancelling":
false, "tags": [], "name": "azure-quantum-job", "id": "00000000-0000-0000-0000-000000000001",
"providerId": "microsoft-qc", "target": "microsoft.estimator", "creationTime":
"2024-02-23T17:45:26.3419879+00:00", "endExecutionTime": null, "costEstimate":
null, "itemType": "Job", "access_token": "fake_token"}'
"2024-03-11T18:20:23.6424375+00:00", "endExecutionTime": null, "costEstimate":
null, "itemType": "Job"}'
headers:
connection:
- keep-alive
content-length:
- '1368'
- '24'
content-type:
- application/json; charset=utf-8
transfer-encoding:
Expand Down Expand Up @@ -508,19 +502,19 @@ interactions:
"inputDataFormat": "qir.v1", "inputParams": {"errorBudget": 2}, "metadata":
null, "sessionId": null, "status": "Failed", "jobType": "QuantumComputing",
"outputDataFormat": "microsoft.resource-estimates.v1", "outputDataUri": "https://mystorage.blob.core.windows.net/job-00000000-0000-0000-0000-000000000001/rawOutputData?sv=PLACEHOLDER&sr=b&sig=PLACEHOLDER&se=PLACEHOLDER&sp=r&rscd=attachment%3B%20filename%3Dazure-quantum-job-00000000-0000-0000-0000-000000000001.output.json",
"beginExecutionTime": "2024-02-23T17:45:27.2910735Z", "cancellationTime":
"beginExecutionTime": "2024-03-11T18:20:24.4741932Z", "cancellationTime":
null, "quantumComputingData": {"count": 1}, "errorData": {"code": "InvalidInputError",
"message": "The error budget must be between 0.0 and 1.0, provided input was
`2`"}, "isCancelling": false, "tags": [], "name": "azure-quantum-job", "id":
"00000000-0000-0000-0000-000000000001", "providerId": "microsoft-qc", "target":
"microsoft.estimator", "creationTime": "2024-02-23T17:45:26.3419879+00:00",
"endExecutionTime": "2024-02-23T17:45:28.9707826Z", "costEstimate": null,
"itemType": "Job", "access_token": "fake_token"}'
"microsoft.estimator", "creationTime": "2024-03-11T18:20:23.6424375+00:00",
"endExecutionTime": "2024-03-11T18:20:26.1744214Z", "costEstimate": null,
"itemType": "Job"}'
headers:
connection:
- keep-alive
content-length:
- '1502'
- '24'
content-type:
- application/json; charset=utf-8
transfer-encoding:
Expand Down

0 comments on commit 4fda476

Please sign in to comment.