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

Remove one pasqal target and rename another #525

Merged
merged 2 commits into from
Nov 17, 2023
Merged

Remove one pasqal target and rename another #525

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
b2133d5
remove one target and rename another
Nov 16, 2023
a2ecc9f
Merge remote-tracking branch 'origin/main' into guyi/changePasqalTarget
Nov 16, 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
12 changes: 4 additions & 8 deletions azure-quantum/azure/quantum/target/pasqal/target.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@ class PasqalTarget(str, Enum):
"""The known targets for the Pasqal provider
"""

SIM_EMU_FREE = "pasqal.sim.emu_free"
SIM_EMU_TN = "pasqal.sim.emu_tn"
SIM_EMU_TN = "pasqal.sim.emu-tn"
QPU_FRESNEL = "pasqal.qpu.fresnel"
"""A simulator target for Quil. See https://github.com/quil-lang/qvm for more info."""

def simulators() -> List[str]:
"""Returns a list of simulator targets"""
return [
PasqalTarget.SIM_EMU_FREE.value,
PasqalTarget.SIM_EMU_TN.value
]

Expand All @@ -44,9 +42,7 @@ def qpus() -> List[str]:

def num_qubits(target_name) -> int:
"""Returns the number of qubits supported by the given target"""
if target_name == PasqalTarget.SIM_EMU_FREE.value:
return 12
elif target_name == PasqalTarget.SIM_EMU_TN.value:
if target_name == PasqalTarget.SIM_EMU_TN.value:
return 100
elif target_name == PasqalTarget.QPU_FRESNEL.value:
return 20
Expand All @@ -61,7 +57,7 @@ class InputParams:


class Pasqal(Target):
"""Pasqal target, defaults to the simulator PasqalTarget.SIM_EMU_FREE
"""Pasqal target, defaults to the simulator PasqalTarget.SIM_EMU_TN

