Merge pull request #103 from CQCL/release/1.14

Release/1.14

Author: cqc-melf

.github/workflows/build_and_test.yml

@@ -157,4 +157,4 @@ jobs:
     steps:
     - name: Deploy to GitHub Pages
       id: deployment
-      uses: actions/deploy-pages@v1
+      uses: actions/deploy-pages@v2

.github/workflows/docs/Quantinuum_logo.png .github/workflows/docs/Quantinuum_logo_black.png

@@ -40,9 +40,11 @@ def build_module_docs():
     mod_docs = MODULES_DIR / "docs"
     mod_build = mod_docs / "build"
     conf_copy = mod_docs / "conf.py"
-    logo_copy = mod_docs / "Quantinuum_logo.png"
+    logo_copy_black = mod_docs / "Quantinuum_logo_black.png"
+    logo_copy_white = mod_docs / "Quantinuum_logo_white.png"
     shutil.copy(DOCS_DIR / "conf.py", conf_copy)
-    shutil.copy(DOCS_DIR / "Quantinuum_logo.png", logo_copy)
+    shutil.copy(DOCS_DIR / "Quantinuum_logo_black.png", logo_copy_black)
+    shutil.copy(DOCS_DIR / "Quantinuum_logo_white.png", logo_copy_white)
     remove_dir(mod_build)
     index_rst = mod_docs / "index.rst"
     with open(mod_docs / "intro.txt", "r") as f:
@@ -81,7 +83,8 @@ def build_module_docs():
         fix_links(htmlfile)
     fix_links(mod_build / "searchindex.js")
     conf_copy.unlink()
-    logo_copy.unlink()
+    logo_copy_black.unlink()
+    logo_copy_white.unlink()
     index_rst.unlink()
 
 

.github/workflows/docs/Quantinuum_logo_white.png

@@ -21,14 +21,16 @@
     "repository_url": "https://github.com/CQCL/pytket-qiskit",
     "use_repository_button": True,
     "use_issues_button": True,
+    "logo": {
+        "image_light": "Quantinuum_logo_black.png",
+        "image_dark": "Quantinuum_logo_white.png",
+    },
 }
 
 html_static_path = ["_static"]
 
 html_css_files = ["custom.css"]
 
-html_logo = "Quantinuum_logo.png"
-
 # -- Extension configuration -------------------------------------------------
 
 pytketdoc_base = "https://cqcl.github.io/tket/pytket/api/"

.github/workflows/docs/build-docs

@@ -1,3 +1,3 @@
 sphinx ~= 4.3.2
-sphinx_book_theme ~= 0.3.3
+sphinx_book_theme >= 1.0.1, <2.0
 sphinx-copybutton

.github/workflows/docs/conf.py

@@ -1,2 +1,2 @@
-__extension_version__ = "0.37.1"
+__extension_version__ = "0.38.0"
 __extension_name__ = "pytket-qiskit"

.github/workflows/docs/requirements.txt

@@ -16,10 +16,6 @@
     background-color: #d9d9d9;
 }
 
-.caption-text {
-    color: #000000;
-}
-
 .btn-link:visited,
 .btn-link,
 a:visited,
@@ -30,13 +26,8 @@ a:visited,
 .wy-menu-vertical ul,
 .span.pre,
 .sig-param,
