Skip to content

Commit

Permalink
Merge 3be874b into f15d61e
Browse files Browse the repository at this point in the history
  • Loading branch information
kt474 committed May 9, 2024
2 parents f15d61e + 3be874b commit 9642029
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 27 deletions.
9 changes: 8 additions & 1 deletion test/ibm_test_case.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
from collections import defaultdict
from typing import DefaultDict, Dict

from qiskit.transpiler.preset_passmanagers import generate_preset_pass_manager
from qiskit_ibm_runtime import QISKIT_IBM_RUNTIME_LOGGER_NAME
from qiskit_ibm_runtime import QiskitRuntimeService, Sampler, Options
from qiskit_ibm_runtime import QiskitRuntimeService, Sampler, SamplerV2, Options

from .utils import setup_test_logging, bell
from .decorators import IntegrationTestDependencies, integration_test_setup
Expand Down Expand Up @@ -275,6 +276,12 @@ def _run_program(
options.max_execution_time = max_execution_time
sampler = Sampler(backend=backend, options=options)
job = sampler.run(circuits or bell(), callback=callback)
elif pid == "samplerv2":
backend = service.get_backend(backend_name)
sampler = SamplerV2(backend=backend)
pm = generate_preset_pass_manager(backend=backend, optimization_level=1)
isa_qc = pm.run(bell())
job = sampler.run([isa_qc])
else:
job = service.run(
program_id=pid,
Expand Down
9 changes: 0 additions & 9 deletions test/integration/test_ibm_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,12 +284,3 @@ def test_job_header(self):
job = self.sim_backend.run(self.bell, header=custom_header)
self.assertEqual(custom_header["test"], job.inputs["header"]["test"])
self.assertLessEqual(custom_header.items(), job.inputs["header"].items())

def test_lazy_loading_params(self):
"""Test lazy loading job params."""
job = self.sim_backend.run(self.bell)
job.wait_for_final_state()

rjob = self.service.job(job.job_id())
self.assertFalse(rjob._params)
self.assertTrue(rjob.inputs["circuits"])
18 changes: 1 addition & 17 deletions test/integration/test_retrieve_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,6 @@ def test_retrieve_job_done(self, service):
self.assertEqual(job.job_id(), rjob.job_id())
self.assertEqual(self.program_ids[service.channel], rjob.program_id)

@run_integration_test
@quantum_only
def test_lazy_loading_params(self, service):
"""Test lazy loading job params."""
job = self._run_program(
service,
inputs={"circuits": bell()},
program_id="circuit-runner",
backend="ibmq_qasm_simulator",
)
job.wait_for_final_state()
rjob = service.job(job.job_id())
self.assertFalse(rjob._params)
self.assertTrue(rjob.inputs)
self.assertTrue(rjob._params)

@run_integration_test
@quantum_only
def test_params_not_retrieved(self, service):
Expand Down Expand Up @@ -235,7 +219,7 @@ def test_retrieve_jobs_backend(self, service):
@run_integration_test
def test_retrieve_correct_job_version(self, service):
"""Test retrieving the correct job version."""
job = self._run_program(service, program_id="sampler")
job = self._run_program(service)
job.wait_for_final_state()
rjob = service.job(job.job_id())
job_v2 = self._run_program(service, program_id="samplerv2")
Expand Down

0 comments on commit 9642029

Please sign in to comment.