Skip to content
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

Update Qiskit to v1.3.0 #144

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
+18 −8
Open

Update Qiskit to v1.3.0 #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
585edb6
Change requirements-dev.txt
jesus-talavera-ibm Dec 9, 2024
eb3e7e9
Version endpoint only available in base_url
jesus-talavera-ibm Dec 10, 2024
dd10787
Fix compatibility issues
jesus-talavera-ibm Dec 10, 2024
61d7618
Merge branch 'main' into jt-qiskit-1.3
jesus-talavera-ibm Dec 12, 2024
4cbf45a
Pin qiskit_ibm_ai_local_transpiler to 2.0
jesus-talavera-ibm Dec 12, 2024
b9a1d42
Add release-notes and pin qiskit version to 1.3
jesus-talavera-ibm Dec 12, 2024
ed9e770
Merge branch 'main' into jt-qiskit-1.3
jesus-talavera-ibm Dec 12, 2024
a06f885
Use lower qpy version between local qiskit and cloud service
jesus-talavera-ibm Dec 17, 2024
598bfc5
Merge branch 'main' into jt-qiskit-1.3
jesus-talavera-ibm Dec 18, 2024
92d7938
Make more flexible qiskit_ibm_ai_local_transpiler version requirement
jesus-talavera-ibm Dec 19, 2024
c2dece2
Make more flexible qiskit_ibm_ai_local_transpiler version requirement…
jesus-talavera-ibm Dec 19, 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
4 changes: 2 additions & 2 deletions qiskit_ibm_transpiler/ai/routing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,10 @@ def copy_dag_metadata(dag, target_dag):
DAGCircuit: An empty copy of self.
"""
target_dag.name = dag.name
target_dag._global_phase = dag._global_phase
target_dag.global_phase = dag.global_phase
target_dag.duration = dag.duration
target_dag.unit = dag.unit
target_dag.metadata = dag.metadata
target_dag._key_cache = dag._key_cache
# target_dag._key_cache = dag._key_cache

return target_dag
10 changes: 9 additions & 1 deletion qiskit_ibm_transpiler/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@
}


def _get_qpy_version(qiskit_version: str):
service_qpy_version = QPY_QISKIT_VERSION_MAPPING.get(
qiskit_version, common.QPY_VERSION
)
# Return lower version between local qiskit and service to keep compatibility
return min(common.QPY_VERSION, service_qpy_version)


def get_metrics(qc: QuantumCircuit) -> Dict[str, int]:
"""Returns a dict with metrics from a QuantumCircuit"""
qcd = qc.decompose(reps=3)
Expand Down Expand Up @@ -238,7 +246,7 @@ def get_qpy_from_circuit(
qpy.dump(
input_circ,
output_b,
version=QPY_QISKIT_VERSION_MAPPING.get(qiskit_version, common.QPY_VERSION),
version=_get_qpy_version(qiskit_version),
)
qpy_string = base64.b64encode(output_b.getvalue()).decode("utf-8")
else:
Expand Down
3 changes: 2 additions & 1 deletion qiskit_ibm_transpiler/wrappers/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ def __init__(
url_env_param = f"{path_param.upper()}_" if path_param else ""
url_env_var = f"QISKIT_IBM_TRANSPILER_{url_env_param}URL"

self.base_url = base_url
self.url = os.environ.get(url_env_var, url_with_path).rstrip("/")

token = token if token else _get_token_from_system()
Expand All @@ -93,7 +94,7 @@ def __init__(
}

def get_versions(self):
url = f"{self.url}/version"
url = f"{self.base_url}/version"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why do we need this change? Because it is only in the top level api?

Copy link
Contributor Author

@jesus-talavera-ibm jesus-talavera-ibm Dec 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Yes, /version endpoint is only available at root level.
It was removed in the rest of endpoints to avoid redundancy, but since we didn't use it until now, client was not affected

resp = requests.get(
url,
headers=self.headers,
Expand Down
1 change: 1 addition & 0 deletions release-notes/unreleased/144.upgrade.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update Qiskit to v1.3.0.
4 changes: 2 additions & 2 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
qiskit==1.2.4
qiskit~=1.3
backoff~=2.0
qiskit_ibm_runtime>=0.23.0
qiskit-qasm3-import~=0.4
Expand All @@ -12,4 +12,4 @@ sphinx==7.2.6; python_version >= '3.9'
qiskit-sphinx-theme==1.16.1
sphinxcontrib-katex==0.9.9
networkx==2.8.5
qiskit_ibm_ai_local_transpiler==0.1.3
qiskit_ibm_ai_local_transpiler~=0.2
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# putting multiple requirements on the same line will prevent qiskit-bot
# from correctly updating the versions for the qiskit packages.
requirements = [
"qiskit==1.2.4",
"qiskit~=1.3",
"backoff~=2.0",
"qiskit-qasm3-import~=0.4",
"requests~=2.0",
Expand Down Expand Up @@ -58,7 +58,7 @@
install_requires=requirements,
extras_require={
"ai-local-mode": [
"qiskit_ibm_ai_local_transpiler==0.1.3",
"qiskit_ibm_ai_local_transpiler~=0.2",
"qiskit-ibm-runtime>=0.23.0",
],
},
Expand Down
Loading