Skip to content

Commit 452a212

Browse files
mhuckamhucka
authored
Merge pull request #838 from mhucka/mhucka-fix-circuit-parser-warnings
Fix warnings about unused variables in circuit_parser_qsim.cc
2 parents e28d106 + 7e8a30d commit 452a212

File tree

2 files changed

+20
-33
lines changed

2 files changed

+20
-33
lines changed

‎tensorflow_quantum/core/src/circuit_parser_qsim.cc‎

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ inline Status TwoConstantGate(
182182
const unsigned int num_qubits, const unsigned int time,
183183
QsimCircuit* circuit, std::vector<GateMetaData>* metadata) {
184184
unsigned int q0, q1;
185-
bool unused = absl::SimpleAtoi(op.qubits(0).id(), &q0);
186-
unused = absl::SimpleAtoi(op.qubits(1).id(), &q1);
185+
(void)absl::SimpleAtoi(op.qubits(0).id(), &q0);
186+
(void)absl::SimpleAtoi(op.qubits(1).id(), &q1);
187187
auto gate = create_f(time, num_qubits - q0 - 1, num_qubits - q1 - 1);
188188
Status s = OptionalInsertControls(op, num_qubits, &gate);
189189
if (!s.ok()) {
@@ -208,10 +208,9 @@ inline Status SingleEigenGate(
208208
const unsigned int num_qubits, const unsigned int time,
209209
QsimCircuit* circuit, std::vector<GateMetaData>* metadata) {
210210
unsigned int q0;
211-
bool unused;
212211
float exp, exp_s, gs;
213212
Status u;
214-
unused = absl::SimpleAtoi(op.qubits(0).id(), &q0);
213+
(void)absl::SimpleAtoi(op.qubits(0).id(), &q0);
215214

216215
absl::optional<std::string> exponent_symbol;
217216
u = ParseProtoArg(op, "exponent", param_map, &exp, &exponent_symbol);
@@ -258,10 +257,9 @@ inline Status TwoEigenGate(
258257
QsimCircuit* circuit, std::vector<GateMetaData>* metadata) {
259258
unsigned int q0, q1;
260259
float exp, exp_s, gs;
261-
bool unused;
262260
Status u;
263-
unused = absl::SimpleAtoi(op.qubits(0).id(), &q0);
264-
unused = absl::SimpleAtoi(op.qubits(1).id(), &q1);
261+
(void)absl::SimpleAtoi(op.qubits(0).id(), &q0);
262+
(void)absl::SimpleAtoi(op.qubits(1).id(), &q1);
265263

266264
absl::optional<std::string> exponent_symbol;
267265
u = ParseProtoArg(op, "exponent", param_map, &exp, &exponent_symbol);
@@ -397,10 +395,9 @@ inline Status PhasedXGate(const Operation& op, const SymbolMap& param_map,
397395
const unsigned int time, QsimCircuit* circuit,
398396
std::vector<GateMetaData>* metadata) {
399397
int q0;
400-
bool unused;
401398
float pexp, pexp_s, exp, exp_s, gs;
402399
Status u;
403-
unused = absl::SimpleAtoi(op.qubits(0).id(), &q0);
400+
(void)absl::SimpleAtoi(op.qubits(0).id(), &q0);
404401

405402
absl::optional<std::string> exponent_symbol;
406403
u = ParseProtoArg(op, "exponent", param_map, &exp, &exponent_symbol);
@@ -457,11 +454,10 @@ inline Status FsimGate(const Operation& op, const SymbolMap& param_map,
457454
QsimCircuit* circuit,
458455
std::vector<GateMetaData>* metadata) {
459456
int q0, q1;
460-
bool unused;
461457
float theta, theta_s, phi, phi_s;
462458
Status u;
463-
unused = absl::SimpleAtoi(op.qubits(0).id(), &q0);
464-
unused = absl::SimpleAtoi(op.qubits(1).id(), &q1);
459+
(void)absl::SimpleAtoi(op.qubits(0).id(), &q0);
460+
(void)absl::SimpleAtoi(op.qubits(1).id(), &q1);
465461

466462
absl::optional<std::string> theta_symbol;
467463
u = ParseProtoArg(op, "theta", param_map, &theta, &theta_symbol);
@@ -514,11 +510,10 @@ inline Status PhasedISwapGate(const Operation& op, const SymbolMap& param_map,
514510
const unsigned int time, QsimCircuit* circuit,
515511
std::vector<GateMetaData>* metadata) {
516512
int q0, q1;
517-
bool unused;
518513
float pexp, pexp_s, exp, exp_s;
519514
Status u;
520-
unused = absl::SimpleAtoi(op.qubits(0).id(), &q0);
521-
unused = absl::SimpleAtoi(op.qubits(1).id(), &q1);
515+
(void)absl::SimpleAtoi(op.qubits(0).id(), &q0);
516+
(void)absl::SimpleAtoi(op.qubits(1).id(), &q1);
522517

523518
absl::optional<std::string> exponent_symbol;
524519
u = ParseProtoArg(op, "exponent", param_map, &exp, &exponent_symbol);
@@ -605,10 +600,9 @@ inline Status AsymmetricDepolarizingChannel(const Operation& op,
605600
const unsigned int time,
606601
NoisyQsimCircuit* ncircuit) {
607602
int q;
608-
bool unused;
609603
float p_x, p_y, p_z;
610604
Status u;
611-
unused = absl::SimpleAtoi(op.qubits(0).id(), &q);
605+
(void)absl::SimpleAtoi(op.qubits(0).id(), &q);
612606

613607
u = ParseProtoArg(op, "p_x", {}, &p_x);
614608
u = ParseProtoArg(op, "p_y", {}, &p_y);
@@ -627,10 +621,9 @@ inline Status DepolarizingChannel(const Operation& op,
627621
const unsigned int time,
628622
NoisyQsimCircuit* ncircuit) {
629623
int q;
630-
bool unused;
631624
float p;
632625
Status u;
633-
unused = absl::SimpleAtoi(op.qubits(0).id(), &q);
626+
(void)absl::SimpleAtoi(op.qubits(0).id(), &q);
634627

635628
u = ParseProtoArg(op, "p", {}, &p);
636629
if (!u.ok()) {
@@ -645,10 +638,9 @@ inline Status DepolarizingChannel(const Operation& op,
645638
inline Status GADChannel(const Operation& op, const unsigned int num_qubits,
646639
const unsigned int time, NoisyQsimCircuit* ncircuit) {
647640
int q;
648-
bool unused;
649641
float p, gamma;
650642
Status u;
651-
unused = absl::SimpleAtoi(op.qubits(0).id(), &q);
643+
(void)absl::SimpleAtoi(op.qubits(0).id(), &q);
652644

653645
u = ParseProtoArg(op, "p", {}, &p);
654646
if (!u.ok()) {
@@ -669,8 +661,7 @@ inline Status ResetChannel(const Operation& op, const unsigned int num_qubits,
669661
const unsigned int time,
670662
NoisyQsimCircuit* ncircuit) {
671663
int q;
672-
bool unused;
673-
unused = absl::SimpleAtoi(op.qubits(0).id(), &q);
664+
(void)absl::SimpleAtoi(op.qubits(0).id(), &q);
674665

675666
auto chan = qsim::Cirq::ResetChannel<float>::Create(time, num_qubits - q - 1);
676667
ncircuit->channels.push_back(chan);
@@ -682,10 +673,9 @@ inline Status AmplitudeDampingChannel(const Operation& op,
682673
const unsigned int time,
683674
NoisyQsimCircuit* ncircuit) {
684675
int q;
685-
bool unused;
686676
float gamma;
687677
Status u;
688-
unused = absl::SimpleAtoi(op.qubits(0).id(), &q);
678+
(void)absl::SimpleAtoi(op.qubits(0).id(), &q);
689679

690680
u = ParseProtoArg(op, "gamma", {}, &gamma);
691681
if (!u.ok()) {
@@ -702,10 +692,9 @@ inline Status PhaseDampingChannel(const Operation& op,
702692
const unsigned int time,
703693
NoisyQsimCircuit* ncircuit) {
704694
int q;
705-
bool unused;
706695
float gamma;
707696
Status u;
708-
unused = absl::SimpleAtoi(op.qubits(0).id(), &q);
697+
(void)absl::SimpleAtoi(op.qubits(0).id(), &q);
709698

710699
u = ParseProtoArg(op, "gamma", {}, &gamma);
711700
if (!u.ok()) {
@@ -723,10 +712,9 @@ inline Status PhaseFlipChannel(const Operation& op,
723712
const unsigned int time,
724713
NoisyQsimCircuit* ncircuit) {
725714
int q;
726-
bool unused;
727715
float p;
728716
Status u;
729-
unused = absl::SimpleAtoi(op.qubits(0).id(), &q);
717+
(void)absl::SimpleAtoi(op.qubits(0).id(), &q);
730718

731719
u = ParseProtoArg(op, "p", {}, &p);
732720
if (!u.ok()) {
@@ -743,10 +731,9 @@ inline Status BitFlipChannel(const Operation& op, const unsigned int num_qubits,
743731
const unsigned int time,
744732
NoisyQsimCircuit* ncircuit) {
745733
int q;
746-
bool unused;
747734
float p;
748735
Status u;
749-
unused = absl::SimpleAtoi(op.qubits(0).id(), &q);
736+
(void)absl::SimpleAtoi(op.qubits(0).id(), &q);
750737

751738
u = ParseProtoArg(op, "p", {}, &p);
752739
if (!u.ok()) {

‎tensorflow_quantum/core/src/circuit_parser_qsim_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Arg MakeControlArg(const std::string& val) {
6464
}
6565

6666
inline void AssertControlEqual(const QsimGate& a, const QsimGate& b) {
67-
for (size_t i = 0; i < a.controlled_by.size(); i++) {
67+
for (unsigned int i = 0; i < a.controlled_by.size(); i++) {
6868
ASSERT_EQ(a.controlled_by[i], b.controlled_by[i]);
6969
}
7070
ASSERT_EQ(a.cmask, b.cmask);
@@ -89,7 +89,7 @@ inline void AssertOneQubitEqual(const QsimGate& a, const QsimGate& b) {
8989

9090
inline void AssertChannelEqual(const QsimChannel& a, const QsimChannel& b) {
9191
ASSERT_EQ(a.size(), b.size());
92-
for (size_t i = 0; i < a.size(); i++) {
92+
for (unsigned int i = 0; i < a.size(); i++) {
9393
ASSERT_EQ(a[i].kind, b[i].kind);
9494
ASSERT_EQ(a[i].unitary, b[i].unitary);
9595
ASSERT_NEAR(a[i].prob, b[i].prob, 1e-5);

0 commit comments

Comments
 (0)