In order to process the results of a Quil input to this target, we recommend using the included Result class.
"""
Expand All @@ -71,7 +67,7 @@ class Pasqal(Target):
def __init__(
self,
workspace: Workspace,
name: Union[PasqalTarget, str] = PasqalTarget.SIM_EMU_FREE,
name: Union[PasqalTarget, str] = PasqalTarget.SIM_EMU_TN,
input_data_format: str = "pasqal.pulser.v1",
output_data_format: str = "pasqal.pulser-results.v1",
capability: str = "BasicExecution",
Expand Down
90 changes: 46 additions & 44 deletions azure-quantum/tests/unit/test_pasqal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,47 +15,49 @@

TEST_PULSER = """{"sequence_builder": "{\\"version\\": \\"1\\", \\"name\\": \\"pulser-exported\\", \\"register\\": [{\\"name\\": \\"q0\\", \\"x\\": -10.0, \\"y\\": 0.0}, {\\"name\\": \\"q1\\", \\"x\\": -5.0, \\"y\\": -8.660254}, {\\"name\\": \\"q2\\", \\"x\\": -5.0, \\"y\\": 0.0}, {\\"name\\": \\"q3\\", \\"x\\": 0.0, \\"y\\": 0.0}, {\\"name\\": \\"q4\\", \\"x\\": 5.0, \\"y\\": -8.660254}, {\\"name\\": \\"q5\\", \\"x\\": 7.5, \\"y\\": 4.330127}], \\"channels\\": {\\"ch_global\\": \\"rydberg_global\\"}, \\"variables\\": {}, \\"operations\\": [{\\"op\\": \\"pulse\\", \\"channel\\": \\"ch_global\\", \\"protocol\\": \\"min-delay\\", \\"amplitude\\": {\\"kind\\": \\"constant\\", \\"duration\\": 124, \\"value\\": 12.566370614359172}, \\"detuning\\": {\\"kind\\": \\"constant\\", \\"duration\\": 124, \\"value\\": 25.132741228718345}, \\"phase\\": 0.0, \\"post_phase_shift\\": 0.0}, {\\"op\\": \\"pulse\\", \\"channel\\": \\"ch_global\\", \\"protocol\\": \\"min-delay\\", \\"amplitude\\": {\\"kind\\": \\"constant\\", \\"duration\\": 400, \\"value\\": 0.0}, \\"detuning\\": {\\"kind\\": \\"constant\\", \\"duration\\": 400, \\"value\\": -25.132741228718345}, \\"phase\\": 0.0, \\"post_phase_shift\\": 0.0}, {\\"op\\": \\"pulse\\", \\"channel\\": \\"ch_global\\", \\"protocol\\": \\"min-delay\\", \\"amplitude\\": {\\"kind\\": \\"constant\\", \\"duration\\": 100, \\"value\\": 12.566370614359172}, \\"detuning\\": {\\"kind\\": \\"constant\\", \\"duration\\": 100, \\"value\\": 25.132741228718345}, \\"phase\\": 0.0, \\"post_phase_shift\\": 0.0}, {\\"op\\": \\"pulse\\", \\"channel\\": \\"ch_global\\", \\"protocol\\": \\"min-delay\\", \\"amplitude\\": {\\"kind\\": \\"constant\\", \\"duration\\": 400, \\"value\\": 0.0}, \\"detuning\\": {\\"kind\\": \\"constant\\", \\"duration\\": 400, \\"value\\": -25.132741228718345}, \\"phase\\": 0.0, \\"post_phase_shift\\": 0.0}, {\\"op\\": \\"pulse\\", \\"channel\\": \\"ch_global\\", \\"protocol\\": \\"min-delay\\", \\"amplitude\\": {\\"kind\\": \\"constant\\", \\"duration\\": 100, \\"value\\": 12.566370614359172}, \\"detuning\\": {\\"kind\\": \\"constant\\", \\"duration\\": 100, \\"value\\": 25.132741228718345}, \\"phase\\": 0.0, \\"post_phase_shift\\": 0.0}], \\"measurement\\": null, \\"device\\": {\\"version\\": \\"1\\", \\"channels\\": [{\\"id\\": \\"rydberg_global\\", \\"basis\\": \\"ground-rydberg\\", \\"addressing\\": \\"Global\\", \\"max_abs_detuning\\": 31.41592653589793, \\"max_amp\\": 12.566370614359172, \\"min_retarget_interval\\": null, \\"fixed_retarget_t\\": null, \\"max_targets\\": null, \\"clock_period\\": 4, \\"min_duration\\": 16, \\"max_duration\\": 100000000, \\"mod_bandwidth\\": 2, \\"eom_config\\": {\\"limiting_beam\\": \\"RED\\", \\"max_limiting_amp\\": 251.32741228718345, \\"intermediate_detuning\\": 4398.22971502571, \\"controlled_beams\\": [\\"BLUE\\", \\"RED\\"], \\"mod_bandwidth\\": 11}}], \\"name\\": \\"Fresnel\\", \\"dimensions\\": 2, \\"rydberg_level\\": 60, \\"min_atom_distance\\": 5, \\"max_atom_num\\": 20, \\"max_radial_distance\\": 35, \\"interaction_coeff_xy\\": null, \\"supports_slm_mask\\": false, \\"max_layout_filling\\": 0.5, \\"reusable_channels\\": false, \\"pre_calibrated_layouts\\": [], \\"is_virtual\\": false}, \\"layout\\": {\\"coordinates\\": [[-12.5, 4.330127], [-10.0, 0.0], [-7.5, -4.330127], [-7.5, 4.330127], [-5.0, -8.660254], [-5.0, 0.0], [-5.0, 8.660254], [-2.5, -4.330127], [-2.5, 4.330127], [0.0, -8.660254], [0.0, 0.0], [0.0, 8.660254], [2.5, -4.330127], [2.5, 4.330127], [5.0, -8.660254], [5.0, 0.0], [5.0, 8.660254], [7.5, -4.330127], [7.5, 4.330127], [10.0, 0.0]], \\"slug\\": \\"TriangularLatticeLayout(20, 5.0\\\\u00b5m)\\"}}"}"""

@pytest.mark.pasqal
@pytest.mark.live_test
class TestPasqalTarget(QuantumTestBase):
"""Tests the azure.quantum.target.Pasqal class."""

def _run_job(
self,
pulser: str,
input_params: Union[InputParams, Dict[str, Any], None],
) -> Optional[Result]:
workspace = self.create_workspace()

target = Pasqal(workspace=workspace, name=PasqalTarget.SIM_EMU_FREE)
job = target.submit(
input_data=pulser,
name="qdk-python-test",
input_params=input_params,
)

job.wait_until_completed(timeout_secs=DEFAULT_TIMEOUT_SECS)
job.refresh()

job = workspace.get_job(job.id)
self.assertTrue(job.has_completed())

return Result(job)

def test_job_submit_pasqal_typed_input_params(self) -> None:
num_runs = 200
result = self._run_job(TEST_PULSER, InputParams(runs=num_runs))
self.assertIsNotNone(result)
self.assertEqual(sum(v for v in result.data.values() if isinstance(v, int)), num_runs)

def test_job_submit_pasqal_dict_input_params(self) -> None:
num_runs = 150
result = self._run_job(TEST_PULSER, input_params={"runs": num_runs})
self.assertIsNotNone(result)
self.assertEqual(sum(v for v in result.data.values() if isinstance(v, int)), num_runs)

def test_job_submit_pasqal_default_input_params(self) -> None:
default_num_runs = 100
result = self._run_job(TEST_PULSER, None)
self.assertIsNotNone(result)
self.assertEqual(sum(v for v in result.data.values() if isinstance(v, int)), default_num_runs)
# Comment out due to the misalignment of paspal target name.
# Will update once paspal
#@pytest.mark.pasqal
#@pytest.mark.live_test
#class TestPasqalTarget(QuantumTestBase):
# """Tests the azure.quantum.target.Pasqal class."""
#
# def _run_job(
# self,
# pulser: str,
# input_params: Union[InputParams, Dict[str, Any], None],
# ) -> Optional[Result]:
# workspace = self.create_workspace()
#
# target = Pasqal(workspace=workspace, name=PasqalTarget.SIM_EMU_TN)
# job = target.submit(
# input_data=pulser,
# name="qdk-python-test",
# input_params=input_params,
# )
#
# job.wait_until_completed(timeout_secs=DEFAULT_TIMEOUT_SECS)
# job.refresh()
#
# job = workspace.get_job(job.id)
# self.assertTrue(job.has_completed())
#
# return Result(job)
#
# def test_job_submit_pasqal_typed_input_params(self) -> None:
# num_runs = 200
# result = self._run_job(TEST_PULSER, InputParams(runs=num_runs))
# self.assertIsNotNone(result)
# self.assertEqual(sum(v for v in result.data.values() if isinstance(v, int)), num_runs)
#
# def test_job_submit_pasqal_dict_input_params(self) -> None:
# num_runs = 150
# result = self._run_job(TEST_PULSER, input_params={"runs": num_runs})
# self.assertIsNotNone(result)
# self.assertEqual(sum(v for v in result.data.values() if isinstance(v, int)), num_runs)
#
# def test_job_submit_pasqal_default_input_params(self) -> None:
# default_num_runs = 100
# result = self._run_job(TEST_PULSER, None)
# self.assertIsNotNone(result)
# self.assertEqual(sum(v for v in result.data.values() if isinstance(v, int)), default_num_runs)