From 3b774aa24ab8b8e6d6c31c28d4433d5ecae557f7 Mon Sep 17 00:00:00 2001 From: DanPuzzuoli Date: Thu, 30 Mar 2023 08:41:44 -0700 Subject: [PATCH 1/3] setting upperbound on JAX version --- setup.py | 4 ++-- tox.ini | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index 35c9f48de..0404a2bc7 100644 --- a/setup.py +++ b/setup.py @@ -23,8 +23,8 @@ "multiset>=3.0.1", ] -jax_extras = ['jax>=0.2.26', - 'jaxlib>=0.1.75'] +jax_extras = ['jax>=0.2.26, <= 0.4.6', + 'jaxlib>=0.1.75, <= 0.4.6'] PACKAGES = setuptools.find_packages(exclude=['test*']) diff --git a/tox.ini b/tox.ini index 6e65c3521..b66d0513d 100644 --- a/tox.ini +++ b/tox.ini @@ -15,15 +15,15 @@ commands = stestr run {posargs} [testenv:jax] deps = -r{toxinidir}/requirements-dev.txt - jax - jaxlib + jax<=0.4.6 + jaxlib<=0.4.6 diffrax [testenv:lint] deps = -r{toxinidir}/requirements-dev.txt - jax - jaxlib + jax<=0.4.6 + jaxlib<=0.4.6 diffrax commands = black --check {posargs} qiskit_dynamics test @@ -37,8 +37,8 @@ commands = black {posargs} qiskit_dynamics test [testenv:docs] deps = -r{toxinidir}/requirements-dev.txt - jax - jaxlib + jax<=0.4.6 + jaxlib<=0.4.6 diffrax commands = sphinx-build -b html -W {posargs} docs/ docs/_build/html From 14799d2504b0a22994b0975b43043d4a8258a6e7 Mon Sep 17 00:00:00 2001 From: DanPuzzuoli Date: Thu, 30 Mar 2023 12:17:51 -0700 Subject: [PATCH 2/3] adding explicit None properties for CX gate in tutorial --- docs/tutorials/dynamics_backend.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/tutorials/dynamics_backend.rst b/docs/tutorials/dynamics_backend.rst index aca14ba86..11d8df3d9 100644 --- a/docs/tutorials/dynamics_backend.rst +++ b/docs/tutorials/dynamics_backend.rst @@ -318,8 +318,9 @@ To enable running of the single qubit experiments, we add the following to the ` backend. - Add definitions of ``RZ`` gates as phase shifts. These instructions control the phase of the drive channels, as well as any control channels acting on a given qubit. -- Add a ``CX`` gate which applies to all qubits. While this tutorial will not be utilizing it, this - ensures that validation steps checking that the device is fully connected will pass. +- Add a ``CX`` gate between qubits :math:`(0, 1)` and :math:`(1, 0)`. While this tutorial will not + be utilizing it, this ensures that validation steps checking that the device is fully connected + will pass. .. jupyter-execute:: @@ -336,7 +337,7 @@ To enable running of the single qubit experiments, we add the following to the ` target.add_instruction(XGate(), properties={(0,): None, (1,): None}) target.add_instruction(SXGate(), properties={(0,): None, (1,): None}) - target.add_instruction(CXGate()) + target.add_instruction(CXGate(), properties={(0, 1): None, (1, 0): None}) # Add RZ instruction as phase shift for drag cal phi = Parameter("phi") From dab07043b53a276acfc714b856bb1f181c8a1383 Mon Sep 17 00:00:00 2001 From: DanPuzzuoli Date: Thu, 30 Mar 2023 12:19:33 -0700 Subject: [PATCH 3/3] removing line in tutorial adding CRPulseGate to target --- docs/tutorials/dynamics_backend.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/tutorials/dynamics_backend.rst b/docs/tutorials/dynamics_backend.rst index 11d8df3d9..371b365ac 100644 --- a/docs/tutorials/dynamics_backend.rst +++ b/docs/tutorials/dynamics_backend.rst @@ -473,11 +473,6 @@ values for the single qubit gates calibrated above. from qiskit_experiments.library import CrossResonanceHamiltonian - backend.target.add_instruction( - instruction=CrossResonanceHamiltonian.CRPulseGate(width=Parameter("width")), - properties={(0, 1): None, (1, 0): None} - ) - cr_ham_experiment = CrossResonanceHamiltonian( qubits=(0, 1), flat_top_widths=np.linspace(0, 5000, 17),