Merge pull request #272 from MichaelBroughton/dagger_fix

Fixes incorrect matrix being used in ApplyGateDagger.
quantumlib · Jan 26, 2021 · 3824fb2 · 3824fb2
2 parents deffaa5 + 8b57ee2
commit 3824fb2
Show file tree

Hide file tree

Showing 5 changed files with 391 additions and 1 deletion.
diff --git a/lib/gate_appl.h b/lib/gate_appl.h
@@ -64,7 +64,7 @@ inline void ApplyGateDagger(const Simulator& simulator, const Gate& gate,
       simulator.ApplyGate(gate.qubits, matrix.data(), state);
     } else {
       simulator.ApplyControlledGate(gate.qubits, gate.controlled_by,
-                                    gate.cmask, gate.matrix.data(), state);
+                                    gate.cmask, matrix.data(), state);
     }
   }
 }

diff --git a/tests/simulator_avx_test.cc b/tests/simulator_avx_test.cc
@@ -41,6 +41,10 @@ TEST(SimulatorAVXTest, ApplyControlGate) {
   TestApplyControlGate<SimulatorAVX<For>>();
 }
 
+TEST(SimulatorAVXTest, ApplyControlGateDagger) {
+  TestApplyControlGateDagger<SimulatorAVX<For>>();
+}
+
 TEST(SimulatorAVXTest, MultiQubitGates) {
   TestMultiQubitGates<SimulatorAVX<For>>();
 }

diff --git a/tests/simulator_basic_test.cc b/tests/simulator_basic_test.cc
@@ -41,6 +41,10 @@ TEST(SimulatorBasicTest, ApplyControlGate) {
   TestApplyControlGate<SimulatorBasic<For, double>>();
 }
 
+TEST(SimulatorBasicTest, ApplyControlGateDagger) {
+  TestApplyControlGateDagger<SimulatorBasic<For, double>>();
+}
+
 TEST(SimulatorBasicTest, MultiQubitGates) {
   TestMultiQubitGates<SimulatorBasic<For, double>>();
 }

diff --git a/tests/simulator_sse_test.cc b/tests/simulator_sse_test.cc
@@ -41,6 +41,10 @@ TEST(SimulatorSSETest, ApplyControlGate) {
   TestApplyControlGate<SimulatorSSE<For>>();
 }
 
+TEST(SimulatorSSETest, ApplyControlGateDagger) {
+  TestApplyControlGateDagger<SimulatorSSE<For>>();
+}
+
 TEST(SimulatorSSETest, MultiQubitGates) {
   TestMultiQubitGates<SimulatorSSE<For>>();
 }