Skip to content
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

Jump to bottom

changed basis from char to enum #522

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

changed basis from char to enum #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22cfa46
changed basis from char to enum
MadhuMPandurangi Mar 31, 2023
7522efb
formatted the code
MadhuMPandurangi Apr 1, 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
7 changes: 6 additions & 1 deletion quisp/backends/interfaces/IQubit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,13 @@ enum class EigenvalueResult : int {
PLUS_ONE,
MINUS_ONE,
};
enum Basis {
X,
Y,
Z,
};
struct MeasurementOutcome {
char basis;
Basis basis;
bool outcome_is_plus;
char GOD_clean;
bool operator==(const MeasurementOutcome &outcome) const { return basis == outcome.basis && outcome_is_plus == outcome.outcome_is_plus && GOD_clean == outcome.GOD_clean; }
Expand Down
7 changes: 4 additions & 3 deletions quisp/modules/QNIC/StationaryQubit/StationaryQubit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

using namespace Eigen;

using quisp::backends::abstract::Basis;
using quisp::messages::PhotonicQubit;
using quisp::modules::qubit_id::QubitId;
using quisp::types::EigenvalueResult;
Expand Down Expand Up @@ -250,13 +251,13 @@ MeasurementOutcome StationaryQubit::measureRandomPauliBasis() {
auto outcome = MeasurementOutcome();
if (rand < 1.0 / 3) {
outcome.outcome_is_plus = qubit_ref->measureX() == EigenvalueResult::PLUS_ONE;
outcome.basis = 'X';
outcome.basis = Basis::X;
} else if (rand < 2.0 / 3) {
outcome.outcome_is_plus = qubit_ref->measureY() == EigenvalueResult::PLUS_ONE;
outcome.basis = 'Y';
outcome.basis = Basis::Y;
} else {
outcome.outcome_is_plus = qubit_ref->measureZ() == EigenvalueResult::PLUS_ONE;
outcome.basis = 'Z';
outcome.basis = Basis::Z;
}
outcome.GOD_clean = 'F'; // need to fix this to properly track the error
return outcome;
Expand Down
7 changes: 4 additions & 3 deletions quisp/modules/QRSA/RuleEngine/RuntimeCallback.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ using namespace quisp::runtime;
using quisp::modules::RuleEngine;
using quisp::runtime::QNodeAddr;
using namespace quisp::messages;
using quisp::backends::abstract::Basis;

struct RuntimeCallback : public quisp::runtime::Runtime::ICallBack {
RuntimeCallback(RuleEngine *re) : rule_engine(re), provider(re->provider) {}
Expand All @@ -30,17 +31,17 @@ struct RuntimeCallback : public quisp::runtime::Runtime::ICallBack {

MeasurementOutcome measureQubitX(IQubitRecord *qubit_rec) override {
auto qubit = provider.getStationaryQubit(qubit_rec);
return MeasurementOutcome{.basis = 'X', .outcome_is_plus = qubit->measureX() == types::EigenvalueResult::PLUS_ONE};
return MeasurementOutcome{.basis = Basis::X, .outcome_is_plus = qubit->measureX() == types::EigenvalueResult::PLUS_ONE};
}

MeasurementOutcome measureQubitZ(IQubitRecord *qubit_rec) override {
auto qubit = provider.getStationaryQubit(qubit_rec);
return MeasurementOutcome{.basis = 'Z', .outcome_is_plus = qubit->measureZ() == types::EigenvalueResult::PLUS_ONE};
return MeasurementOutcome{.basis = Basis::Z, .outcome_is_plus = qubit->measureZ() == types::EigenvalueResult::PLUS_ONE};
}

MeasurementOutcome measureQubitY(IQubitRecord *qubit_rec) override {
auto qubit = provider.getStationaryQubit(qubit_rec);
return MeasurementOutcome{.basis = 'Y', .outcome_is_plus = qubit->measureY() == types::EigenvalueResult::PLUS_ONE};
return MeasurementOutcome{.basis = Basis::Y, .outcome_is_plus = qubit->measureY() == types::EigenvalueResult::PLUS_ONE};
}

void gateX(IQubitRecord *qubit_rec) override {
Expand Down
26 changes: 14 additions & 12 deletions quisp/rules/Action_execution_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ namespace {
using namespace quisp_test;
using namespace quisp::runtime;
using namespace testing;
using quisp::backends::abstract::Basis;
using quisp::modules::QNIC_E;
using quisp::modules::QNIC_N;
using quisp::modules::QNIC_R;
Expand All @@ -28,6 +29,7 @@ using quisp::rules::Purification;
using quisp::rules::PurType;
using quisp::rules::Tomography;
using quisp::rules::rs_converter::RuleSetConverter;

Program terminator{"terminator", {INSTR_RET_ReturnCode_{{ReturnCode::RS_TERMINATED}}}};
Program always_pass{"cond", {INSTR_RET_ReturnCode_{{ReturnCode::COND_PASSED}}}};
class ActionExecutionTest : public testing::Test {
Expand Down Expand Up @@ -94,17 +96,17 @@ TEST_F(ActionExecutionTest, Tomography) {
runtime->assignQubitToRuleSet(partner_addr, qubit1);
ASSERT_EQ(getResourceSizeByRuleId(*runtime, 0), 1);
EXPECT_CALL(*callback, freeAndResetQubit(qubit1)).Times(1);
EXPECT_CALL(*callback, measureQubitRandomly(qubit1)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = 'X', .outcome_is_plus = true}));
EXPECT_CALL(*callback, sendLinkTomographyResult(ruleset_id, _, 0, QNodeAddr(partner_addr), 1, MeasurementOutcome{.basis = 'X', .outcome_is_plus = true}, 500, _)).Times(1);
EXPECT_CALL(*callback, measureQubitRandomly(qubit1)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = quisp::backends::abstract::Basis::X, .outcome_is_plus = true}));
EXPECT_CALL(*callback, sendLinkTomographyResult(ruleset_id, _, 0, QNodeAddr(partner_addr), 1, MeasurementOutcome{.basis = Basis::X, .outcome_is_plus = true}, 500, _)).Times(1);
runtime->exec();
ASSERT_EQ(getResourceSizeByRuleId(*runtime, 0), 0);

runtime->terminated = false;
runtime->assignQubitToRuleSet(partner_addr, qubit2);
ASSERT_EQ(getResourceSizeByRuleId(*runtime, 0), 1);
EXPECT_CALL(*callback, freeAndResetQubit(qubit2)).Times(1);
EXPECT_CALL(*callback, measureQubitRandomly(qubit2)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = 'Z', .outcome_is_plus = false}));
EXPECT_CALL(*callback, sendLinkTomographyResult(ruleset_id, _, 0, QNodeAddr(partner_addr), 2, MeasurementOutcome{.basis = 'Z', .outcome_is_plus = false}, 500, _)).Times(1);
EXPECT_CALL(*callback, measureQubitRandomly(qubit2)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = quisp::backends::abstract::Basis::Z, .outcome_is_plus = false}));
EXPECT_CALL(*callback, sendLinkTomographyResult(ruleset_id, _, 0, QNodeAddr(partner_addr), 2, MeasurementOutcome{.basis = Basis::Z, .outcome_is_plus = false}, 500, _)).Times(1);
runtime->exec();
ASSERT_EQ(getResourceSizeByRuleId(*runtime, 0), 0);
}
Expand All @@ -121,8 +123,8 @@ TEST_F(ActionExecutionTest, Swapping) {
finalizeRuleset();

EXPECT_CALL(*callback, gateCNOT(qubit1, qubit2)).Times(1);
EXPECT_CALL(*callback, measureQubitX(qubit1)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = 'X', .outcome_is_plus = true}));
EXPECT_CALL(*callback, measureQubitZ(qubit2)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = 'Z', .outcome_is_plus = true}));
EXPECT_CALL(*callback, measureQubitX(qubit1)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = Basis::X, .outcome_is_plus = true}));
EXPECT_CALL(*callback, measureQubitZ(qubit2)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = Basis::Z, .outcome_is_plus = true}));
EXPECT_CALL(*callback, freeAndResetQubit(qubit1)).Times(1);
EXPECT_CALL(*callback, freeAndResetQubit(qubit2)).Times(1);
EXPECT_CALL(*callback, sendSwappingResult(ruleset_id, QNodeAddr{left_partner_addr}, QNodeAddr{right_partner_addr}, 123, 1, 0b00)).Times(1);
Expand All @@ -136,8 +138,8 @@ TEST_F(ActionExecutionTest, Swapping) {

runtime->terminated = false;
EXPECT_CALL(*callback, gateCNOT(qubit1, qubit2)).Times(1);
EXPECT_CALL(*callback, measureQubitX(qubit1)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = 'X', .outcome_is_plus = false}));
EXPECT_CALL(*callback, measureQubitZ(qubit2)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = 'Z', .outcome_is_plus = false}));
EXPECT_CALL(*callback, measureQubitX(qubit1)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = Basis::X, .outcome_is_plus = false}));
EXPECT_CALL(*callback, measureQubitZ(qubit2)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = Basis::Z, .outcome_is_plus = false}));
EXPECT_CALL(*callback, freeAndResetQubit(qubit1)).Times(1);
EXPECT_CALL(*callback, freeAndResetQubit(qubit2)).Times(1);
EXPECT_CALL(*callback, sendSwappingResult(ruleset_id, QNodeAddr{left_partner_addr}, QNodeAddr{right_partner_addr}, 123, 2, 0b11)).Times(1);
Expand All @@ -151,8 +153,8 @@ TEST_F(ActionExecutionTest, Swapping) {

runtime->terminated = false;
EXPECT_CALL(*callback, gateCNOT(qubit1, qubit2)).Times(1);
EXPECT_CALL(*callback, measureQubitX(qubit1)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = 'X', .outcome_is_plus = true}));
EXPECT_CALL(*callback, measureQubitZ(qubit2)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = 'Z', .outcome_is_plus = false}));
EXPECT_CALL(*callback, measureQubitX(qubit1)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = Basis::X, .outcome_is_plus = true}));
EXPECT_CALL(*callback, measureQubitZ(qubit2)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = Basis::Z, .outcome_is_plus = false}));
EXPECT_CALL(*callback, freeAndResetQubit(qubit1)).Times(1);
EXPECT_CALL(*callback, freeAndResetQubit(qubit2)).Times(1);
EXPECT_CALL(*callback, sendSwappingResult(ruleset_id, QNodeAddr{left_partner_addr}, QNodeAddr{right_partner_addr}, 123, 3, 0b10)).Times(1);
Expand All @@ -166,8 +168,8 @@ TEST_F(ActionExecutionTest, Swapping) {

runtime->terminated = false;
EXPECT_CALL(*callback, gateCNOT(qubit1, qubit2)).Times(1);
EXPECT_CALL(*callback, measureQubitX(qubit1)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = 'X', .outcome_is_plus = false}));
EXPECT_CALL(*callback, measureQubitZ(qubit2)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = 'Z', .outcome_is_plus = true}));
EXPECT_CALL(*callback, measureQubitX(qubit1)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = Basis::X, .outcome_is_plus = false}));
EXPECT_CALL(*callback, measureQubitZ(qubit2)).Times(1).WillOnce(Return(MeasurementOutcome{.basis = Basis::Z, .outcome_is_plus = true}));
EXPECT_CALL(*callback, freeAndResetQubit(qubit1)).Times(1);
EXPECT_CALL(*callback, freeAndResetQubit(qubit2)).Times(1);
EXPECT_CALL(*callback, sendSwappingResult(ruleset_id, QNodeAddr{left_partner_addr}, QNodeAddr{right_partner_addr}, 123, 4, 0b01)).Times(1);
Expand Down