Skip to content

Replace tensorflow::Status::OK() with tensorflow::{Status, OkStatus}(). #719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Replace tensorflow::Status::OK() with tensorflow::{Status, OkStatus}(). #719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78cac04
Replace tensorflow::Status::OK() with tensorflow::{Status, OkStatus}().
jblespiau Oct 7, 2022
0502df4
Format file.
jblespiau Oct 7, 2022
45cd810
Merge branch 'master' into master
jaeyoo Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions tensorflow_quantum/core/src/circuit_parser_qsim_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ TEST_P(TwoQubitEigenFixture, TwoEigenGate) {
// Test case where we have a placeholder.
ASSERT_EQ(QsimCircuitFromProgram(program_proto, symbol_map, 2, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertTwoQubitEqual(test_circuit.gates[0], ref_gate);
EXPECT_EQ(metadata[0].index, 0);
EXPECT_EQ(metadata[0].symbol_values[0], "placeholder");
Expand All @@ -172,7 +172,7 @@ TEST_P(TwoQubitEigenFixture, TwoEigenGate) {
// Test case where we have all float values.
ASSERT_EQ(QsimCircuitFromProgram(program_proto, symbol_map, 2, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertTwoQubitEqual(test_circuit.gates[0], ref_gate);
EXPECT_EQ(metadata[0].index, 0);
EXPECT_NEAR(metadata[0].gate_params[0], exp, 1e-5);
Expand Down Expand Up @@ -250,7 +250,7 @@ TEST_P(TwoQubitEigenFixture, TwoEigenGateControlled) {
// Test case where we have a placeholder.
ASSERT_EQ(QsimCircuitFromProgram(program_proto, symbol_map, 4, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertTwoQubitEqual(test_circuit.gates[0], ref_gate);
EXPECT_EQ(metadata[0].index, 0);
EXPECT_EQ(metadata[0].symbol_values[0], "placeholder");
Expand Down Expand Up @@ -319,7 +319,7 @@ TEST_P(SingleQubitEigenFixture, SingleEigenGate) {

ASSERT_EQ(QsimCircuitFromProgram(program_proto, symbol_map, 1, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertOneQubitEqual(test_circuit.gates[0], ref_gate);
EXPECT_EQ(metadata[0].index, 0);
EXPECT_EQ(metadata[0].symbol_values[0], "placeholder");
Expand All @@ -342,7 +342,7 @@ TEST_P(SingleQubitEigenFixture, SingleEigenGate) {
// Test case where we have all float values.
ASSERT_EQ(QsimCircuitFromProgram(program_proto, symbol_map, 1, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertOneQubitEqual(test_circuit.gates[0], ref_gate);
EXPECT_EQ(metadata[0].index, 0);
EXPECT_NEAR(metadata[0].gate_params[0], exp, 1e-5);
Expand Down Expand Up @@ -418,7 +418,7 @@ TEST_P(SingleQubitEigenFixture, SingleEigenGateControlled) {

ASSERT_EQ(QsimCircuitFromProgram(program_proto, symbol_map, 3, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertOneQubitEqual(test_circuit.gates[0], ref_gate);
EXPECT_EQ(metadata[0].index, 0);
EXPECT_EQ(metadata[0].symbol_values[0], "placeholder");
Expand Down Expand Up @@ -471,7 +471,7 @@ TEST(QsimCircuitParserTest, SingleConstantGate) {

ASSERT_EQ(QsimCircuitFromProgram(program_proto, empty_map, 1, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertOneQubitEqual(test_circuit.gates[0], kv.second);
EXPECT_EQ(metadata.size(), 1);
EXPECT_EQ(metadata[0].placeholder_names.size(), 0);
Expand Down Expand Up @@ -511,7 +511,7 @@ TEST(QsimCircuitParserTest, SingleConstantGateControlled) {

ASSERT_EQ(QsimCircuitFromProgram(program_proto, empty_map, 3, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertOneQubitEqual(test_circuit.gates[0], kv.second);
EXPECT_EQ(metadata.size(), 1);
EXPECT_EQ(metadata[0].placeholder_names.size(), 0);
Expand Down Expand Up @@ -553,7 +553,7 @@ TEST(QsimCircuitParserTest, TwoConstantGate) {

ASSERT_EQ(QsimCircuitFromProgram(program_proto, empty_map, 2, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertTwoQubitEqual(test_circuit.gates[0], kv.second);
EXPECT_EQ(metadata.size(), 1);
EXPECT_EQ(metadata[0].placeholder_names.size(), 0);
Expand Down Expand Up @@ -596,7 +596,7 @@ TEST(QsimCircuitParserTest, TwoConstantGateControlled) {

ASSERT_EQ(QsimCircuitFromProgram(program_proto, empty_map, 4, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertTwoQubitEqual(test_circuit.gates[0], kv.second);
EXPECT_EQ(metadata.size(), 1);
EXPECT_EQ(metadata[0].placeholder_names.size(), 0);
Expand Down Expand Up @@ -646,7 +646,7 @@ TEST(QsimCircuitParserTest, FsimGate) {
// Test symbol resolution.
ASSERT_EQ(QsimCircuitFromProgram(program_proto, symbol_map, 2, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertTwoQubitEqual(test_circuit.gates[0], reference);
EXPECT_EQ(metadata.size(), 1);
EXPECT_EQ(metadata[0].placeholder_names.size(), 2);
Expand All @@ -673,7 +673,7 @@ TEST(QsimCircuitParserTest, FsimGate) {
// Test float values only.
ASSERT_EQ(QsimCircuitFromProgram(program_proto, symbol_map, 2, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertTwoQubitEqual(test_circuit.gates[0], reference);
EXPECT_EQ(metadata.size(), 1);
EXPECT_EQ(metadata[0].placeholder_names.size(), 0);
Expand Down Expand Up @@ -749,7 +749,7 @@ TEST(QsimCircuitParserTest, FsimGateControlled) {
// Test symbol resolution.
ASSERT_EQ(QsimCircuitFromProgram(program_proto, symbol_map, 4, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertTwoQubitEqual(test_circuit.gates[0], reference);
EXPECT_EQ(metadata.size(), 1);
EXPECT_EQ(metadata[0].placeholder_names.size(), 2);
Expand Down Expand Up @@ -808,7 +808,7 @@ TEST(QsimCircuitParserTest, PhasedISwap) {
// Test symbol resolution.
ASSERT_EQ(QsimCircuitFromProgram(program_proto, symbol_map, 2, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertTwoQubitEqual(test_circuit.gates[0], reference);
EXPECT_EQ(metadata.size(), 1);
EXPECT_EQ(metadata[0].placeholder_names.size(), 2);
Expand All @@ -835,7 +835,7 @@ TEST(QsimCircuitParserTest, PhasedISwap) {
// Test float values only.
ASSERT_EQ(QsimCircuitFromProgram(program_proto, symbol_map, 2, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertTwoQubitEqual(test_circuit.gates[0], reference);
EXPECT_EQ(metadata.size(), 1);
EXPECT_EQ(metadata[0].placeholder_names.size(), 0);
Expand Down Expand Up @@ -913,7 +913,7 @@ TEST(QsimCircuitParserTest, PhasedISwapControlled) {
// Test symbol resolution.
ASSERT_EQ(QsimCircuitFromProgram(program_proto, symbol_map, 4, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertTwoQubitEqual(test_circuit.gates[0], reference);
EXPECT_EQ(metadata.size(), 1);
EXPECT_EQ(metadata[0].placeholder_names.size(), 2);
Expand Down Expand Up @@ -972,7 +972,7 @@ TEST(QsimCircuitParserTest, PhasedXPow) {
// Test symbol resolution.
ASSERT_EQ(QsimCircuitFromProgram(program_proto, symbol_map, 1, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertOneQubitEqual(test_circuit.gates[0], reference);
EXPECT_EQ(metadata.size(), 1);
EXPECT_EQ(metadata[0].placeholder_names.size(), 2);
Expand Down Expand Up @@ -1001,7 +1001,7 @@ TEST(QsimCircuitParserTest, PhasedXPow) {
// Test float values only.
ASSERT_EQ(QsimCircuitFromProgram(program_proto, symbol_map, 1, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertOneQubitEqual(test_circuit.gates[0], reference);
EXPECT_EQ(metadata.size(), 1);
EXPECT_EQ(metadata[0].placeholder_names.size(), 0);
Expand Down Expand Up @@ -1079,7 +1079,7 @@ TEST(QsimCircuitParserTest, PhasedXPowControlled) {
// Test symbol resolution.
ASSERT_EQ(QsimCircuitFromProgram(program_proto, symbol_map, 3, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
AssertOneQubitEqual(test_circuit.gates[0], reference);
EXPECT_EQ(metadata.size(), 1);
EXPECT_EQ(metadata[0].placeholder_names.size(), 2);
Expand Down Expand Up @@ -1174,7 +1174,7 @@ TEST(QsimCircuitParserTest, EmptyTest) {
// Ensure that nothing bad happens with an empty circuit.
ASSERT_EQ(QsimCircuitFromProgram(program_proto, empty_map, 2, &test_circuit,
&fused_circuit, &metadata),
tensorflow::Status::OK());
tensorflow::Status());
ASSERT_EQ(test_circuit.gates.size(), 0);
ASSERT_EQ(fused_circuit.size(), 0);
ASSERT_EQ(metadata.size(), 0);
Expand Down Expand Up @@ -1227,7 +1227,7 @@ TEST(QsimCircuitParserTest, CompoundCircuit) {

ASSERT_EQ(
NoisyQsimCircuitFromProgram(program_proto, {}, 2, true, &test_circuit),
tensorflow::Status::OK());
tensorflow::Status());
AssertChannelEqual(test_circuit.channels[0], ref_chan);
AssertOneQubitEqual(test_circuit.channels[1][0].ops[0], ref_gate);
ASSERT_EQ(test_circuit.channels.size(),
Expand Down Expand Up @@ -1270,7 +1270,7 @@ TEST(QsimCircuitParserTest, AsymmetricDepolarizing) {

ASSERT_EQ(
NoisyQsimCircuitFromProgram(program_proto, {}, 1, false, &test_circuit),
tensorflow::Status::OK());
tensorflow::Status());
AssertChannelEqual(test_circuit.channels[0], reference);
ASSERT_EQ(test_circuit.channels.size(), 1);
ASSERT_EQ(test_circuit.num_qubits, 1);
Expand Down Expand Up @@ -1307,7 +1307,7 @@ TEST(QsimCircuitParserTest, AmplitudeDamping) {

ASSERT_EQ(
NoisyQsimCircuitFromProgram(program_proto, {}, 1, false, &test_circuit),
tensorflow::Status::OK());
tensorflow::Status());
AssertChannelEqual(test_circuit.channels[0], reference);
ASSERT_EQ(test_circuit.channels.size(), 1);
ASSERT_EQ(test_circuit.num_qubits, 1);
Expand Down Expand Up @@ -1343,7 +1343,7 @@ TEST(QsimCircuitParserTest, Depolarizing) {

ASSERT_EQ(
NoisyQsimCircuitFromProgram(program_proto, {}, 1, false, &test_circuit),
tensorflow::Status::OK());
tensorflow::Status());
AssertChannelEqual(test_circuit.channels[0], reference);
ASSERT_EQ(test_circuit.channels.size(), 1);
ASSERT_EQ(test_circuit.num_qubits, 1);
Expand Down Expand Up @@ -1383,7 +1383,7 @@ TEST(QsimCircuitParserTest, GeneralizedAmplitudeDamping) {

ASSERT_EQ(
NoisyQsimCircuitFromProgram(program_proto, {}, 1, false, &test_circuit),
tensorflow::Status::OK());
tensorflow::Status());
AssertChannelEqual(test_circuit.channels[0], reference);
ASSERT_EQ(test_circuit.channels.size(), 1);
ASSERT_EQ(test_circuit.num_qubits, 1);
Expand Down Expand Up @@ -1417,7 +1417,7 @@ TEST(QsimCircuitParserTest, Reset) {

ASSERT_EQ(
NoisyQsimCircuitFromProgram(program_proto, {}, 1, false, &test_circuit),
tensorflow::Status::OK());
tensorflow::Status());
AssertChannelEqual(test_circuit.channels[0], reference);
ASSERT_EQ(test_circuit.channels.size(), 1);
ASSERT_EQ(test_circuit.num_qubits, 1);
Expand Down Expand Up @@ -1453,7 +1453,7 @@ TEST(QsimCircuitParserTest, PhaseDamping) {

ASSERT_EQ(
NoisyQsimCircuitFromProgram(program_proto, {}, 1, false, &test_circuit),
tensorflow::Status::OK());
tensorflow::Status());
AssertChannelEqual(test_circuit.channels[0], reference);
ASSERT_EQ(test_circuit.channels.size(), 1);
ASSERT_EQ(test_circuit.num_qubits, 1);
Expand Down Expand Up @@ -1489,7 +1489,7 @@ TEST(QsimCircuitParserTest, PhaseFlip) {

ASSERT_EQ(
NoisyQsimCircuitFromProgram(program_proto, {}, 1, false, &test_circuit),
tensorflow::Status::OK());
tensorflow::Status());
AssertChannelEqual(test_circuit.channels[0], reference);
ASSERT_EQ(test_circuit.channels.size(), 1);
ASSERT_EQ(test_circuit.num_qubits, 1);
Expand Down Expand Up @@ -1525,7 +1525,7 @@ TEST(QsimCircuitParserTest, BitFlip) {

ASSERT_EQ(
NoisyQsimCircuitFromProgram(program_proto, {}, 1, false, &test_circuit),
tensorflow::Status::OK());
tensorflow::Status());
AssertChannelEqual(test_circuit.channels[0], reference);
ASSERT_EQ(test_circuit.channels.size(), 1);
ASSERT_EQ(test_circuit.num_qubits, 1);
Expand All @@ -1540,7 +1540,7 @@ TEST(QsimCircuitParserTest, NoisyEmpty) {
NoisyQsimCircuit test_circuit;
ASSERT_EQ(
NoisyQsimCircuitFromProgram(program_proto, {}, 0, false, &test_circuit),
tensorflow::Status::OK());
tensorflow::Status());
ASSERT_EQ(test_circuit.channels.size(), 0);
ASSERT_EQ(test_circuit.num_qubits, 0);
}
Expand Down Expand Up @@ -1580,7 +1580,7 @@ TEST(QsimCircuitParserTest, CircuitFromPauliTermPauli) {
// Check conversion
status =
QsimCircuitFromPauliTerm(pauli_proto, 1, &test_circuit, &fused_circuit);
ASSERT_EQ(status, tensorflow::Status::OK());
ASSERT_EQ(status, tensorflow::Status());
ASSERT_EQ(test_circuit.num_qubits, 1);
ASSERT_EQ(test_circuit.gates.size(), 1);
AssertOneQubitEqual(test_circuit.gates[0], reference);
Expand All @@ -1593,7 +1593,7 @@ TEST(QsimCircuitParserTest, CircuitFromPauliTermEmpty) {
std::vector<qsim::GateFused<QsimGate>> fused_circuit;
status =
QsimCircuitFromPauliTerm(pauli_proto, 0, &test_circuit, &fused_circuit);
ASSERT_EQ(status, tensorflow::Status::OK());
ASSERT_EQ(status, tensorflow::Status());
ASSERT_EQ(test_circuit.num_qubits, 0);
ASSERT_EQ(test_circuit.gates.size(), 0);
}
Expand All @@ -1615,7 +1615,7 @@ TEST(QsimCircuitParserTest, ZBasisCircuitFromPauliTermPauliX) {
// Check conversion
status = QsimZBasisCircuitFromPauliTerm(pauli_proto, 1, &test_circuit,
&fused_circuit);
ASSERT_EQ(status, tensorflow::Status::OK());
ASSERT_EQ(status, tensorflow::Status());
ASSERT_EQ(test_circuit.num_qubits, 1);
ASSERT_EQ(test_circuit.gates.size(), 1);
AssertOneQubitEqual(test_circuit.gates[0], reference);
Expand All @@ -1638,7 +1638,7 @@ TEST(QsimCircuitParserTest, ZBasisCircuitFromPauliTermPauliY) {
// Check conversion
status = QsimZBasisCircuitFromPauliTerm(pauli_proto, 1, &test_circuit,
&fused_circuit);
ASSERT_EQ(status, tensorflow::Status::OK());
ASSERT_EQ(status, tensorflow::Status());
ASSERT_EQ(test_circuit.num_qubits, 1);
ASSERT_EQ(test_circuit.gates.size(), 1);
AssertOneQubitEqual(test_circuit.gates[0], reference);
Expand All @@ -1660,7 +1660,7 @@ TEST(QsimCircuitParserTest, ZBasisCircuitFromPauliTermPauliZ) {
// Check conversion
status = QsimZBasisCircuitFromPauliTerm(pauli_proto, 1, &test_circuit,
&fused_circuit);
ASSERT_EQ(status, tensorflow::Status::OK());
ASSERT_EQ(status, tensorflow::Status());
ASSERT_EQ(test_circuit.num_qubits, 1);
ASSERT_EQ(test_circuit.gates.size(), 0);
}
Expand All @@ -1687,7 +1687,7 @@ TEST(QsimCircuitParserTest, ZBasisCircuitFromPauliTermPauliCompound) {
// Check conversion
status = QsimZBasisCircuitFromPauliTerm(pauli_proto, 2, &test_circuit,
&fused_circuit);
ASSERT_EQ(status, tensorflow::Status::OK());
ASSERT_EQ(status, tensorflow::Status());
ASSERT_EQ(test_circuit.num_qubits, 2);
ASSERT_EQ(test_circuit.gates.size(), 2);
AssertOneQubitEqual(test_circuit.gates[0], reference1);
Expand All @@ -1701,7 +1701,7 @@ TEST(QsimCircuitParserTest, ZBasisCircuitFromPauliTermEmpty) {
std::vector<qsim::GateFused<QsimGate>> fused_circuit;
status = QsimZBasisCircuitFromPauliTerm(pauli_proto, 0, &test_circuit,
&fused_circuit);
ASSERT_EQ(status, tensorflow::Status::OK());
ASSERT_EQ(status, tensorflow::Status());
ASSERT_EQ(test_circuit.num_qubits, 0);
ASSERT_EQ(test_circuit.gates.size(), 0);
}
Expand Down
Loading