-.std.std-ref,
-a {
-    color: #544d4d;
-}
-
-:root {
-    --pst-color-inline-code: 199, 37, 78 !important;
+html[data-theme=light] {
+    --pst-color-inline-code: rgb(199, 37, 78) !important;
 }
 
 .sig-name {

_metadata.py

@@ -1,8 +1,16 @@
 Changelog
 ~~~~~~~~~
 
+0.38.0 (April 2023)
+-------------------
+
+* Fix to ensure that the :py:class:`IBMBackend` and :py:class:`IBMQEmulatorBackend` both properly enforce :py:class:`MaxNQubitsPredicate`.
+* Update qiskit version to 0.42.
+* Updated pytket version requirement to 1.14.
+
 0.37.1 (March 2023)
 -------------------
+
 * Fix backend settings for AerStateBackend and AerUnitaryBackend
 
 0.37.0 (March 2023)

docs/_static/custom.css

@@ -40,7 +40,12 @@ The :py:class:`AerBackend` also supports GPU simulation which can be configured
   from pytket.extensions.qiskit import AerBackend
 
   backend = AerBackend()
-  backend._backend.set_option("device", "GPU")
+  backend._qiskit_backend.set_option("device", "GPU")
+
+.. note:: Making use of GPU simulation requires the qiskit-aer-gpu package. This can be installed with the command
+  ::
+
+    pip install qiskit-aer-gpu
 
 Access and Credentials
 ======================

docs/changelog.rst

@@ -79,6 +79,7 @@
     GateSetPredicate,
     NoClassicalControlPredicate,
     NoFastFeedforwardPredicate,
+    MaxNQubitsPredicate,
     Predicate,
 )
 from pytket.extensions.qiskit.qiskit_convert import tk_to_qiskit, _tk_gate_set
@@ -323,6 +324,7 @@ def available_devices(cls, **kwargs: Any) -> List[BackendInfo]:
     def required_predicates(self) -> List[Predicate]:
         predicates = [
             NoSymbolsPredicate(),
+            MaxNQubitsPredicate(self._backend_info.n_nodes),
             GateSetPredicate(
                 self._backend_info.gate_set.union(
                     {
@@ -466,7 +468,7 @@ def process_circuits(
                         circuits=qcs,
                         dynamic=self.backend_info.supports_fast_feedforward,
                     )
-                    job_id = job.job_id
+                    job_id = job.job_id()
                     for i, ind in enumerate(indices_chunk):
                         handle_list[ind] = ResultHandle(
                             job_id, i, qcs[i].count_ops()["measure"], ppcirc_strs[i]

docs/intro.txt

@@ -177,7 +177,7 @@ def process_circuits(
                 options.seed_simulator = kwargs.get("seed")
                 sampler = Sampler(session=self._session, options=options)
                 job = sampler.run(circuits=qcs)
-                job_id = job.job_id
+                job_id = job.job_id()
                 for i, ind in enumerate(indices_chunk):
                     handle_list[ind] = ResultHandle(
                         job_id, i, c_bit_strs[i], ppcirc_strs[i]

pytket/extensions/qiskit/backends/ibm.py

@@ -77,16 +77,18 @@ def qiskit_experimentresult_to_backendresult(
     header = result.header
     width = header.memory_slots
 
-    c_bits = (
-        [Bit(name, index) for name, index in header.clbit_labels]
-        if hasattr(header, "clbit_labels")
-        else None
-    )
-    q_bits = (
-        [Qubit(name, index) for name, index in header.qubit_labels]
-        if hasattr(header, "qubit_labels")
-        else None
-    )
+    c_bits, q_bits = None, None
+    if hasattr(header, "creg_sizes"):
+        c_bits = []
+        for name, size in header.creg_sizes:
+            for index in range(size):
+                c_bits.append(Bit(name, index))
+    if hasattr(header, "qreg_sizes"):
+        q_bits = []
+        for name, size in header.qreg_sizes:
+            for index in range(size):
+                q_bits.append(Qubit(name, index))
+
     shots, counts, state, unitary = (None,) * 4
     datadict = result.data.to_dict()
     if _result_is_empty_shots(result):

pytket/extensions/qiskit/backends/ibmq_emulator.py

@@ -44,10 +44,10 @@
     packages=find_namespace_packages(include=["pytket.*"]),
     include_package_data=True,
     install_requires=[
-        "pytket ~= 1.13",
-        "qiskit ~= 0.41.0",
-        "qiskit-ibm-runtime ~= 0.8.0",
-        "qiskit-aer ~= 0.11.2",
+        "pytket ~= 1.14",
+        "qiskit ~= 0.42.1",
+        "qiskit-ibm-runtime ~= 0.9.2",
+        "qiskit-aer ~= 0.12.0",
         "numpy",
     ],
     classifiers=[

pytket/extensions/qiskit/result_convert.py

@@ -870,6 +870,7 @@ def test_ibmq_emulator(manila_emulator_backend: IBMQEmulatorBackend) -> None:
 )
 def test_shots_bits_edgecases(n_shots: int, n_bits: int) -> None:
     c = Circuit(n_bits, n_bits)
+    c.measure_all()
     aer_backend = AerBackend()
 
     # TODO TKET-813 add more shot based backends and move to integration tests
@@ -1198,3 +1199,18 @@ def test_sim_qubit_order() -> None:
     circ.X(Qubit("a", 0))
     s = backend.run_circuit(circ).get_state()
     assert np.isclose(abs(s[2]), 1.0)
+
+
+@pytest.mark.skipif(skip_remote_tests, reason=REASON)
+def test_requrired_predicates(manila_emulator_backend: IBMQEmulatorBackend) -> None:
+    # https://github.com/CQCL/pytket-qiskit/issues/93
+    circ = Circuit(7)  # 7 qubit circuit in IBMQ gateset
+    circ.X(0).CX(0, 1).CX(0, 2).CX(0, 3).CX(0, 4).CX(0, 5).CX(0, 6).measure_all()
+    with pytest.raises(CircuitNotValidError) as errorinfo:
+        manila_emulator_backend.run_circuit(circ, n_shots=100)
+        assert (
+            "pytket.backends.backend_exceptions.CircuitNotValidError:"
+            + "Circuit with index 0 in submitted does"
+            + "not satisfy MaxNQubitsPredicate(5)"
+            in str(errorinfo)
+        )