Skip to content

Commit

Permalink
Merge pull request #838 from mhucka/mhucka-fix-circuit-parser-warnings
Browse files Browse the repository at this point in the history
Fix warnings about unused variables in circuit_parser_qsim.cc
  • Loading branch information
mhucka authored Jan 13, 2025
2 parents e28d106 + 7e8a30d commit 452a212
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 33 deletions.
49 changes: 18 additions & 31 deletions tensorflow_quantum/core/src/circuit_parser_qsim.cc
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ inline Status TwoConstantGate(
const unsigned int num_qubits, const unsigned int time,
QsimCircuit* circuit, std::vector<GateMetaData>* metadata) {
unsigned int q0, q1;
bool unused = absl::SimpleAtoi(op.qubits(0).id(), &q0);
unused = absl::SimpleAtoi(op.qubits(1).id(), &q1);
(void)absl::SimpleAtoi(op.qubits(0).id(), &q0);
(void)absl::SimpleAtoi(op.qubits(1).id(), &q1);
auto gate = create_f(time, num_qubits - q0 - 1, num_qubits - q1 - 1);
Status s = OptionalInsertControls(op, num_qubits, &gate);
if (!s.ok()) {
Expand All @@ -208,10 +208,9 @@ inline Status SingleEigenGate(
const unsigned int num_qubits, const unsigned int time,
QsimCircuit* circuit, std::vector<GateMetaData>* metadata) {
unsigned int q0;
bool unused;
float exp, exp_s, gs;
Status u;
unused = absl::SimpleAtoi(op.qubits(0).id(), &q0);
(void)absl::SimpleAtoi(op.qubits(0).id(), &q0);

absl::optional<std::string> exponent_symbol;
u = ParseProtoArg(op, "exponent", param_map, &exp, &exponent_symbol);
Expand Down Expand Up @@ -258,10 +257,9 @@ inline Status TwoEigenGate(
QsimCircuit* circuit, std::vector<GateMetaData>* metadata) {
unsigned int q0, q1;
float exp, exp_s, gs;
bool unused;
Status u;
unused = absl::SimpleAtoi(op.qubits(0).id(), &q0);
unused = absl::SimpleAtoi(op.qubits(1).id(), &q1);
(void)absl::SimpleAtoi(op.qubits(0).id(), &q0);
(void)absl::SimpleAtoi(op.qubits(1).id(), &q1);

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

absl::optional<std::string> exponent_symbol;
u = ParseProtoArg(op, "exponent", param_map, &exp, &exponent_symbol);
Expand Down Expand Up @@ -457,11 +454,10 @@ inline Status FsimGate(const Operation& op, const SymbolMap& param_map,
QsimCircuit* circuit,
std::vector<GateMetaData>* metadata) {
int q0, q1;
bool unused;
float theta, theta_s, phi, phi_s;
Status u;
unused = absl::SimpleAtoi(op.qubits(0).id(), &q0);
unused = absl::SimpleAtoi(op.qubits(1).id(), &q1);
(void)absl::SimpleAtoi(op.qubits(0).id(), &q0);
(void)absl::SimpleAtoi(op.qubits(1).id(), &q1);

absl::optional<std::string> theta_symbol;
u = ParseProtoArg(op, "theta", param_map, &theta, &theta_symbol);
Expand Down Expand Up @@ -514,11 +510,10 @@ inline Status PhasedISwapGate(const Operation& op, const SymbolMap& param_map,
const unsigned int time, QsimCircuit* circuit,
std::vector<GateMetaData>* metadata) {
int q0, q1;
bool unused;
float pexp, pexp_s, exp, exp_s;
Status u;
unused = absl::SimpleAtoi(op.qubits(0).id(), &q0);
unused = absl::SimpleAtoi(op.qubits(1).id(), &q1);
(void)absl::SimpleAtoi(op.qubits(0).id(), &q0);
(void)absl::SimpleAtoi(op.qubits(1).id(), &q1);

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

u = ParseProtoArg(op, "p_x", {}, &p_x);
u = ParseProtoArg(op, "p_y", {}, &p_y);
Expand All @@ -627,10 +621,9 @@ inline Status DepolarizingChannel(const Operation& op,
const unsigned int time,
NoisyQsimCircuit* ncircuit) {
int q;
bool unused;
float p;
Status u;
unused = absl::SimpleAtoi(op.qubits(0).id(), &q);
(void)absl::SimpleAtoi(op.qubits(0).id(), &q);

u = ParseProtoArg(op, "p", {}, &p);
if (!u.ok()) {
Expand All @@ -645,10 +638,9 @@ inline Status DepolarizingChannel(const Operation& op,
inline Status GADChannel(const Operation& op, const unsigned int num_qubits,
const unsigned int time, NoisyQsimCircuit* ncircuit) {
int q;
bool unused;
float p, gamma;
Status u;
unused = absl::SimpleAtoi(op.qubits(0).id(), &q);
(void)absl::SimpleAtoi(op.qubits(0).id(), &q);

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

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

u = ParseProtoArg(op, "gamma", {}, &gamma);
if (!u.ok()) {
Expand All @@ -702,10 +692,9 @@ inline Status PhaseDampingChannel(const Operation& op,
const unsigned int time,
NoisyQsimCircuit* ncircuit) {
int q;
bool unused;
float gamma;
Status u;
unused = absl::SimpleAtoi(op.qubits(0).id(), &q);
(void)absl::SimpleAtoi(op.qubits(0).id(), &q);

u = ParseProtoArg(op, "gamma", {}, &gamma);
if (!u.ok()) {
Expand All @@ -723,10 +712,9 @@ inline Status PhaseFlipChannel(const Operation& op,
const unsigned int time,
NoisyQsimCircuit* ncircuit) {
int q;
bool unused;
float p;
Status u;
unused = absl::SimpleAtoi(op.qubits(0).id(), &q);
(void)absl::SimpleAtoi(op.qubits(0).id(), &q);

u = ParseProtoArg(op, "p", {}, &p);
if (!u.ok()) {
Expand All @@ -743,10 +731,9 @@ inline Status BitFlipChannel(const Operation& op, const unsigned int num_qubits,
const unsigned int time,
NoisyQsimCircuit* ncircuit) {
int q;
bool unused;
float p;
Status u;
unused = absl::SimpleAtoi(op.qubits(0).id(), &q);
(void)absl::SimpleAtoi(op.qubits(0).id(), &q);

u = ParseProtoArg(op, "p", {}, &p);
if (!u.ok()) {
Expand Down
4 changes: 2 additions & 2 deletions tensorflow_quantum/core/src/circuit_parser_qsim_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Arg MakeControlArg(const std::string& val) {
}

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

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

0 comments on commit 452a212

Please sign in to comment.