Merge branch 'main' into dependabot/pip/black-approx-eq-25.9.0

mhucka · web-flow · commit 174c1e2b11ee · 2025-10-10T15:40:32.000-07:00
diff --git a/.github/workflows/_build_wheels.yaml b/.github/workflows/_build_wheels.yaml
@@ -49,7 +49,7 @@ jobs:
   build-wheels:
     name: Build on ${{matrix.conf.os}}/${{matrix.conf.arch}}
     runs-on: ${{matrix.conf.os}}
-    timeout-minutes: 30
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/ci_build_library.yaml b/.github/workflows/ci_build_library.yaml
@@ -18,7 +18,6 @@ run-name: Build the library on different platforms and run tests
 on:
   push:
     branches:
-      - master
       - main
 
   pull_request:
@@ -53,7 +52,7 @@ jobs:
     needs: find-changes
     runs-on: ${{matrix.conf.os}}
     continue-on-error: true
-    timeout-minutes: 30
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/ci_build_wheels.yaml b/.github/workflows/ci_build_wheels.yaml
@@ -18,7 +18,6 @@ run-name: Build Python wheels and verify them
 on:
   push:
     branches:
-      - master
       - main
 
   pull_request:
diff --git a/.github/workflows/ci_docker_tests.yaml b/.github/workflows/ci_docker_tests.yaml
@@ -18,7 +18,6 @@ run-name: Build Docker images and test them
 on:
   push:
     branches:
-      - master
       - main
 
   pull_request:
@@ -53,7 +52,7 @@ jobs:
     needs: find-changes
     runs-on: ubuntu-24.04
     continue-on-error: true
-    timeout-minutes: 30
+    timeout-minutes: 60
     env:
       # The next environment variable is used by Docker.
       BUILDKIT_PROGRESS: ${{inputs.debug && 'plain' || ''}}
diff --git a/.github/workflows/ci_format_checks.yml b/.github/workflows/ci_format_checks.yml
@@ -18,7 +18,6 @@ run-name: Check source code with linters and formatters
 on:
   push:
     branches:
-      - master
       - main
 
   pull_request:
diff --git a/.github/workflows/ci_hardware_options.yaml b/.github/workflows/ci_hardware_options.yaml
@@ -18,7 +18,6 @@ run-name: Test with instruction set extensions and parallelism
 on:
   push:
     branches:
-      - master
       - main
 
   pull_request:
@@ -53,7 +52,7 @@ jobs:
     needs: find-changes
     runs-on: ubuntu-24.04
     continue-on-error: true
-    timeout-minutes: 30
+    timeout-minutes: 60
     strategy:
       matrix:
         # Hardware optimizers.
diff --git a/.github/workflows/ci_sanitizer_tests.yaml b/.github/workflows/ci_sanitizer_tests.yaml
@@ -18,7 +18,6 @@ run-name: Test with address and memory sanitizers
 on:
   push:
     branches:
-      - master
       - main
 
   pull_request:
diff --git a/.github/workflows/ci_tcmalloc_test.yaml b/.github/workflows/ci_tcmalloc_test.yaml
@@ -18,7 +18,6 @@ run-name: Test with TCMalloc (thread-caching malloc)
 on:
   push:
     branches:
-      - master
       - main
 
   pull_request:
diff --git a/.github/workflows/osv-scanner.yaml b/.github/workflows/osv-scanner.yaml
@@ -31,7 +31,6 @@ on:
     types: [opened, synchronize]
     branches:
       - main
-      - master
 
   # Support merge queues.
   merge_group:
@@ -59,7 +58,7 @@ jobs:
     if: github.repository_owner == 'quantumlib'
     name: OSV scanner
     runs-on: ubuntu-24.04
-    timeout-minutes: 15
+    timeout-minutes: 30
     permissions:
       # Needed to upload the results to code-scanning dashboard:
       security-events: write
diff --git a/.github/workflows/release_wheels.yml b/.github/workflows/release_wheels.yml
@@ -41,7 +41,7 @@ jobs:
     name: Publish wheels
     needs: build-wheels
     runs-on: ubuntu-24.04
-    timeout-minutes: 30
+    timeout-minutes: 60
     steps:
     - name: Retrieve saved wheels
       uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
diff --git a/.github/workflows/scorecard-scanner.yaml b/.github/workflows/scorecard-scanner.yaml
@@ -29,7 +29,6 @@ on:
     types: [opened, synchronize]
     branches:
       - main
