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

deprecation: Remove OQC #1014

Merged
merged 6 commits into from
Jun 28, 2024
Merged

deprecation: Remove OQC #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
59d9151
fix: Remove OQC
speller26 Jun 28, 2024
4fe183c
Update test_device_creation.py
speller26 Jun 28, 2024
cdc66d6
Update test_device_creation.py
speller26 Jun 28, 2024
7e5ea1f
Update test_measure.py
speller26 Jun 28, 2024
4011a63
Update test_device_creation.py
speller26 Jun 28, 2024
4ad2f29
Update test_device_creation.py
speller26 Jun 28, 2024
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
4 changes: 2 additions & 2 deletions src/braket/devices/devices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class _IonQ(str, Enum):
Forte1 = "arn:aws:braket:us-east-1::device/qpu/ionq/Forte-1"

class _OQC(str, Enum):
Lucy = "arn:aws:braket:eu-west-2::device/qpu/oqc/Lucy"
_Lucy = "arn:aws:braket:eu-west-2::device/qpu/oqc/Lucy"

class _QuEra(str, Enum):
Aquila = "arn:aws:braket:us-east-1::device/qpu/quera/Aquila"
Expand All @@ -58,7 +58,7 @@ class _Xanadu(str, Enum):
# DWave = _DWave
IonQ = _IonQ
IQM = _IQM
OQC = _OQC
# OQC = _OQC
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Intentionally commenting this instead of removing this from the Enums?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just doing the same thing we've done with D-Wave and Xanadu

QuEra = _QuEra
Rigetti = _Rigetti
# Xanadu = _Xanadu
10 changes: 5 additions & 5 deletions test/integ_tests/test_device_creation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@

RIGETTI_ARN = "arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3"
IONQ_ARN = "arn:aws:braket:us-east-1::device/qpu/ionq/Harmony"
IQM_ARN = "arn:aws:braket:eu-north-1::device/qpu/iqm/Garnet"
SIMULATOR_ARN = "arn:aws:braket:::device/quantum-simulator/amazon/sv1"
OQC_ARN = "arn:aws:braket:eu-west-2::device/qpu/oqc/Lucy"
PULSE_ARN = "arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3"


@pytest.mark.parametrize(
"arn", [(RIGETTI_ARN), (IONQ_ARN), (OQC_ARN), (SIMULATOR_ARN), (PULSE_ARN)]
"arn", [(RIGETTI_ARN), (IONQ_ARN), (IQM_ARN), (SIMULATOR_ARN), (PULSE_ARN)]
)
def test_device_creation(arn, created_braket_devices):
device = created_braket_devices[arn]
Expand All @@ -48,10 +48,10 @@ def test_device_across_regions(aws_session, created_braket_devices):
# assert QPUs across different regions can be created using the same aws_session
created_braket_devices[RIGETTI_ARN]
created_braket_devices[IONQ_ARN]
created_braket_devices[OQC_ARN]
created_braket_devices[IQM_ARN]


@pytest.mark.parametrize("arn", [(RIGETTI_ARN), (IONQ_ARN), (OQC_ARN), (SIMULATOR_ARN)])
@pytest.mark.parametrize("arn", [(RIGETTI_ARN), (IONQ_ARN), (IQM_ARN), (SIMULATOR_ARN)])
def test_get_devices_arn(arn):
results = AwsDevice.get_devices(arns=[arn])
assert results[0].arn == arn
Expand All @@ -77,7 +77,7 @@ def test_get_devices_others():

def test_get_devices_all(braket_devices):
result_arns = [result.arn for result in braket_devices]
for arn in [RIGETTI_ARN, IONQ_ARN, SIMULATOR_ARN, OQC_ARN]:
for arn in [RIGETTI_ARN, IONQ_ARN, IQM_ARN, SIMULATOR_ARN]:
assert arn in result_arns


Expand Down
4 changes: 2 additions & 2 deletions test/integ_tests/test_measure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

IONQ_ARN = "arn:aws:braket:us-east-1::device/qpu/ionq/Harmony"
SIMULATOR_ARN = "arn:aws:braket:::device/quantum-simulator/amazon/sv1"
OQC_ARN = "arn:aws:braket:eu-west-2::device/qpu/oqc/Lucy"
IQM_ARN = "arn:aws:braket:eu-north-1::device/qpu/iqm/Garnet"


@pytest.mark.parametrize("arn", [(IONQ_ARN), (SIMULATOR_ARN)])
Expand Down Expand Up @@ -53,7 +53,7 @@ def test_measure_on_local_sim(sim):
assert result.measured_qubits == [0, 1]


@pytest.mark.parametrize("arn", [(OQC_ARN)])
@pytest.mark.parametrize("arn", [(IQM_ARN)])
def test_measure_on_supported_devices(arn):
device = AwsDevice(arn)
if not device.is_available:
Expand Down