Merge branch 'master' into py-311

quantumlib · May 2, 2023 · 25c66c5 · 25c66c5
2 parents 2af5ad7 + e014637
commit 25c66c5
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/docs/cirq_interface.md b/docs/cirq_interface.md
@@ -190,7 +190,7 @@ is required to enable GPU execution:
 library if set to any other value.
 
 If `use_gpu` is set and `gpu_mode` is set to 0, the remaining parameters can
-optionally be set to fine-tune StateSpace perfomance for a specific device.
+optionally be set to fine-tune StateSpace performance for a specific device.
 In most cases, the default values provide good performance.
 * `gpu_state_threads`: number of threads per CUDA block to use for the GPU
 StateSpace. This must be a power of 2 in the range [32, 1024].

diff --git a/docs/tutorials/gcp_cpu.md b/docs/tutorials/gcp_cpu.md
@@ -20,7 +20,7 @@ instance heading, ensure that your VM has the following properties:
        experiment, see [Choosing hardware for your qsim
        simulation](/qsim/choose_hw).
 *   In the **Boot disk section**, click the **Change** button, and choose
-    **Container-Optimized** operating system. This overrides the seletion in
+    **Container-Optimized** operating system. This overrides the selection in
     step 3 in [Create a Linux VM
     instance](https://cloud.google.com/compute/docs/quickstart-linux#create_a_linux_vm_instance).
 *   In the **Firewall** section, ensure that both the **Allow HTTP traffic**

diff --git a/lib/fuser_basic.h b/lib/fuser_basic.h
@@ -81,7 +81,7 @@ class BasicGateFuser final : public Fuser<IO, Gate> {
    * @param gates The gates (or pointers to the gates) to be fused.
    *   Gate times of the gates that act on the same qubits should be ordered.
    *   Gates that are out of time order should not cross the time boundaries
-   *   set by `times_to_split_at` or by measurment gates.
+   *   set by `times_to_split_at` or by measurement gates.
    * @param times_to_split_at Ordered list of time steps (boundaries) at which
    *   to separate fused gates. Each element of the output will contain gates
    *   from a single 'window' in this list.

diff --git a/lib/fuser_mqubit.h b/lib/fuser_mqubit.h
@@ -180,7 +180,7 @@ class MultiQubitGateFuser final : public Fuser<IO, Gate> {
    * @param gates The gates (or pointers to the gates) to be fused.
    *   Gate times of the gates that act on the same qubits should be ordered.
    *   Gates that are out of time order should not cross the time boundaries
-   *   set by `times_to_split_at` or by measurment gates.
+   *   set by `times_to_split_at` or by measurement gates.
    * @param times_to_split_at Ordered list of time steps (boundaries) at which
    *   to separate fused gates. Each element of the output will contain gates
    *   from a single 'window' in this list.

diff --git a/lib/hybrid.h b/lib/hybrid.h
@@ -132,7 +132,7 @@ struct HybridSimulator final {
    * on the cut.
    * @param parts Lattice sections to be simulated.
    * @param gates List of all gates in the circuit.
-   * @param hd Output data with splitted parts.
+   * @param hd Output data with split parts.
    * @return True if the splitting done successfully; false otherwise.
    */
   static bool SplitLattice(const std::vector<unsigned>& parts,

diff --git a/lib/simmux_gpu.h b/lib/simmux_gpu.h
@@ -18,12 +18,12 @@
 #ifdef __CUSTATEVEC__
 # include "simulator_custatevec.h"
   namespace qsim {
-    using SimulatorGpu = SimulatorCuStateVec;
+    using SimulatorGpu = SimulatorCuStateVec<>;
   }
 #else
 # include "simulator_cuda.h"
   namespace qsim {
-    using SimulatorGpu = SimulatorCUDA;
+    using SimulatorGpu = SimulatorCUDA<>;
   }
 #endif
 

diff --git a/qsimcirq/_version.py b/qsimcirq/_version.py
@@ -1,3 +1,3 @@
 """The version number defined here is read automatically in setup.py."""
 
-__version__ = "0.16.0"
+__version__ = "0.16.1"
diff --git a/third_party/cuquantum/cuquantum_configure.bzl b/third_party/cuquantum/cuquantum_configure.bzl
@@ -196,7 +196,12 @@ def _symlink_genrule_for_dir(
 
 
 def _cuquantum_pip_impl(repository_ctx):
-    cuquantum_root = repository_ctx.os.environ[_CUQUANTUM_ROOT]
+    if _CUQUANTUM_ROOT in repository_ctx.os.environ:
+      cuquantum_root = repository_ctx.os.environ[_CUQUANTUM_ROOT]
+    else:
+      repository_ctx.os.environ[_CUQUANTUM_ROOT] = ""
+      cuquantum_root = ""
+
     if cuquantum_root == "":
       cuquantum_header_path = _find_file(repository_ctx, "custatevec.h")
       cuquantum_header_path = cuquantum_header_path[:cuquantum_header_path.find("/custatevec.h")]