-      - master
 
   # Support merge queues.
   merge_group:
diff --git a/README.md b/README.md
@@ -56,9 +56,9 @@ vol.&nbsp;574](https://www.nature.com/articles/s41586-019-1666-5), 2019).
 ### C++ usage
 
 The code is basically designed as a library. The user can modify sample
-applications in [apps](https://github.com/quantumlib/qsim/tree/master/apps)
+applications in [apps](https://github.com/quantumlib/qsim/tree/main/apps)
 to meet their own needs. The usage of sample applications is described in the
-[docs](https://github.com/quantumlib/qsim/blob/master/docs/usage.md).
+[docs](https://github.com/quantumlib/qsim/blob/main/docs/usage.md).
 
 ### Python usage
 
@@ -78,7 +78,7 @@ conda install -c conda-forge qsimcirq
 ```
 
 _Note_: The core qsim library (located in the source repository under the
-[`lib/`](https://github.com/quantumlib/qsim/blob/master/lib) subdirectory) can
+[`lib/`](https://github.com/quantumlib/qsim/blob/main/lib) subdirectory) can
 be included directly in C++ programs without installing the Python interface.
 
 ### Cirq usage
@@ -87,31 +87,31 @@ be included directly in C++ programs without installing the Python interface.
 invoking Noisy Intermediate-Scale Quantum (NISQ) circuits. Cirq can use qsim
 as its simulation library. To get started with simulating Cirq circuits using
 qsim, please refer to the
-[tutorial](https://github.com/quantumlib/qsim/blob/master/docs/tutorials/qsimcirq.ipynb).
+[tutorial](https://github.com/quantumlib/qsim/blob/main/docs/tutorials/qsimcirq.ipynb).
 
 More detailed information about the qsim-Cirq API can be found in the
-[docs](https://github.com/quantumlib/qsim/blob/master/docs/cirq_interface.md).
+[docs](https://github.com/quantumlib/qsim/blob/main/docs/cirq_interface.md).
 
 ### Input format
 
 > [!WARNING]
 > This format is deprecated, and no longer actively maintained.
 
 The circuit input format is described in the
-[docs](https://github.com/quantumlib/qsim/blob/master/docs/input_format.md).
+[docs](https://github.com/quantumlib/qsim/blob/main/docs/input_format.md).
 
 ### Sample circuits
 
 A number of sample circuits are provided in
-[circuits](https://github.com/quantumlib/qsim/tree/master/circuits).
+[circuits](https://github.com/quantumlib/qsim/tree/main/circuits).
 
 ### Unit tests
 
 Unit tests for C++ libraries use the
 [GoogleTest](https://github.com/google/googletest) framework, and are located in
-[tests](https://github.com/quantumlib/qsim/tree/master/tests). Python tests use
+[tests](https://github.com/quantumlib/qsim/tree/main/tests). Python tests use
 [pytest](https://docs.pytest.org/en/stable/), and are located in
-[qsimcirq_tests](https://github.com/quantumlib/qsim/tree/master/qsimcirq_tests).
+[qsimcirq_tests](https://github.com/quantumlib/qsim/tree/main/qsimcirq_tests).
 
 To build and run all tests, run:
 
diff --git a/check/format-incremental b/check/format-incremental
@@ -2,7 +2,7 @@
 
 ################################################################################
 # Based on the Cirq python-formatting script:
-# https://github.com/quantumlib/Cirq/blob/master/check/format-incremental
+# https://github.com/quantumlib/Cirq/blob/main/check/format-incremental
 #
 # Formats python files that have been modified.
 #
@@ -22,14 +22,14 @@
 #
 # You can specify a base git revision to compare against (i.e. to use when
 # determining whether or not a file is considered to have "changed"). For
-# example, you can compare against 'origin/master' or 'HEAD~1'.
+# example, you can compare against 'origin/main' or 'HEAD~1'.
 #
 # If you don't specify a base revision, the following defaults will be tried, in
 # order, until one exists:
 #
-#     1. upstream/master
-#     2. origin/master
-#     3. master
+#     1. upstream/main
+#     2. origin/main
+#     3. main
 #
 # If none exists, the script fails.
 ################################################################################
@@ -63,14 +63,14 @@ done
 if (( only_changed == 1 )); then
     # Figure out which branch to compare against.
     if [ -z "${rev}" ]; then
-        if [ "$(git cat-file -t upstream/master 2> /dev/null)" == "commit" ]; then
-            rev=upstream/master
-        elif [ "$(git cat-file -t origin/master 2> /dev/null)" == "commit" ]; then
-            rev=origin/master
-        elif [ "$(git cat-file -t master 2> /dev/null)" == "commit" ]; then
-            rev=master
+        if [ "$(git cat-file -t upstream/main 2> /dev/null)" == "commit" ]; then
+            rev=upstream/main
+        elif [ "$(git cat-file -t origin/main 2> /dev/null)" == "commit" ]; then
+            rev=origin/main
+        elif [ "$(git cat-file -t main 2> /dev/null)" == "commit" ]; then
+            rev=main
         else
-            echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/master' or 'HEAD~1').\033[0m" >&2
+            echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/main' or 'HEAD~1').\033[0m" >&2
             exit 1
         fi
     fi
diff --git a/docs/_scripts/build_api_docs.py b/docs/_scripts/build_api_docs.py
@@ -27,7 +27,7 @@
 
 flags.DEFINE_string(
     "code_url_prefix",
-    ("https://github.com/quantumlib/qsim/tree/master/" "qsimcirq"),
+    ("https://github.com/quantumlib/qsim/tree/main/" "qsimcirq"),
     "The url prefix for links to code.",
 )
 
diff --git a/docs/cirq_interface.md b/docs/cirq_interface.md
@@ -44,7 +44,7 @@ directory.
 make run-py-tests
 ```
 This will run
-[qsimcirq_test](https://github.com/quantumlib/qsim/blob/master/qsimcirq_tests/qsimcirq_test.py),
+[qsimcirq_test](https://github.com/quantumlib/qsim/blob/main/qsimcirq_tests/qsimcirq_test.py),
 which invokes qsim through the qsim-Cirq interface.
 
 ## Interface design and operations
@@ -79,7 +79,7 @@ average PC, or up to 40 qubits on high-performance VMs).
 Options for the simulator, including number of threads and verbosity, can be
 set with the `qsim_options` field, which accepts a `QSimOptions` object as
 defined in
-[qsim_simulator.py](https://github.com/quantumlib/qsim/blob/master/qsimcirq/qsim_simulator.py).
+[qsim_simulator.py](https://github.com/quantumlib/qsim/blob/main/qsimcirq/qsim_simulator.py).
 These options can also be passed as a {str: val} dict, using the format
 described by that class.
 
diff --git a/docs/input_format.md b/docs/input_format.md
@@ -15,7 +15,7 @@ time gate_name qubits parameters
 Here `time` refers to when the gate is applied in the circuit. Gates with the same time can be
 applied independently and they may be reordered for performance. Trailing
 spaces or characters are not allowed. A number of sample circuits are provided
-in [circuits](https://github.com/quantumlib/qsim/blob/master/circuits).
+in [circuits](https://github.com/quantumlib/qsim/blob/main/circuits).
 
 # Supported gates
 
diff --git a/docs/install_qsimcirq.md b/docs/install_qsimcirq.md
@@ -5,7 +5,7 @@ For all others, Dockerfiles are provided to install qsim in a containerized
 environment.
 
 **Note:** The core qsim library (under
-[lib/](https://github.com/quantumlib/qsim/blob/master/lib)) can be included
+[lib/](https://github.com/quantumlib/qsim/blob/main/lib)) can be included
 directly in C++ code without building and installing the qsimcirq interface.
 
 ## Before installation
@@ -14,12 +14,12 @@ Prior to installation, consider opening a
 [virtual environment](https://packaging.python.org/guides/installing-using-pip-and-virtual-environments/).
 
 Prerequisites are included in the
-[`requirements.txt`](https://github.com/quantumlib/qsim/blob/master/requirements.txt)
+[`requirements.txt`](https://github.com/quantumlib/qsim/blob/main/requirements.txt)
 file, and will be automatically installed along with qsimcirq.
 
 If you'd like to develop qsimcirq, a separate set of dependencies are includes
 in the
-[`dev-requirements.txt`](https://github.com/quantumlib/qsim/blob/master/dev-requirements.txt)
+[`dev-requirements.txt`](https://github.com/quantumlib/qsim/blob/main/dev-requirements.txt)
 file. You can install them with `pip3 install -r dev-requirements.txt` or
 `pip3 install qsimcirq[dev]`.
 
diff --git a/docs/overview.md b/docs/overview.md
@@ -13,9 +13,9 @@ of qsim in cross-entropy benchmarks
 
 Integration with [Cirq](https://github.com/quantumlib/Cirq) makes getting
 started with qsim easy! Check out the
-[installation guide](https://github.com/quantumlib/qsim/blob/master/docs/install_qsimcirq.md)
+[installation guide](https://github.com/quantumlib/qsim/blob/main/docs/install_qsimcirq.md)
 or try the runnable
-[notebook tutorial](https://github.com/quantumlib/qsim/blob/master/docs/tutorials/qsimcirq.ipynb).
+[notebook tutorial](https://github.com/quantumlib/qsim/blob/main/docs/tutorials/qsimcirq.ipynb).
 
 ## Design
 
diff --git a/docs/tutorials/gcp_cpu.md b/docs/tutorials/gcp_cpu.md
@@ -227,7 +227,7 @@ Instances dashboard to prevent further billing.
 
 You are now ready to run your own large simulations on Google Cloud. If you want
 to try a large circuit on Google Cloud, you can connect the
-[Simulate a large quantum circuit](https://colab.sandbox.google.com/github/quantumlib/qsim/blob/master/docs/tutorials/q32d14.ipynb)
+[Simulate a large quantum circuit](https://colab.sandbox.google.com/github/quantumlib/qsim/blob/main/docs/tutorials/q32d14.ipynb)
 Colab notebook to your VM
 ([documentation](https://quantumai.google/qsim/tutorials/q32d14)).
 
diff --git a/docs/tutorials/noisy_qsimcirq.ipynb b/docs/tutorials/noisy_qsimcirq.ipynb
@@ -59,10 +59,10 @@
     "    <a target=\"_blank\" href=\"https://quantumai.google/qsim/tutorials/noisy_qsimcirq\"><img src=\"https://quantumai.google/site-assets/images/buttons/quantumai_logo_1x.png\" />View on QuantumAI</a>\n",
     "  </td>\n",
     "  <td>\n",
-    "    <a target=\"_blank\" href=\"https://colab.research.google.com/github/quantumlib/qsim/blob/master/docs/tutorials/noisy_qsimcirq.ipynb\"><img src=\"https://quantumai.google/site-assets/images/buttons/colab_logo_1x.png\" />Run in Google Colab</a>\n",
+  "    <a target=\"_blank\" href=\"https://colab.research.google.com/github/quantumlib/qsim/blob/main/docs/tutorials/noisy_qsimcirq.ipynb\"><img src=\"https://quantumai.google/site-assets/images/buttons/colab_logo_1x.png\" />Run in Google Colab</a>\n",
     "  </td>\n",
     "  <td>\n",
-    "    <a target=\"_blank\" href=\"https://github.com/quantumlib/qsim/blob/master/docs/tutorials/noisy_qsimcirq.ipynb\"><img src=\"https://quantumai.google/site-assets/images/buttons/github_logo_1x.png\" />View source on GitHub</a>\n",
+  "    <a target=\"_blank\" href=\"https://github.com/quantumlib/qsim/blob/main/docs/tutorials/noisy_qsimcirq.ipynb\"><img src=\"https://quantumai.google/site-assets/images/buttons/github_logo_1x.png\" />View source on GitHub</a>\n",
     "  </td>\n",
     "  <td>\n",
     "    <a href=\"https://storage.googleapis.com/tensorflow_docs/qsim/docs/tutorials/noisy_qsimcirq.ipynb\"><img src=\"https://quantumai.google/site-assets/images/buttons/download_icon_1x.png\" />Download notebook</a>\n",
diff --git a/docs/tutorials/q32d14.ipynb b/docs/tutorials/q32d14.ipynb
diff --git a/docs/tutorials/qsimcirq.ipynb b/docs/tutorials/qsimcirq.ipynb
diff --git a/docs/tutorials/qsimcirq_gcp.md b/docs/tutorials/qsimcirq_gcp.md
diff --git a/docs/type_reference.md b/docs/type_reference.md
diff --git a/docs/usage.md b/docs/usage.md
diff --git a/lib/circuit_qsim_parser.h b/lib/circuit_qsim_parser.h
