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.

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

Override classmethod supports_aux_operators in VQEProgram #223

Merged
merged 10 commits into from
Aug 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions qiskit_optimization/runtime/vqe_program.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,10 @@ def wrapped_callback(*args):
else:
return None

@classmethod
def supports_aux_operators(cls) -> bool:
return True

def compute_minimum_eigenvalue(
self, operator: OperatorBase, aux_operators: Optional[List[Optional[OperatorBase]]] = None
) -> MinimumEigensolverResult:
Expand Down
42 changes: 40 additions & 2 deletions test/algorithms/test_min_eigen_optimizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,22 @@
QiskitOptimizationTestCase,
requires_extra_library,
)
from test.runtime.fake_vqeruntime import FakeRuntimeProvider

import numpy as np
from ddt import data, ddt
from docplex.mp.model import Model

from qiskit import BasicAer
from qiskit.algorithms import QAOA, VQE, NumPyMinimumEigensolver
from qiskit.algorithms.optimizers import COBYLA, SPSA
from qiskit.circuit.library import TwoLocal
from qiskit.providers.basicaer import QasmSimulatorPy
from qiskit.utils import QuantumInstance, algorithm_globals
from qiskit_optimization.algorithms import CplexOptimizer, MinimumEigenOptimizer
from qiskit_optimization.algorithms import (
CplexOptimizer,
MinimumEigenOptimizer,
MinimumEigenOptimizationResult,
)
from qiskit_optimization.algorithms.optimization_algorithm import (
OptimizationResultStatus,
)
Expand All @@ -39,6 +44,7 @@
QuadraticProgramToQubo,
)
from qiskit_optimization.problems import QuadraticProgram
from qiskit_optimization.runtime import VQEProgram, QAOAProgram
from qiskit_optimization.translators import from_docplex_mp


Expand Down Expand Up @@ -353,6 +359,38 @@ def test_samples_vqe(self, simulator):
self.assertAlmostEqual(results.raw_samples[0].fval, opt_sol)
self.assertEqual(results.raw_samples[0].status, success)

@data("vqe", "qaoa")
def test_runtime(self, subroutine):
"""Test vqe and qaoa runtime"""
optimizer = {"name": "SPSA", "maxiter": 100}
backend = QasmSimulatorPy()
provider = FakeRuntimeProvider()

if subroutine == "vqe":
ry_ansatz = TwoLocal(5, "ry", "cz", reps=3, entanglement="full")
initial_point = np.random.default_rng(42).random(ry_ansatz.num_parameters)
solver = VQEProgram(
ansatz=ry_ansatz,
optimizer=optimizer,
initial_point=initial_point,
backend=backend,
provider=provider,
)
else:
reps = 2
initial_point = np.random.default_rng(42).random(2 * reps)
solver = QAOAProgram(
optimizer=optimizer,
reps=reps,
initial_point=initial_point,
backend=backend,
provider=provider,
)

opt = MinimumEigenOptimizer(solver)
result = opt.solve(self.op_ordering)
self.assertIsInstance(result, MinimumEigenOptimizationResult)


if __name__ == "__main__":
unittest.main()