Merge branch 'master' into mh-fix-291

Author: mhucka

.gitignore

@@ -1,3 +1,17 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # ignore compiled python files
 __pycache__
 *.pyc
@@ -39,3 +53,6 @@ docs/generated
 
 # Default pycharm virtual env
 .venv/
+
+# Ignore file generated by dev_tools/write-ci-requirements.py
+ci-requirements.txt

docs/otoc/otoc_example.ipynb

@@ -671,7 +671,6 @@
     "\n",
     "        job = sampler.run_batch(\n",
     "            programs=circuits_ic, \n",
-    "            params_list=[{} for _ in range(len(circuits_ic))], \n",
     "            repetitions=int(2_000 + 10_000 * (c / max(cycles)) ** 3),\n",
     "        )\n",
     "\n",

recirq/documentation_utils.py

@@ -15,6 +15,7 @@
 import inspect
 import io
 import os
+import pathlib
 import re
 import tarfile
 import urllib.request
@@ -63,7 +64,8 @@ def fetch_guide_data_collection_data(base_dir=None):
     if base_dir is None:
         from recirq.readout_scan.tasks import DEFAULT_BASE_DIR as base_dir
 
-    if os.path.exists(f'{base_dir}/2020-02-tutorial'):
+    file_count = sum(1 for _ in pathlib.Path(base_dir).glob("2020-02-tutorial/Syc23-*/q-*/*.json"))
+    if file_count >= 5:
         return
 
     print("Downloading guide/data_collection data.")

recirq/otoc/otoc_example.py

@@ -93,8 +93,7 @@ def main():
         for c, circuits_ic in enumerate(circuits_i):
             print("Measuring circuit instance {}, cycle {}...".format(i, c))
             stats = int(2000 + 10000 * (c / max(cycles)) ** 3)
-            params = [{} for _ in range(len(circuits_ic))]
-            job = sampler.run_batch(programs=circuits_ic, params_list=params, repetitions=stats)
+            job = sampler.run_batch(programs=circuits_ic, repetitions=stats)
             for d in range(num_qubits):
                 p = np.mean(job[4 * d][0].measurements["z"])
                 p -= np.mean(job[4 * d + 1][0].measurements["z"])

recirq/otoc/otoc_test.py

@@ -56,8 +56,7 @@ def test_build_otoc_circuits():
         circuits.extend(circs.butterfly_I)
 
     results = []
-    params = [{} for _ in range(len(circuits))]
-    job = sampler.run_batch(programs=circuits, params_list=params, repetitions=2000)
+    job = sampler.run_batch(programs=circuits, repetitions=2000)
     for d in range(len(circuits)):
         results.append(abs(np.mean(job[d][0].measurements["z"])))
 

recirq/otoc/parallel_xeb_example.py

@@ -75,8 +75,7 @@ def main():
             sq_gates.append(sq_gate_indices_i)
             for c in circuits:
                 c.append(cirq.measure(*qubits, key="z"))
-            sweep_params = [{} for _ in range(len(circuits))]
-            job = sampler.run_batch(programs=circuits, params_list=sweep_params, repetitions=5000)
+            job = sampler.run_batch(programs=circuits, repetitions=5000)
             bits.append([job[j][0].measurements["z"] for j in range(num_cycles)])
         all_bits.append(bits)
         all_sq_gates.append(sq_gates)

recirq/otoc/parallel_xeb_test.py

@@ -47,8 +47,7 @@ def test_parallel_xeb_fidelities() -> None:
             sq_gates.append(sq_gate_indices_i)
             for c in circuits:
                 c.append(cirq.measure(*qubits, key="z"))
-            sweep_params = [{} for _ in range(len(circuits))]
-            job = sampler.run_batch(programs=circuits, params_list=sweep_params, repetitions=5000)
+            job = sampler.run_batch(programs=circuits, repetitions=5000)
             bits.append([job[j][0].measurements["z"] for j in range(num_cycles)])
         all_bits.append(bits)
         all_sq_gates.append(sq_gates)